Replace tabs with spaces in more files.
--HG-- branch : trunk
This commit is contained in:
@@ -159,7 +159,7 @@ public:
|
||||
/// Return @c true if the map is empty, else @c false.
|
||||
bool is_empty (void) const; // ACE style
|
||||
|
||||
/**
|
||||
/**
|
||||
* Return @c true if the map is empty, else @c false. We recommend
|
||||
* using @c is_empty() instead since it's more consistent with the
|
||||
* ACE container naming conventions.
|
||||
|
||||
@@ -124,7 +124,7 @@ public:
|
||||
/// Use whichever byte order is native to this machine.
|
||||
BYTE_ORDER_NATIVE = ACE_CDR_BYTE_ORDER
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Do byte swapping for each basic IDL type size. There exist only
|
||||
* routines to put byte, halfword (2 bytes), word (4 bytes),
|
||||
|
||||
@@ -23,13 +23,13 @@ ACE_SizeCDR::write_wchar (ACE_CDR::WChar x)
|
||||
errno = EACCES;
|
||||
return (this->good_bit_ = false);
|
||||
}
|
||||
|
||||
|
||||
if (static_cast<ACE_CDR::Short> (major_version_) == 1
|
||||
&& static_cast<ACE_CDR::Short> (minor_version_) == 2)
|
||||
{
|
||||
ACE_CDR::Octet len =
|
||||
static_cast<ACE_CDR::Octet> (ACE_OutputCDR::wchar_maxbytes ());
|
||||
|
||||
|
||||
if (this->write_1 (&len))
|
||||
{
|
||||
if (ACE_OutputCDR::wchar_maxbytes () == sizeof(ACE_CDR::WChar))
|
||||
@@ -65,7 +65,7 @@ ACE_SizeCDR::write_wchar (ACE_CDR::WChar x)
|
||||
errno = EINVAL;
|
||||
return (this->good_bit_ = false);
|
||||
}
|
||||
|
||||
|
||||
if (ACE_OutputCDR::wchar_maxbytes () == sizeof (ACE_CDR::WChar))
|
||||
{
|
||||
const void *temp = &x;
|
||||
@@ -76,7 +76,7 @@ ACE_SizeCDR::write_wchar (ACE_CDR::WChar x)
|
||||
ACE_CDR::Short sx = static_cast<ACE_CDR::Short> (x);
|
||||
return this->write_2 (reinterpret_cast<const ACE_CDR::UShort *> (&sx));
|
||||
}
|
||||
|
||||
|
||||
ACE_CDR::Octet ox = static_cast<ACE_CDR::Octet> (x);
|
||||
return this->write_1 (reinterpret_cast<const ACE_CDR::Octet *> (&ox));
|
||||
}
|
||||
@@ -138,9 +138,9 @@ ACE_SizeCDR::write_wstring (ACE_CDR::ULong len,
|
||||
this->write_ulong (
|
||||
ACE_Utils::truncate_cast<ACE_CDR::ULong> (
|
||||
ACE_OutputCDR::wchar_maxbytes () * len));
|
||||
|
||||
|
||||
if (good_ulong)
|
||||
{
|
||||
{
|
||||
return this->write_wchar_array (x, len);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -379,7 +379,7 @@ ACE_OutputCDR::write_wstring (ACE_CDR::ULong len,
|
||||
this->write_ulong (
|
||||
ACE_Utils::truncate_cast<ACE_CDR::ULong> (
|
||||
ACE_OutputCDR::wchar_maxbytes_ * len));
|
||||
|
||||
|
||||
if (good_ulong)
|
||||
{
|
||||
return this->write_wchar_array (x, len);
|
||||
@@ -1371,7 +1371,7 @@ ACE_InputCDR::read_wstring (ACE_CDR::WChar*& x)
|
||||
}
|
||||
|
||||
ACE_CDR::ULong len = 0;
|
||||
|
||||
|
||||
if (!this->read_ulong (len))
|
||||
{
|
||||
return false;
|
||||
|
||||
@@ -71,7 +71,7 @@ ACE_Base64::encode (const ACE_Byte* input,
|
||||
result[pos++] = alphabet[bits & 0x3f];
|
||||
cols += 4;
|
||||
if (cols == max_columns) {
|
||||
if (is_chunked)
|
||||
if (is_chunked)
|
||||
result[pos++] = '\n';
|
||||
cols = 0;
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
* is meaningful! That is why we need this wrapper, which
|
||||
* insures that appropriate allocator pointer is in place for
|
||||
* each call.
|
||||
*
|
||||
*
|
||||
* At some point it would be a good idea to update this class to
|
||||
* use the new "two allocator" technique provided by @c
|
||||
* ACE_Hash_Map_Manager_Ex.
|
||||
|
||||
@@ -553,7 +553,7 @@ protected:
|
||||
ACE_Allocator *table_allocator_;
|
||||
|
||||
/// Addidtional allocator for entries, so it should be able to
|
||||
/// allocate 'size' / chunks of sizeof
|
||||
/// allocate 'size' / chunks of sizeof
|
||||
/// (@c ACE_Hash_Multi_Map_Entry<@c EXT_ID, @c INT_ID>) bytes each.
|
||||
ACE_Allocator *entry_allocator_;
|
||||
|
||||
|
||||
@@ -75,13 +75,13 @@ ACE_Reactive_MEM_IO::send_buf (ACE_MEM_SAP_Node *buf,
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
// The offset.
|
||||
ACE_OFF_T offset =
|
||||
ACE_Utils::truncate_cast<ACE_OFF_T> (
|
||||
reinterpret_cast<char *> (buf)
|
||||
- static_cast<char *> (this->shm_malloc_->base_addr ()));
|
||||
|
||||
|
||||
// Send the offset value over the socket.
|
||||
if (ACE::send (this->handle_,
|
||||
(const char *) &offset,
|
||||
@@ -94,7 +94,7 @@ ACE_Reactive_MEM_IO::send_buf (ACE_MEM_SAP_Node *buf,
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
return ACE_Utils::truncate_cast<ssize_t> (buf->size ());
|
||||
}
|
||||
|
||||
@@ -280,12 +280,12 @@ ACE_MT_MEM_IO::recv_buf (ACE_MEM_SAP_Node *&buf,
|
||||
ACE_GUARD_RETURN (ACE_SYNCH_PROCESS_MUTEX, ace_mon, *this->recv_channel_.lock_, -1);
|
||||
|
||||
buf = this->recv_channel_.queue_.read ();
|
||||
|
||||
|
||||
if (buf != 0)
|
||||
{
|
||||
return ACE_Utils::truncate_cast<ssize_t> (buf->size ());
|
||||
}
|
||||
|
||||
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
@@ -403,9 +403,9 @@ ACE_MEM_IO::send (const ACE_Message_Block *message_block,
|
||||
reinterpret_cast<ACE_MEM_SAP_Node *> (
|
||||
this->deliver_strategy_->acquire_buffer (
|
||||
ACE_Utils::truncate_cast<ssize_t> (len)));
|
||||
|
||||
|
||||
size_t n = 0;
|
||||
|
||||
|
||||
while (message_block != 0)
|
||||
{
|
||||
ACE_OS::memcpy (static_cast<char *> (buf->data ()) + n,
|
||||
@@ -429,7 +429,7 @@ ACE_MEM_IO::send (const ACE_Message_Block *message_block,
|
||||
0,
|
||||
timeout);
|
||||
}
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -311,12 +311,12 @@ ACE_MMAP_Memory_Pool::map_file (size_t map_size)
|
||||
{
|
||||
#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
|
||||
this->base_addr_ = this->mmap_.addr ();
|
||||
|
||||
|
||||
if (obase_addr && this->base_addr_ != obase_addr)
|
||||
{
|
||||
ACE_BASED_POINTER_REPOSITORY::instance ()->unbind (obase_addr);
|
||||
}
|
||||
|
||||
|
||||
ACE_BASED_POINTER_REPOSITORY::instance ()->bind (this->base_addr_,
|
||||
map_size);
|
||||
#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
|
||||
|
||||
@@ -1028,12 +1028,12 @@ ACE_Message_Queue<ACE_SYNCH_USE>::ACE_Message_Queue (size_t hwm,
|
||||
char pid_buf[sizeof (int) + 1];
|
||||
ACE_OS::sprintf (pid_buf, "%d", ACE_OS::getpid ());
|
||||
pid_buf[sizeof (int)] = '\0';
|
||||
|
||||
|
||||
const int addr_nibbles = 2 * sizeof (ptrdiff_t);
|
||||
char addr_buf[addr_nibbles + 1];
|
||||
ACE_OS::sprintf (addr_buf, "%p", this);
|
||||
addr_buf[addr_nibbles] = '\0';
|
||||
|
||||
|
||||
ACE_CString name_str ("Message_Queue_");
|
||||
name_str += pid_buf;
|
||||
name_str += '_';
|
||||
@@ -2255,7 +2255,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::enqueue_i (ACE_Message_Block *new_item
|
||||
// Refresh priority status boundaries in the queue.
|
||||
|
||||
result = this->refresh_queue (current_time);
|
||||
|
||||
|
||||
if (result < 0)
|
||||
{
|
||||
return result;
|
||||
|
||||
@@ -42,7 +42,7 @@ namespace ACE
|
||||
type->add_ref ();
|
||||
|
||||
status = this->map_.bind (type->name (), type);
|
||||
|
||||
|
||||
/// Temporary debugging code.
|
||||
// ACE_DEBUG ((LM_DEBUG, "adding %s\n", type->name ()));
|
||||
}
|
||||
@@ -75,7 +75,7 @@ namespace ACE
|
||||
|
||||
ACE_CString name_str (name, 0, false);
|
||||
status = this->map_.unbind (name_str, mp);
|
||||
|
||||
|
||||
/// Temporary debugging code.
|
||||
// ACE_DEBUG ((LM_DEBUG, "removing %s\n", name_str.c_str ()));
|
||||
}
|
||||
|
||||
@@ -516,7 +516,7 @@ namespace ACE_OS {
|
||||
|
||||
#if !defined (ACE_HAS_VASPRINTF)
|
||||
extern ACE_Export
|
||||
int vasprintf_emulation (char **bufp, const char *format, va_list argptr);
|
||||
int vasprintf_emulation (char **bufp, const char *format, va_list argptr);
|
||||
#endif /* !ACE_HAS_VASPRINTF */
|
||||
|
||||
#if defined (ACE_HAS_WCHAR)
|
||||
|
||||
@@ -851,7 +851,7 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf,
|
||||
{
|
||||
delete [] argp;
|
||||
}
|
||||
|
||||
|
||||
errno = ENOMEM;
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -84,7 +84,7 @@ ACE_Priority_Reactor::build_bucket (ACE_Handle_Set &dispatch_mask,
|
||||
(handle = handle_iter ()) != ACE_INVALID_HANDLE;
|
||||
)
|
||||
{
|
||||
ACE_Event_Handler *event_handler =
|
||||
ACE_Event_Handler *event_handler =
|
||||
this->handler_rep_.find (handle);
|
||||
if (event_handler == 0)
|
||||
return -1;
|
||||
|
||||
@@ -75,7 +75,7 @@ private:
|
||||
void init_bucket (void);
|
||||
|
||||
/// Build the bucket from the given dispatch_mask. Return -1 on
|
||||
/// failure, 0 otherwise.
|
||||
/// failure, 0 otherwise.
|
||||
int build_bucket (ACE_Handle_Set& dispatch_mask,
|
||||
int &min_priority,
|
||||
int &max_priority);
|
||||
|
||||
@@ -439,7 +439,7 @@ protected:
|
||||
ACE_TCHAR process_name_[MAXPATHLEN + 1];
|
||||
|
||||
/// Indicate if a Unicode environment should be used
|
||||
bool use_unicode_environment_;
|
||||
bool use_unicode_environment_;
|
||||
};
|
||||
|
||||
//class ACE_Process_Manager;
|
||||
|
||||
@@ -686,7 +686,7 @@ ACE_Process_Manager::find_proc (pid_t pid)
|
||||
{
|
||||
ACE_TRACE ("ACE_Process_Manager::find_proc");
|
||||
|
||||
for (size_t i = 0; i < this->current_count_; ++i)
|
||||
for (size_t i = 0; i < this->current_count_; ++i)
|
||||
{
|
||||
if (pid == this->process_table_[i].process_->getpid ())
|
||||
{
|
||||
|
||||
@@ -1076,7 +1076,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove_i (ACE_RB_Tree_Node<
|
||||
y->color (z->color ());
|
||||
z->color (yColor);
|
||||
|
||||
//Reassign the y pointer to z because the node that y points to will be
|
||||
//Reassign the y pointer to z because the node that y points to will be
|
||||
//deleted
|
||||
y = z;
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ ACE_Service_Manager::open (const ACE_INET_Addr &sia)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -89,7 +89,7 @@ ACE_Service_Manager::info (ACE_TCHAR **strp, size_t length) const
|
||||
sa.get_port_number (),
|
||||
ACE_TEXT ("tcp"),
|
||||
ACE_TEXT ("# lists all services in the daemon\n"));
|
||||
|
||||
|
||||
if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
|
||||
{
|
||||
return -1;
|
||||
@@ -98,7 +98,7 @@ ACE_Service_Manager::info (ACE_TCHAR **strp, size_t length) const
|
||||
{
|
||||
ACE_OS::strsncpy (*strp, buf, length);
|
||||
}
|
||||
|
||||
|
||||
return static_cast<int> (ACE_OS::strlen (buf));
|
||||
}
|
||||
|
||||
@@ -143,7 +143,7 @@ ACE_Service_Manager::init (int argc, ACE_TCHAR *argv[])
|
||||
ACE_TEXT ("registering service with ACE_Reactor\n")),
|
||||
-1);
|
||||
}
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -160,18 +160,18 @@ ACE_Service_Manager::fini (void)
|
||||
ACE_TRACE ("ACE_Service_Manager::fini");
|
||||
|
||||
int retv = 0;
|
||||
|
||||
|
||||
if (this->get_handle () != ACE_INVALID_HANDLE)
|
||||
{
|
||||
retv =
|
||||
ACE_Reactor::instance ()->remove_handler (
|
||||
this,
|
||||
ACE_Event_Handler::ACCEPT_MASK | ACE_Event_Handler::DONT_CALL);
|
||||
|
||||
|
||||
this->handle_close (ACE_INVALID_HANDLE,
|
||||
ACE_Event_Handler::NULL_MASK);
|
||||
}
|
||||
|
||||
|
||||
return retv;
|
||||
}
|
||||
|
||||
@@ -227,7 +227,7 @@ ACE_Service_Manager::list_services (void)
|
||||
if (len > 0)
|
||||
{
|
||||
ssize_t n = this->client_stream_.send_n (buf, len);
|
||||
|
||||
|
||||
if (n <= 0 && errno != EPIPE)
|
||||
{
|
||||
ACE_ERROR ((LM_ERROR,
|
||||
@@ -334,7 +334,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE)
|
||||
ACE_TEXT ("client_stream fd = %d\n"),
|
||||
this->client_stream_.get_handle ()));
|
||||
ACE_INET_Addr sa;
|
||||
|
||||
|
||||
if (this->client_stream_.get_remote_addr (sa) == -1)
|
||||
{
|
||||
return -1;
|
||||
@@ -361,12 +361,12 @@ ACE_Service_Manager::handle_input (ACE_HANDLE)
|
||||
// contains an incomplete string.
|
||||
|
||||
int error;
|
||||
|
||||
|
||||
do
|
||||
{
|
||||
result = client_stream_.recv (offset, remaining);
|
||||
error = errno;
|
||||
|
||||
|
||||
if (result == 0 && error != EWOULDBLOCK)
|
||||
{
|
||||
remaining = 0;
|
||||
@@ -403,7 +403,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE)
|
||||
ACE_TEXT ("%p\n"),
|
||||
ACE_TEXT ("recv")));
|
||||
}
|
||||
|
||||
|
||||
break;
|
||||
case 0:
|
||||
return 0;
|
||||
@@ -430,7 +430,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE)
|
||||
ACE_TEXT ("%p\n"),
|
||||
ACE_TEXT ("close")));
|
||||
}
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -108,7 +108,7 @@ struct ACE_Stack_Trace_stackstate
|
||||
size_t starting_frame;
|
||||
};
|
||||
|
||||
//@TODO: Replace with a TSS-based pointer to avoid problems in multithreaded environs,
|
||||
//@TODO: Replace with a TSS-based pointer to avoid problems in multithreaded environs,
|
||||
// or use a mutex to serialize access to this.
|
||||
static ACE_Stack_Trace_stackstate* ACE_Stack_Trace_stateptr = 0;
|
||||
|
||||
@@ -495,7 +495,7 @@ typedef struct _dbghelp_functions
|
||||
|
||||
|
||||
# pragma warning (push)
|
||||
# pragma warning (disable:4706)
|
||||
# pragma warning (disable:4706)
|
||||
static bool load_dbghelp_library_if_needed (dbghelp_functions *pDbg)
|
||||
{
|
||||
//@TODO: See codeproject's StackWalker.cpp for the list of locations to
|
||||
@@ -587,7 +587,7 @@ cs_operate(int (*func)(struct frame_state const *, void *), void *usrarg,
|
||||
ZeroMemory (&fs.sf, sizeof (fs.sf));
|
||||
fs.pDbg = &dbg;
|
||||
emptyStack (); //Not sure what this should do, Chad?
|
||||
|
||||
|
||||
CONTEXT c;
|
||||
ZeroMemory (&c, sizeof (CONTEXT));
|
||||
c.ContextFlags = CONTEXT_FULL;
|
||||
@@ -684,7 +684,7 @@ ACE_Stack_Trace::generate_trace (ssize_t starting_frame_offset,
|
||||
void
|
||||
ACE_Stack_Trace::generate_trace (ssize_t, size_t)
|
||||
{
|
||||
// Call determine_starting_frame() on HP aCC build to resolve declared
|
||||
// Call determine_starting_frame() on HP aCC build to resolve declared
|
||||
// method never referenced warning.
|
||||
#if defined (__HP_aCC)
|
||||
size_t starting_frame = determine_starting_frame (0, 0);
|
||||
|
||||
@@ -37,31 +37,31 @@
|
||||
* A new conversion character, the question mark, was added to ACE_Log_Msg for stack
|
||||
* trace logging. The %? conversion character was added as a convenience so that users
|
||||
* need not instantiate an ACE_Stack_Trace instance solely for the purpose of printing
|
||||
* it in an ACE logging message. The following are functionally equivalent:
|
||||
* it in an ACE logging message. The following are functionally equivalent:
|
||||
*
|
||||
* \code
|
||||
* ACE_DEBUG((LM_DEBUG, "%?"));
|
||||
* ACE_DEBUG((LM_DEBUG, "%?"));
|
||||
*
|
||||
* ACE_Stack_Trace st;
|
||||
* ACE_DEBUG ((LM_DEBUG, "%s", st.c_str() ));
|
||||
* ACE_DEBUG ((LM_DEBUG, "%s", st.c_str() ));
|
||||
* \endcode
|
||||
*
|
||||
* These usage examples were shown in $ACE_ROOT/tests/Stack_Trace_Test.cpp.
|
||||
*
|
||||
* @note The stack trace functionality was currently supported on platforms:
|
||||
* - Any platform using glibc as its runtime library, or where ACE_HAS_EXECINFO_H is defined
|
||||
* - Any platform using glibc as its runtime library, or where ACE_HAS_EXECINFO_H is defined
|
||||
* (this covers Linux and Mac) and gcc version >= 3.3.
|
||||
* - VxWorks, both kernel and RTP
|
||||
* - Solaris
|
||||
* - Windows 32 and 64 bit (Visual C++, excluding WinCE/mobile)
|
||||
*
|
||||
* @note Since stack trace buffer size has limitation(@c ACE_STACK_TRACE_SYMBUFSIZ), you will not
|
||||
* get a complete stack trace if @c ACE_STACK_TRACE_SYMBUFSIZ value is less than actual stack
|
||||
* trace data length. To get a complete stack trace, you need set @c ACE_STACK_TRACE_SYMBUFSIZ
|
||||
* with a larger value that is enough for the stack trace data in your @c config.h file
|
||||
* @note Since stack trace buffer size has limitation(@c ACE_STACK_TRACE_SYMBUFSIZ), you will not
|
||||
* get a complete stack trace if @c ACE_STACK_TRACE_SYMBUFSIZ value is less than actual stack
|
||||
* trace data length. To get a complete stack trace, you need set @c ACE_STACK_TRACE_SYMBUFSIZ
|
||||
* with a larger value that is enough for the stack trace data in your @c config.h file
|
||||
* and rebuild ACE.
|
||||
*
|
||||
* @note Using ACE logging mechanism (%?) to log the stack trace also has ACE_MAXLOGMSGLEN size limitation.
|
||||
* @note Using ACE logging mechanism (%?) to log the stack trace also has ACE_MAXLOGMSGLEN size limitation.
|
||||
* To get a complete stack trace, you could use different output method. Following is an example.
|
||||
*
|
||||
* \code
|
||||
@@ -75,8 +75,8 @@ public:
|
||||
/**
|
||||
* @brief Grab a snapshot of the current stack trace and hold it for later use.
|
||||
*
|
||||
* @param starting_frame_offset offset into the array of frames to start printing; 0 is the
|
||||
* platform-specific offset for the first frame, positive numbers give less frames, negative give
|
||||
* @param starting_frame_offset offset into the array of frames to start printing; 0 is the
|
||||
* platform-specific offset for the first frame, positive numbers give less frames, negative give
|
||||
* more frames
|
||||
* @param num_frames the number of stack frames to include (0 indicates platform-specific maximum)
|
||||
*
|
||||
|
||||
@@ -516,7 +516,7 @@ public:
|
||||
*
|
||||
* fast_resize just adjusts the buffer if needed and sets the length,
|
||||
* it doesn't fill the buffer, so is much faster.
|
||||
*
|
||||
*
|
||||
* @param len The number of CHARs to reserve
|
||||
* @param c The CHAR to use when filling the string.
|
||||
*/
|
||||
@@ -528,7 +528,7 @@ public:
|
||||
* @note This is non-throwing operation.
|
||||
*/
|
||||
void swap (ACE_String_Base<CHAR> & str);
|
||||
|
||||
|
||||
/**
|
||||
* Declare the dynamic allocation hooks.
|
||||
*/
|
||||
|
||||
@@ -112,7 +112,7 @@ public: // Should be protected:
|
||||
int put_next (ACE_Message_Block *msg, ACE_Time_Value *timeout = 0);
|
||||
|
||||
/**
|
||||
* Tests whether we can enqueue a message without blocking.
|
||||
* Tests whether we can enqueue a message without blocking.
|
||||
*
|
||||
* @deprecated This method is deprecated and will go away in the future.
|
||||
*/
|
||||
|
||||
@@ -215,7 +215,7 @@ ACE_UPIPE_Stream::recv_n (char *buf,
|
||||
len = this->recv (buf + bytes_read,
|
||||
n - bytes_read,
|
||||
timeout);
|
||||
|
||||
|
||||
if (len == -1)
|
||||
{
|
||||
return -1;
|
||||
|
||||
@@ -461,7 +461,7 @@ namespace ACE_Utils
|
||||
// sequence.
|
||||
if (timestamp <= time_last_)
|
||||
{
|
||||
uuid_state_.clock_sequence = static_cast<ACE_UINT16>
|
||||
uuid_state_.clock_sequence = static_cast<ACE_UINT16>
|
||||
((uuid_state_.clock_sequence + 1) & ACE_UUID_CLOCK_SEQ_MASK);
|
||||
}
|
||||
// If the system time ticked since the last UUID was
|
||||
|
||||
@@ -209,7 +209,7 @@ namespace ACE_Utils
|
||||
/// Obtain a UUID timestamp and clock sequence. Compensate for the
|
||||
/// fact that the time obtained from getSystem time has a
|
||||
/// resolution less than 100ns.
|
||||
void get_timestamp_and_clocksequence (UUID_Time& timestamp,
|
||||
void get_timestamp_and_clocksequence (UUID_Time& timestamp,
|
||||
ACE_UINT16& clockSequence);
|
||||
|
||||
/// Obtain the system time in UTC as a count of 100 nanosecond intervals
|
||||
|
||||
@@ -50,7 +50,7 @@ public:
|
||||
|
||||
// = Initialization method.
|
||||
ACE_Unbounded_Set_Iterator (ACE_Unbounded_Set<T> &s, bool end = false);
|
||||
|
||||
|
||||
ACE_Unbounded_Set_Iterator (const base_type &s);
|
||||
};
|
||||
|
||||
@@ -63,13 +63,13 @@ class ACE_Unbounded_Set_Const_Iterator : public
|
||||
ACE_Unbounded_Set_Ex_Const_Iterator<T, ACE_Unbounded_Set_Default_Comparator<T> >
|
||||
{
|
||||
public:
|
||||
|
||||
|
||||
typedef ACE_Unbounded_Set_Ex_Const_Iterator<T, ACE_Unbounded_Set_Default_Comparator<T> > base_type;
|
||||
|
||||
|
||||
// = Initialization method.
|
||||
ACE_Unbounded_Set_Const_Iterator (const ACE_Unbounded_Set<T> &s,
|
||||
bool end = false);
|
||||
|
||||
|
||||
ACE_Unbounded_Set_Const_Iterator (const base_type &s);
|
||||
};
|
||||
|
||||
|
||||
@@ -163,7 +163,7 @@ private:
|
||||
* allow duplicates, but it maintains FIFO ordering of insertions.
|
||||
*
|
||||
* This implementation may also be parameterized with a comparator
|
||||
* functor, which must implement bool operator () (const T&, const T&) const,
|
||||
* functor, which must implement bool operator () (const T&, const T&) const,
|
||||
* returning true if the given items are equivalent. The default comparator
|
||||
* is sufficient for objects reliably compared with operator==.
|
||||
*
|
||||
@@ -205,7 +205,7 @@ public:
|
||||
typedef ACE_Unbounded_Set_Ex_Const_Iterator<T, C> const_iterator;
|
||||
typedef C COMP;
|
||||
typedef ACE_Node<T, C> NODE;
|
||||
|
||||
|
||||
// = Initialization and termination methods.
|
||||
/// Constructor. Use user specified allocation strategy
|
||||
/// if specified.
|
||||
@@ -324,7 +324,7 @@ private:
|
||||
|
||||
/// Allocation strategy of the set.
|
||||
ACE_Allocator *allocator_;
|
||||
|
||||
|
||||
/// Comparator to be used
|
||||
COMP comp_;
|
||||
};
|
||||
|
||||
@@ -40,7 +40,7 @@ void ACE_Vector<T, DEFAULT_SIZE>::push_back (const T& elem)
|
||||
}
|
||||
else
|
||||
ACE_Array<T>::size (length_ + 1);
|
||||
|
||||
|
||||
++length_;
|
||||
(*this)[length_-1] = elem;
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
#define ACE_LACKS_STROPTS_H
|
||||
|
||||
// Platform provides <execinfo.h> header.
|
||||
#define ACE_HAS_EXECINFO_H
|
||||
#define ACE_HAS_EXECINFO_H
|
||||
|
||||
// Wcharness....
|
||||
#define ACE_HAS_WCHAR
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
// $Id: config-qnx-rtp.h 80826 2008-03-04 14:51:23Z wotte $
|
||||
// The following configuration file is designed to work for QNX RTP
|
||||
// GNU C++ and the POSIX (pthread) threads package. You can get QNX
|
||||
// RTP at http://get.qnx.com.
|
||||
// This header is intended to switch between configuration for
|
||||
// RTP at http://get.qnx.com.
|
||||
// This header is intended to switch between configuration for
|
||||
// various NTO versions.
|
||||
#ifndef ACE_CONFIG_QNX_RTP_H
|
||||
#define ACE_CONFIG_QNX_RTP_H
|
||||
|
||||
Reference in New Issue
Block a user