mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-15 23:20:36 +01:00
*Massive cleanup redux.
--HG-- branch : trunk
This commit is contained in:
1
COPYING
1
COPYING
@@ -307,7 +307,6 @@ the "copyright" line and a pointer to where the full notice is found.
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
|
||||
@@ -37,12 +37,10 @@ extern "C" int maxFiles;
|
||||
# include "ace/OS_NS_poll.h"
|
||||
#endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */
|
||||
|
||||
|
||||
ACE_RCSID (ace,
|
||||
ACE,
|
||||
"$Id: ACE.cpp 82581 2008-08-11 08:58:24Z johnnyw $")
|
||||
|
||||
|
||||
// Open versioned namespace, if enabled by the user.
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
@@ -62,7 +60,6 @@ namespace ACE
|
||||
char debug_;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
ACE::out_of_handles (int error)
|
||||
{
|
||||
@@ -2306,7 +2303,6 @@ ACE::restore_non_blocking_mode (ACE_HANDLE handle,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Format buffer into printable format. This is useful for debugging.
|
||||
// Portions taken from mdump by J.P. Knight (J.P.Knight@lut.ac.uk)
|
||||
// Modifications by Todd Montgomery.
|
||||
@@ -2704,7 +2700,7 @@ ACE::handle_timed_accept (ACE_HANDLE listener,
|
||||
|
||||
// We need a loop here if <restart> is enabled.
|
||||
|
||||
for (;;)
|
||||
for (; ; )
|
||||
{
|
||||
#if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT)
|
||||
|
||||
@@ -2974,7 +2970,6 @@ ACE::gcd (u_long x, u_long y)
|
||||
return x;
|
||||
}
|
||||
|
||||
|
||||
// Calculates the minimum enclosing frame size for the given values.
|
||||
u_long
|
||||
ACE::minimum_frame_size (u_long period1, u_long period2)
|
||||
@@ -3018,7 +3013,6 @@ ACE::minimum_frame_size (u_long period1, u_long period2)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
u_long
|
||||
ACE::is_prime (const u_long n,
|
||||
const u_long min_factor,
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
// Open versioned namespace, if enabled by the user.
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
|
||||
// Wrappers for methods that have been moved to ACE_OS.
|
||||
|
||||
ACE_INLINE ssize_t
|
||||
|
||||
@@ -6,7 +6,6 @@ ACE_RCSID (ace,
|
||||
ACE_crc32,
|
||||
"$Id: ACE_crc32.cpp 80826 2008-03-04 14:51:23Z wotte $")
|
||||
|
||||
|
||||
namespace
|
||||
{
|
||||
/*****************************************************************/
|
||||
|
||||
@@ -14,7 +14,6 @@ ACE_RCSID(ace, ATM_Acceptor, "$Id: ATM_Acceptor.cpp 80826 2008-03-04 14:51:23Z w
|
||||
#include "ace/ATM_Acceptor.inl"
|
||||
#endif /* __ACE_INLINE__ */
|
||||
|
||||
|
||||
// Open versioned namespace, if enabled by the user.
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
@@ -305,6 +304,5 @@ ACE_ATM_Acceptor::accept (ACE_ATM_Stream &new_sap,
|
||||
// Close versioned namespace, if enabled by the user.
|
||||
ACE_END_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
|
||||
#endif /* ACE_HAS_ATM */
|
||||
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef ACE_ATM_ACCEPTOR_H
|
||||
#define ACE_ATM_ACCEPTOR_H
|
||||
#include /**/ "ace/pre.h"
|
||||
@@ -113,7 +112,6 @@ private:
|
||||
// Close versioned namespace, if enabled by the user.
|
||||
ACE_END_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
|
||||
#if defined (__ACE_INLINE__)
|
||||
#include "ace/ATM_Acceptor.inl"
|
||||
#endif /* __ACE_INLINE__ */
|
||||
|
||||
@@ -100,7 +100,6 @@ ACE_ATM_Addr::ACE_ATM_Addr (const ATM_Addr *sap,
|
||||
this->set (sap, selector);
|
||||
}
|
||||
|
||||
|
||||
ACE_ATM_Addr::ACE_ATM_Addr (const ACE_TCHAR sap[],
|
||||
u_char selector)
|
||||
#if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2)
|
||||
|
||||
@@ -187,7 +187,6 @@ private:
|
||||
// Close versioned namespace, if enabled by the user.
|
||||
ACE_END_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
|
||||
#if defined (__ACE_INLINE__)
|
||||
#include "ace/ATM_Addr.inl"
|
||||
#endif /* __ACE_INLINE__ */
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
//==========================================================================
|
||||
|
||||
|
||||
#ifndef ACE_ATM_PARAMS_H
|
||||
#define ACE_ATM_PARAMS_H
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
//==========================================================================
|
||||
|
||||
|
||||
#ifndef ACE_ATM_QoS_H
|
||||
#define ACE_ATM_QoS_H
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef ACE_ATM_STREAM_H
|
||||
#define ACE_ATM_STREAM_H
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
@@ -293,8 +293,6 @@ public:
|
||||
typedef ACE_Concurrency_Strategy<SVC_HANDLER> CONCURRENCY_STRATEGY;
|
||||
typedef ACE_Scheduling_Strategy<SVC_HANDLER> SCHEDULING_STRATEGY;
|
||||
|
||||
|
||||
|
||||
/// Default constructor.
|
||||
ACE_Strategy_Acceptor (const ACE_TCHAR service_name[] = 0,
|
||||
const ACE_TCHAR service_description[] = 0,
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef ACE_ACTIVE_MAP_MANAGER_H
|
||||
#define ACE_ACTIVE_MAP_MANAGER_H
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef ACE_ACTIVE_MAP_MANAGER_T_H
|
||||
#define ACE_ACTIVE_MAP_MANAGER_T_H
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
@@ -2,12 +2,10 @@
|
||||
|
||||
#include "ace/Addr.h"
|
||||
|
||||
|
||||
ACE_RCSID (ace,
|
||||
Addr,
|
||||
"$Id: Addr.cpp 80826 2008-03-04 14:51:23Z wotte $")
|
||||
|
||||
|
||||
#if !defined (__ACE_INLINE__)
|
||||
#include "ace/Addr.inl"
|
||||
#endif /* __ACE_INLINE__ */
|
||||
@@ -23,7 +21,6 @@ const ACE_Addr ACE_Addr::sap_any (AF_ANY, -1);
|
||||
|
||||
ACE_ALLOC_HOOK_DEFINE(ACE_Addr)
|
||||
|
||||
|
||||
// Initializes instance variables. Note that 0 is an unspecified
|
||||
// protocol family type...
|
||||
|
||||
|
||||
@@ -32,7 +32,6 @@ ACE_Argv_Type_Converter::ACE_Argv_Type_Converter (int &argc, wchar_t** argv)
|
||||
}
|
||||
#endif // ACE_USES_WCHAR
|
||||
|
||||
|
||||
ACE_Argv_Type_Converter::ACE_Argv_Type_Converter (int &argc, char **argv)
|
||||
: saved_argc_(argc),
|
||||
char_argv_(argv)
|
||||
@@ -104,7 +103,6 @@ ACE_Argv_Type_Converter::initialize (void)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
ACE_Argv_Type_Converter::align_char_with_wchar (void)
|
||||
{
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef ACE_ARRAY_MAP_H
|
||||
#define ACE_ARRAY_MAP_H
|
||||
|
||||
|
||||
@@ -77,7 +77,6 @@ public:
|
||||
*/
|
||||
virtual int cancel (void);
|
||||
|
||||
|
||||
/**
|
||||
* Template method to validate peer before service is opened.
|
||||
* This method is called when the connection attempt completes,
|
||||
@@ -128,7 +127,6 @@ protected:
|
||||
/// This is called when an outstanding accept completes.
|
||||
virtual void handle_connect (const ACE_Asynch_Connect::Result &result);
|
||||
|
||||
|
||||
/// This parses the address from read buffer.
|
||||
void parse_address (const ACE_Asynch_Connect::Result &result,
|
||||
ACE_INET_Addr &remote_address,
|
||||
|
||||
@@ -710,8 +710,6 @@ ACE_Asynch_Accept::Result::implementation (void) const
|
||||
return this->implementation_;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// *********************************************************************
|
||||
|
||||
ACE_Asynch_Connect::ACE_Asynch_Connect (void)
|
||||
@@ -795,7 +793,6 @@ ACE_Asynch_Connect::Result::connect_handle (void) const
|
||||
return this->implementation ()->connect_handle ();
|
||||
}
|
||||
|
||||
|
||||
ACE_Asynch_Connect_Result_Impl *
|
||||
ACE_Asynch_Connect::Result::implementation (void) const
|
||||
{
|
||||
@@ -1191,7 +1188,6 @@ ACE_Service_Handler::open (ACE_HANDLE,
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
// ************************************************************
|
||||
|
||||
ACE_Asynch_Read_Dgram::ACE_Asynch_Read_Dgram (void)
|
||||
@@ -1305,7 +1301,6 @@ ACE_Asynch_Read_Dgram::Result::implementation (void) const
|
||||
|
||||
// ************************************************************
|
||||
|
||||
|
||||
ACE_Asynch_Write_Dgram::ACE_Asynch_Write_Dgram (void)
|
||||
: implementation_ (0)
|
||||
{
|
||||
|
||||
@@ -167,7 +167,6 @@ public:
|
||||
*/
|
||||
int signal_number (void) const;
|
||||
|
||||
|
||||
/// Destructor.
|
||||
virtual ~ACE_Asynch_Result (void);
|
||||
|
||||
@@ -250,7 +249,6 @@ public:
|
||||
*/
|
||||
int cancel (void);
|
||||
|
||||
|
||||
// = Access methods.
|
||||
|
||||
/// Return the underlying proactor.
|
||||
@@ -1289,7 +1287,6 @@ public:
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
// Forward declarations
|
||||
class ACE_Asynch_Read_Dgram_Result_Impl;
|
||||
class ACE_Asynch_Read_Dgram_Impl;
|
||||
@@ -1554,7 +1551,6 @@ public:
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @class ACE_Handler
|
||||
*
|
||||
|
||||
@@ -515,7 +515,6 @@ protected:
|
||||
ACE_Asynch_Accept_Result_Impl (void);
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @class ACE_Asynch_Connect_Impl
|
||||
*
|
||||
@@ -566,7 +565,6 @@ protected:
|
||||
ACE_Asynch_Connect_Result_Impl (void);
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @class ACE_Asynch_Transmit_File_Impl
|
||||
*
|
||||
@@ -635,7 +633,6 @@ protected:
|
||||
ACE_Asynch_Transmit_File_Result_Impl (void);
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @class ACE_Asynch_Read_Dgram_Impl
|
||||
*
|
||||
|
||||
@@ -90,7 +90,6 @@ ACE_Asynch_Connect_Result_Impl::ACE_Asynch_Connect_Result_Impl (void)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
ACE_INLINE
|
||||
ACE_Asynch_Transmit_File_Impl::ACE_Asynch_Transmit_File_Impl (void)
|
||||
: ACE_Asynch_Operation_Impl ()
|
||||
|
||||
@@ -69,8 +69,6 @@ ACE_Asynch_Pseudo_Task::svc (void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
int
|
||||
ACE_Asynch_Pseudo_Task::register_io_handler (ACE_HANDLE handle,
|
||||
ACE_Event_Handler *handler,
|
||||
|
||||
@@ -170,7 +170,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::value_i (void)
|
||||
return this->value_;
|
||||
}
|
||||
|
||||
|
||||
ACE_INLINE
|
||||
ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::ACE_Atomic_Op (void)
|
||||
: value_ (0)
|
||||
|
||||
@@ -195,7 +195,6 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op (
|
||||
// ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op");
|
||||
}
|
||||
|
||||
|
||||
template <class ACE_LOCK, class TYPE>
|
||||
ACE_INLINE ACE_Atomic_Op<ACE_LOCK, TYPE> &
|
||||
ACE_Atomic_Op<ACE_LOCK, TYPE>::operator= (
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef ACE_AUTO_INCDEC_T_H
|
||||
#define ACE_AUTO_INCDEC_T_H
|
||||
|
||||
|
||||
@@ -32,7 +32,6 @@
|
||||
# pragma warning(disable: 4284)
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
/**
|
||||
@@ -179,7 +178,6 @@ public:
|
||||
X *operator-> () const;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @brief Reset given @c auto_ptr element to new element.
|
||||
*
|
||||
|
||||
@@ -67,11 +67,8 @@ protected:
|
||||
long flags_;
|
||||
};
|
||||
|
||||
|
||||
|
||||
class ACE_Service_Gestalt;
|
||||
|
||||
|
||||
/**
|
||||
* @class ACE_Base_Thread_Adapter
|
||||
*
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
#include "ace/Synch_Traits.h"
|
||||
#include "ace/os_include/os_stddef.h"
|
||||
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
// Forward decl., using the "Cheshire Cat" technique.
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef ACE_BASIC_STATS_H
|
||||
#define ACE_BASIC_STATS_H
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
@@ -4,12 +4,10 @@
|
||||
# include "ace/Basic_Types.inl"
|
||||
#endif /* ! __ACE_INLINE__ */
|
||||
|
||||
|
||||
ACE_RCSID (ace,
|
||||
Basic_Types,
|
||||
"$Id: Basic_Types.cpp 80826 2008-03-04 14:51:23Z wotte $")
|
||||
|
||||
|
||||
#if defined (ACE_LACKS_LONGLONG_T) && !defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
|
||||
# include "ace/Log_Msg.h"
|
||||
# include "ace/OS_NS_stdio.h"
|
||||
@@ -30,7 +28,6 @@ ACE_U_LongLong::output (FILE *file) const
|
||||
ACE_OS::fprintf (file, "0x%lx", l_ ());
|
||||
}
|
||||
|
||||
|
||||
ACE_TCHAR *
|
||||
ACE_U_LongLong::as_string (ACE_TCHAR *output,
|
||||
unsigned int base,
|
||||
@@ -111,7 +108,6 @@ ACE_U_LongLong::as_string (ACE_TCHAR *output,
|
||||
return output;
|
||||
}
|
||||
|
||||
|
||||
# if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
|
||||
ostream&
|
||||
operator<< (ostream& os, const ACE_U_LongLong& ll)
|
||||
|
||||
@@ -220,7 +220,6 @@ typedef ACE::If_Then_Else<
|
||||
# endif
|
||||
# endif /* !defined (ACE_SIZEOF_LONG_LONG) */
|
||||
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
// The sizes of the commonly implemented types are now known. Set up
|
||||
@@ -327,7 +326,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
# endif /* defined (ACE_UINT64_TYPE) */
|
||||
#endif /* !(ACE_LACKS_LONGLONG_T || ACE_LACKS_UNSIGNEDLONGLONG_T) */
|
||||
|
||||
|
||||
typedef ACE_UINT16 ACE_USHORT16; // @@ Backward compatibility.
|
||||
|
||||
// Define a generic byte for use in codecs
|
||||
@@ -805,7 +803,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
|
||||
# define ACE_UINT64_DBLCAST_ADAPTER(n) (n)
|
||||
# endif /* ! ACE_WIN32 && ! ACE_LACKS_LONGLONG_T */
|
||||
|
||||
|
||||
// The number of bytes in a float.
|
||||
# ifndef ACE_SIZEOF_FLOAT
|
||||
# if FLT_MAX_EXP == 128
|
||||
|
||||
@@ -187,7 +187,6 @@ ACE_U_LongLong::operator= (const ACE_UINT32 &rhs)
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
||||
ACE_INLINE ACE_U_LongLong
|
||||
ACE_U_LongLong::operator+ (const ACE_U_LongLong &n) const
|
||||
{
|
||||
@@ -589,7 +588,6 @@ ACE_U_LongLong::operator= (const ACE_UINT32 &rhs)
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
||||
ACE_INLINE ACE_U_LongLong
|
||||
ACE_U_LongLong::operator+ (const ACE_U_LongLong &n) const
|
||||
{
|
||||
|
||||
@@ -34,8 +34,6 @@ ACE_Bound_Ptr_Counter<ACE_LOCK>::create_strong (void)
|
||||
return temp;
|
||||
}
|
||||
|
||||
|
||||
|
||||
template <class ACE_LOCK> inline long
|
||||
ACE_Bound_Ptr_Counter<ACE_LOCK>::attach_strong (ACE_Bound_Ptr_Counter<ACE_LOCK>* counter)
|
||||
{
|
||||
|
||||
@@ -647,7 +647,7 @@ ACE_CDR::LongDouble::assign (const ACE_CDR::LongDouble::NativeImpl& rhs)
|
||||
// we have to shift and or the rhs to get the right bytes.
|
||||
size_t li = 2;
|
||||
bool direction = true;
|
||||
for (size_t ri = 1; ri < sizeof (rhs);)
|
||||
for (size_t ri = 1; ri < sizeof (rhs); )
|
||||
{
|
||||
if (direction)
|
||||
{
|
||||
@@ -740,7 +740,7 @@ ACE_CDR::LongDouble::operator ACE_CDR::LongDouble::NativeImpl () const
|
||||
// we have to shift and or the rhs to get the right bytes.
|
||||
size_t li = 1;
|
||||
bool direction = true;
|
||||
for (size_t ri = 2; li < sizeof (ret);) {
|
||||
for (size_t ri = 2; li < sizeof (ret); ) {
|
||||
if (direction)
|
||||
{
|
||||
lhs_ptr[li] |= ((copy[ri] >> 4) & 0xf);
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef ACE_CDR_BASE_H
|
||||
#define ACE_CDR_BASE_H
|
||||
|
||||
@@ -373,7 +372,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
|
||||
# include "ace/CDR_Base.inl"
|
||||
#endif /* __ACE_INLINE__ */
|
||||
|
||||
|
||||
#include /**/ "ace/post.h"
|
||||
|
||||
#endif /* ACE_CDR_BASE_H */
|
||||
|
||||
@@ -213,7 +213,6 @@ ACE_SizeCDR::write_wchar_array_i (const ACE_CDR::WChar *,
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
ACE_CDR::Boolean
|
||||
ACE_SizeCDR::write_array (const void *,
|
||||
size_t size,
|
||||
|
||||
@@ -54,15 +54,12 @@ public:
|
||||
/// Returns @c false if an error has ocurred.
|
||||
bool good_bit (void) const;
|
||||
|
||||
|
||||
/// Reset current size.
|
||||
void reset (void);
|
||||
|
||||
|
||||
/// Return current size.
|
||||
size_t total_length (void) const;
|
||||
|
||||
|
||||
// Return 0 on failure and 1 on success.
|
||||
//@{ @name Size-calculating pseudo-write operations
|
||||
ACE_CDR::Boolean write_boolean (ACE_CDR::Boolean x);
|
||||
@@ -157,7 +154,6 @@ private:
|
||||
size_t align,
|
||||
ACE_CDR::ULong length);
|
||||
|
||||
|
||||
ACE_CDR::Boolean write_wchar_array_i (const ACE_CDR::WChar* x,
|
||||
ACE_CDR::ULong length);
|
||||
|
||||
@@ -235,7 +231,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
#endif /* __ACE_INLINE__ */
|
||||
|
||||
|
||||
#include /**/ "ace/post.h"
|
||||
|
||||
#endif /* ACE_CDR_SIZE_H */
|
||||
|
||||
@@ -34,7 +34,6 @@ ACE_SizeCDR::total_length (void) const
|
||||
return this->size_;
|
||||
}
|
||||
|
||||
|
||||
// Encode the CDR stream.
|
||||
|
||||
ACE_INLINE ACE_CDR::Boolean
|
||||
@@ -252,7 +251,6 @@ ACE_SizeCDR::write_float_array (const ACE_CDR::Float *x,
|
||||
length);
|
||||
}
|
||||
|
||||
|
||||
ACE_INLINE ACE_CDR::Boolean
|
||||
ACE_SizeCDR::write_double_array (const ACE_CDR::Double *x,
|
||||
ACE_CDR::ULong length)
|
||||
@@ -273,10 +271,8 @@ ACE_SizeCDR::write_longdouble_array (const ACE_CDR::LongDouble* x,
|
||||
length);
|
||||
}
|
||||
|
||||
|
||||
// ****************************************************************
|
||||
|
||||
|
||||
ACE_INLINE ACE_CDR::Boolean
|
||||
operator<< (ACE_SizeCDR &ss, ACE_CDR::Char x)
|
||||
{
|
||||
@@ -420,5 +416,4 @@ operator<< (ACE_SizeCDR &ss, ACE_OutputCDR::from_wstring x)
|
||||
(ACE_CDR::Boolean) (ss.good_bit () && (!x.bound_ || len <= x.bound_));
|
||||
}
|
||||
|
||||
|
||||
ACE_END_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
@@ -633,7 +633,6 @@ ACE_OutputCDR::write_wchar_array_i (const ACE_CDR::WChar *x,
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
ACE_CDR::Boolean
|
||||
ACE_OutputCDR::write_array (const void *x,
|
||||
size_t size,
|
||||
@@ -683,7 +682,6 @@ ACE_OutputCDR::write_array (const void *x,
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
ACE_CDR::Boolean
|
||||
ACE_OutputCDR::write_boolean_array (const ACE_CDR::Boolean* x,
|
||||
ACE_CDR::ULong length)
|
||||
@@ -703,7 +701,6 @@ ACE_OutputCDR::write_boolean_array (const ACE_CDR::Boolean* x,
|
||||
return this->good_bit ();
|
||||
}
|
||||
|
||||
|
||||
char *
|
||||
ACE_OutputCDR::write_long_placeholder (void)
|
||||
{
|
||||
@@ -715,7 +712,6 @@ ACE_OutputCDR::write_long_placeholder (void)
|
||||
return buf;
|
||||
}
|
||||
|
||||
|
||||
char *
|
||||
ACE_OutputCDR::write_short_placeholder (void)
|
||||
{
|
||||
@@ -727,7 +723,6 @@ ACE_OutputCDR::write_short_placeholder (void)
|
||||
return buf;
|
||||
}
|
||||
|
||||
|
||||
ACE_CDR::Boolean
|
||||
ACE_OutputCDR::replace (ACE_CDR::Long x, char* loc)
|
||||
{
|
||||
@@ -750,7 +745,6 @@ ACE_OutputCDR::replace (ACE_CDR::Long x, char* loc)
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
ACE_CDR::Boolean
|
||||
ACE_OutputCDR::replace (ACE_CDR::Short x, char* loc)
|
||||
{
|
||||
@@ -773,7 +767,6 @@ ACE_OutputCDR::replace (ACE_CDR::Short x, char* loc)
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
ACE_OutputCDR::consolidate (void)
|
||||
{
|
||||
@@ -818,7 +811,6 @@ ACE_OutputCDR::consolidate (void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
ACE_Message_Block*
|
||||
ACE_OutputCDR::find (char* loc)
|
||||
{
|
||||
@@ -1529,7 +1521,6 @@ ACE_InputCDR::read_wchar_array_i (ACE_CDR::WChar* x,
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
ACE_CDR::Boolean
|
||||
ACE_InputCDR::read_boolean_array (ACE_CDR::Boolean *x,
|
||||
ACE_CDR::ULong length)
|
||||
|
||||
@@ -59,7 +59,6 @@
|
||||
#include "Monitor_Size.h"
|
||||
#endif /* ACE_HAS_MONITOR_POINTS==1 */
|
||||
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
class ACE_Char_Codeset_Translator;
|
||||
@@ -518,11 +517,9 @@ private:
|
||||
size_t align,
|
||||
ACE_CDR::ULong length);
|
||||
|
||||
|
||||
ACE_CDR::Boolean write_wchar_array_i (const ACE_CDR::WChar* x,
|
||||
ACE_CDR::ULong length);
|
||||
|
||||
|
||||
/**
|
||||
* Grow the CDR stream. When it returns @a buf contains a pointer to
|
||||
* memory in the CDR stream, with at least @a size bytes ahead of it
|
||||
@@ -602,7 +599,6 @@ protected:
|
||||
static size_t wchar_maxbytes_;
|
||||
};
|
||||
|
||||
|
||||
// ****************************************************************
|
||||
|
||||
/**
|
||||
@@ -1274,7 +1270,6 @@ extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
|
||||
extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
|
||||
ACE_CString &x);
|
||||
|
||||
|
||||
ACE_END_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
#if defined (__ACE_INLINE__)
|
||||
|
||||
@@ -411,7 +411,6 @@ ACE_OutputCDR::write_float_array (const ACE_CDR::Float *x,
|
||||
length);
|
||||
}
|
||||
|
||||
|
||||
ACE_INLINE ACE_CDR::Boolean
|
||||
ACE_OutputCDR::write_double_array (const ACE_CDR::Double *x,
|
||||
ACE_CDR::ULong length)
|
||||
@@ -496,7 +495,6 @@ ACE_OutputCDR::get_version (ACE_CDR::Octet &major, ACE_CDR::Octet &minor)
|
||||
minor = this->minor_version_;
|
||||
}
|
||||
|
||||
|
||||
ACE_INLINE const ACE_Message_Block*
|
||||
ACE_OutputCDR::begin (void) const
|
||||
{
|
||||
@@ -650,7 +648,6 @@ ACE_InputCDR::read_char (ACE_CDR::Char &x)
|
||||
return this->char_translator_->read_char (*this, x);
|
||||
}
|
||||
|
||||
|
||||
ACE_INLINE ACE_CDR::Boolean
|
||||
ACE_InputCDR::read_short (ACE_CDR::Short &x)
|
||||
{
|
||||
@@ -664,7 +661,6 @@ ACE_InputCDR::read_ushort (ACE_CDR::UShort &x)
|
||||
return this->read_2 (&x);
|
||||
}
|
||||
|
||||
|
||||
ACE_INLINE ACE_CDR::Boolean
|
||||
ACE_InputCDR::read_long (ACE_CDR::Long &x)
|
||||
{
|
||||
@@ -672,14 +668,12 @@ ACE_InputCDR::read_long (ACE_CDR::Long &x)
|
||||
return this->read_4 (reinterpret_cast<ACE_CDR::ULong*> (temp));
|
||||
}
|
||||
|
||||
|
||||
ACE_INLINE ACE_CDR::Boolean
|
||||
ACE_InputCDR::read_ulong (ACE_CDR::ULong &x)
|
||||
{
|
||||
return this->read_4 (&x);
|
||||
}
|
||||
|
||||
|
||||
ACE_INLINE ACE_CDR::Boolean
|
||||
ACE_InputCDR::read_longlong (ACE_CDR::LongLong &x)
|
||||
{
|
||||
@@ -907,7 +901,6 @@ ACE_InputCDR::read_float_array (ACE_CDR::Float *x,
|
||||
length);
|
||||
}
|
||||
|
||||
|
||||
ACE_INLINE ACE_CDR::Boolean
|
||||
ACE_InputCDR::read_double_array (ACE_CDR::Double *x,
|
||||
ACE_CDR::ULong length)
|
||||
@@ -1534,7 +1527,6 @@ ACE_InputCDR::wchar_translator (void) const
|
||||
return this->wchar_translator_;
|
||||
}
|
||||
|
||||
|
||||
ACE_INLINE void
|
||||
ACE_InputCDR::char_translator (ACE_Char_Codeset_Translator * ctran)
|
||||
{
|
||||
|
||||
@@ -82,7 +82,6 @@
|
||||
// the macros should still work if you defined your adapter class as
|
||||
// ACE_EXCEPTION_TYPE.
|
||||
|
||||
|
||||
// The following macros assume that an environment variable is passed
|
||||
// in/out of each function that can throw an exception. The type of the
|
||||
// environment variable is defined by ACE_ENV_TYPE.
|
||||
|
||||
@@ -221,7 +221,6 @@ ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRAT
|
||||
return retn;
|
||||
}
|
||||
|
||||
|
||||
template <class KEY, class VALUE, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE void
|
||||
ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::dump (void) const
|
||||
{
|
||||
|
||||
@@ -242,7 +242,6 @@ public:
|
||||
int notify_unbind (int result,
|
||||
const ATTRIBUTES &attr);
|
||||
|
||||
|
||||
/// This method acts as a notification about the CONTAINERs trybind
|
||||
/// method call
|
||||
int notify_trybind (int result,
|
||||
|
||||
@@ -13,7 +13,6 @@ ACE_RCSID (ace,
|
||||
Capabilities,
|
||||
"$Id: Capabilities.cpp 80826 2008-03-04 14:51:23Z wotte $")
|
||||
|
||||
|
||||
#define ACE_ESC ((ACE_TCHAR)0x1b)
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
@@ -199,7 +198,7 @@ ACE_Capabilities::fillent (const ACE_TCHAR *buf)
|
||||
int
|
||||
ACE_Capabilities::is_entry (const ACE_TCHAR *name, const ACE_TCHAR *line)
|
||||
{
|
||||
for (;;)
|
||||
for (; ; )
|
||||
{
|
||||
// Skip blanks or irrelevant characters
|
||||
while (*line && ACE_OS::ace_isspace(*line))
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef ACE_CAPABILITIES_H
|
||||
#define ACE_CAPABILITIES_H
|
||||
#include /**/ "ace/pre.h"
|
||||
@@ -31,7 +30,6 @@
|
||||
# include "ace/OS_NS_ctype.h"
|
||||
#endif /* ACE_IS_SPLITTING */
|
||||
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
/**
|
||||
|
||||
@@ -20,7 +20,6 @@ ACE_Cleanup::cleanup (void *)
|
||||
delete this;
|
||||
}
|
||||
|
||||
|
||||
ACE_Cleanup::~ACE_Cleanup (void)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef CLEANUP_STRATEGIES_H
|
||||
#define CLEANUP_STRATEGIES_H
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
#include "ace/Basic_Types.h"
|
||||
#include "ace/Global_Macros.h"
|
||||
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
/**
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#include "ace/Codeset_IBM1047.h"
|
||||
|
||||
#if defined (ACE_HAS_EBCDIC)
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef ACE_CODESET_IMB1047_H
|
||||
#define ACE_CODESET_IMB1047_H
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
@@ -478,7 +478,6 @@ ACE_Configuration_Win32Registry::ACE_Configuration_Win32Registry (HKEY hKey)
|
||||
root_ = ACE_Configuration_Section_Key (temp);
|
||||
}
|
||||
|
||||
|
||||
ACE_Configuration_Win32Registry::~ACE_Configuration_Win32Registry (void)
|
||||
{
|
||||
}
|
||||
@@ -979,7 +978,6 @@ ACE_Configuration_Win32Registry::remove_value (const ACE_Configuration_Section_K
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
ACE_Configuration_Win32Registry::load_key (const ACE_Configuration_Section_Key& key,
|
||||
HKEY& hKey)
|
||||
@@ -1277,7 +1275,6 @@ ACE_Configuration_Heap::open (size_t default_map_size)
|
||||
return create_index ();
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
ACE_Configuration_Heap::open (const ACE_TCHAR* file_name,
|
||||
void* base_address,
|
||||
@@ -1373,7 +1370,6 @@ ACE_Configuration_Heap::load_key (const ACE_Configuration_Section_Key& key,
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
ACE_Configuration_Heap::add_section (const ACE_Configuration_Section_Key& base,
|
||||
const ACE_TCHAR* sub_section,
|
||||
@@ -2012,7 +2008,6 @@ ACE_Configuration_Heap::get_integer_value (const ACE_Configuration_Section_Key&
|
||||
return -1; // section does not exist
|
||||
}
|
||||
|
||||
|
||||
// See if it exists first
|
||||
ACE_Configuration_ExtId VExtId (t_name);
|
||||
ACE_Configuration_Value_IntId VIntId;
|
||||
|
||||
@@ -37,7 +37,6 @@
|
||||
#include "ace/Local_Memory_Pool.h"
|
||||
#include "ace/Synch_Traits.h"
|
||||
|
||||
|
||||
#if !defined (ACE_LACKS_PRAGMA_ONCE)
|
||||
# pragma once
|
||||
#endif /* ACE_LACKS_PRAGMA_ONCE */
|
||||
@@ -423,7 +422,6 @@ protected:
|
||||
ACE_Configuration (const ACE_Configuration& rhs);
|
||||
ACE_Configuration& operator= (const ACE_Configuration& rhs);
|
||||
|
||||
|
||||
ACE_Configuration_Section_Key root_;
|
||||
};
|
||||
|
||||
|
||||
@@ -388,7 +388,6 @@ ACE_Registry_ImpExp::process_previous_line_format (ACE_TCHAR* buffer,
|
||||
return 0;
|
||||
} // end read_previous_line_format
|
||||
|
||||
|
||||
ACE_Ini_ImpExp::ACE_Ini_ImpExp (ACE_Configuration& config)
|
||||
: ACE_Config_ImpExp_Base (config)
|
||||
{
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
#include "ace/Connection_Recycling_Strategy.h"
|
||||
|
||||
|
||||
ACE_RCSID(ace, Connection_Recycling_Strategy, "$Id: Connection_Recycling_Strategy.cpp 80826 2008-03-04 14:51:23Z wotte $")
|
||||
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
ACE_Connection_Recycling_Strategy::~ACE_Connection_Recycling_Strategy (void)
|
||||
|
||||
@@ -40,7 +40,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
class ACE_Allocator;
|
||||
|
||||
|
||||
/**
|
||||
* @class ACE_Bounded_Stack
|
||||
*
|
||||
@@ -173,7 +172,6 @@ private:
|
||||
|
||||
//----------------------------------------
|
||||
|
||||
|
||||
/**
|
||||
* @class ACE_Fixed_Stack
|
||||
*
|
||||
@@ -333,8 +331,6 @@ private:
|
||||
T item_;
|
||||
};
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @class ACE_Unbounded_Stack
|
||||
*
|
||||
@@ -408,7 +404,6 @@ public:
|
||||
|
||||
// = Classic Stack operations.
|
||||
|
||||
|
||||
///Push an element onto the top of stack.
|
||||
/**
|
||||
* Place a new item on top of the stack. Returns -1 if the stack
|
||||
@@ -774,7 +769,6 @@ public:
|
||||
ACE_ALLOC_HOOK_DECLARE;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @class ACE_Double_Linked_List
|
||||
*
|
||||
@@ -992,7 +986,6 @@ protected:
|
||||
ACE_Allocator *allocator_;
|
||||
};
|
||||
|
||||
|
||||
template <class T> class ACE_DLList;
|
||||
template <class T> class ACE_DLList_Iterator;
|
||||
template <class T> class ACE_DLList_Reverse_Iterator;
|
||||
@@ -1553,7 +1546,6 @@ private:
|
||||
ssize_t next_;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @class ACE_Bounded_Set
|
||||
*
|
||||
@@ -1776,7 +1768,6 @@ private:
|
||||
ACE_Ordered_MultiSet<T> &set_;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @class ACE_Ordered_MultiSet
|
||||
*
|
||||
|
||||
@@ -159,7 +159,6 @@ ACE_Unbounded_Stack<T>::size (void) const
|
||||
|
||||
// ---
|
||||
|
||||
|
||||
// ---
|
||||
|
||||
template <class T, size_t ACE_SIZE> ACE_INLINE int
|
||||
@@ -248,8 +247,6 @@ ACE_Ordered_MultiSet_Iterator<T>::dump (void) const
|
||||
#endif /* ACE_HAS_DUMP */
|
||||
}
|
||||
|
||||
|
||||
|
||||
// --
|
||||
|
||||
template <class T> ACE_INLINE int
|
||||
@@ -312,7 +309,6 @@ ACE_Array<T>::operator!= (const ACE_Array<T> &s) const
|
||||
|
||||
// ****************************************************************
|
||||
|
||||
|
||||
// ****************************************************************
|
||||
|
||||
template <class T> ACE_INLINE void
|
||||
@@ -420,7 +416,6 @@ ACE_DLList_Iterator<T>::dump (void) const
|
||||
#endif /* ACE_HAS_DUMP */
|
||||
}
|
||||
|
||||
|
||||
template <class T> ACE_INLINE int
|
||||
ACE_DLList_Reverse_Iterator<T>::remove (void)
|
||||
{
|
||||
@@ -467,7 +462,6 @@ ACE_DLList_Reverse_Iterator<T>::next (void) const
|
||||
return (T *) (temp ? temp->item_ : 0);
|
||||
}
|
||||
|
||||
|
||||
template <class T> ACE_INLINE void
|
||||
ACE_DLList_Reverse_Iterator<T>::dump (void) const
|
||||
{
|
||||
|
||||
@@ -8,12 +8,10 @@
|
||||
|
||||
#include "ace/Copy_Disabled.h"
|
||||
|
||||
|
||||
ACE_RCSID (ace,
|
||||
Copy_Disabled,
|
||||
"$Id: Copy_Disabled.cpp 80826 2008-03-04 14:51:23Z wotte $")
|
||||
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
ACE_Copy_Disabled::ACE_Copy_Disabled (void)
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef ACE_DEV_H
|
||||
#define ACE_DEV_H
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
@@ -8,12 +8,10 @@
|
||||
#include "ace/DEV_Connector.inl"
|
||||
#endif /* __ACE_INLINE__ */
|
||||
|
||||
|
||||
ACE_RCSID (ace,
|
||||
DEV_Connector,
|
||||
"$Id: DEV_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $")
|
||||
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
ACE_ALLOC_HOOK_DEFINE(ACE_DEV_Connector)
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
# pragma once
|
||||
#endif /* ACE_LACKS_PRAGMA_ONCE */
|
||||
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
/**
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
|
||||
ACE_RCSID(ace, DEV_IO, "$Id: DEV_IO.cpp 80826 2008-03-04 14:51:23Z wotte $")
|
||||
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
ACE_ALLOC_HOOK_DEFINE(ACE_DEV_IO)
|
||||
|
||||
@@ -67,7 +67,6 @@ ACE_DLL::operator= (const ACE_DLL &rhs)
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
||||
// If the library name and the opening mode are specified than on
|
||||
// object creation the library is implicitly opened.
|
||||
|
||||
|
||||
@@ -59,7 +59,6 @@ public:
|
||||
/// Allow assignment
|
||||
ACE_DLL& operator= (const ACE_DLL &rhs);
|
||||
|
||||
|
||||
/**
|
||||
* This constructor performs the actions of open() during construction.
|
||||
* @param dll_name The name or path of the DLL to load.
|
||||
@@ -167,7 +166,6 @@ private:
|
||||
bool close_handle_on_destruction = true,
|
||||
ACE_SHLIB_HANDLE handle = 0);
|
||||
|
||||
|
||||
//private:
|
||||
public:
|
||||
|
||||
|
||||
@@ -233,7 +233,6 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name,
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
ACE_DLL_Handle::close (int unload)
|
||||
{
|
||||
@@ -493,7 +492,6 @@ ACE_DLL_Handle::get_dll_names (const ACE_TCHAR *dll_name,
|
||||
// Pointer to the Singleton instance.
|
||||
ACE_DLL_Manager *ACE_DLL_Manager::instance_ = 0;
|
||||
|
||||
|
||||
ACE_DLL_Manager *
|
||||
ACE_DLL_Manager::instance (int size)
|
||||
{
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
|
||||
#define ACE_DEFAULT_DLL_MANAGER_SIZE 1024
|
||||
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
/**
|
||||
|
||||
@@ -31,7 +31,6 @@ ACE_RCSID (ace,
|
||||
# include "ace/Dev_Poll_Reactor.inl"
|
||||
#endif /* __ACE_INLINE__ */
|
||||
|
||||
|
||||
#include "ace/Handle_Set.h"
|
||||
#include "ace/Reactor.h"
|
||||
#include "ace/Timer_Heap.h"
|
||||
@@ -278,7 +277,6 @@ ACE_Dev_Poll_Reactor_Notify::read_notify_pipe (ACE_HANDLE handle,
|
||||
return have_one ? 1 : 0;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
ACE_Dev_Poll_Reactor_Notify::handle_input (ACE_HANDLE handle)
|
||||
{
|
||||
@@ -811,7 +809,6 @@ ACE_Dev_Poll_Reactor::current_info (ACE_HANDLE, size_t & /* size */)
|
||||
ACE_NOTSUP_RETURN (-1);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
ACE_Dev_Poll_Reactor::set_sig_handler (ACE_Sig_Handler *signal_handler)
|
||||
{
|
||||
@@ -1005,7 +1002,6 @@ ACE_Dev_Poll_Reactor::work_pending_i (ACE_Time_Value * max_wait_time)
|
||||
return (nfds == 0 && timers_pending != 0 ? 1 : nfds);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
ACE_Dev_Poll_Reactor::handle_events (ACE_Time_Value *max_wait_time)
|
||||
{
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
*/
|
||||
// =========================================================================
|
||||
|
||||
|
||||
#ifndef ACE_DEV_POLL_REACTOR_H
|
||||
#define ACE_DEV_POLL_REACTOR_H
|
||||
|
||||
@@ -1071,7 +1070,6 @@ protected:
|
||||
/// The pollfd array that `/dev/poll' will feed its results to.
|
||||
struct pollfd *dp_fds_;
|
||||
|
||||
|
||||
/// Pointer to the next pollfd array element that contains the next
|
||||
/// event to be dispatched.
|
||||
struct pollfd *start_pfds_;
|
||||
@@ -1191,7 +1189,6 @@ protected:
|
||||
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @class ACE_Dev_Poll_Handler_Guard
|
||||
*
|
||||
|
||||
@@ -184,7 +184,6 @@ ACE_Dev_Poll_Reactor::upcall (ACE_Event_Handler *event_handler,
|
||||
return status;
|
||||
}
|
||||
|
||||
|
||||
/************************************************************************/
|
||||
// Methods for ACE_Dev_Poll_Reactor::Token_Guard
|
||||
/************************************************************************/
|
||||
|
||||
@@ -47,7 +47,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef ACE_DUMP_H
|
||||
#define ACE_DUMP_H
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef ACE_DUMP_T_H
|
||||
#define ACE_DUMP_T_H
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
@@ -82,7 +82,6 @@ ACE_Dynamic_Message_Strategy::priority_status (ACE_Message_Block & mb,
|
||||
return status;
|
||||
}
|
||||
|
||||
|
||||
// Dump the state of the strategy.
|
||||
|
||||
void
|
||||
|
||||
@@ -5,14 +5,12 @@
|
||||
#include "ace/Service_Types.h"
|
||||
#include "ace/Log_Msg.h"
|
||||
|
||||
|
||||
ACE_RCSID (ace,
|
||||
Dynamic_Service_Base,
|
||||
"$Id: Dynamic_Service_Base.cpp 80826 2008-03-04 14:51:23Z wotte $")
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
|
||||
void
|
||||
ACE_Dynamic_Service_Base::dump (void) const
|
||||
{
|
||||
@@ -47,7 +45,7 @@ ACE_Dynamic_Service_Base::find_i (const ACE_Service_Gestalt* &repo,
|
||||
|
||||
ACE_Service_Gestalt* global = ACE_Service_Config::global ();
|
||||
|
||||
for ( ; (repo->find (name, &svc_rec) == -1) && !no_global; repo = global)
|
||||
for (; (repo->find (name, &svc_rec) == -1) && !no_global; repo = global)
|
||||
{
|
||||
// Check the static repo, too if different
|
||||
if (repo == global)
|
||||
@@ -57,7 +55,6 @@ ACE_Dynamic_Service_Base::find_i (const ACE_Service_Gestalt* &repo,
|
||||
return svc_rec;
|
||||
}
|
||||
|
||||
|
||||
// Get the instance using <name> for specific configuration repository.
|
||||
void *
|
||||
ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo,
|
||||
|
||||
@@ -8,10 +8,8 @@ ACE_RCSID (ace,
|
||||
Dynamic_Service_Dependency,
|
||||
"$Id: Dynamic_Service_Dependency.cpp 80826 2008-03-04 14:51:23Z wotte $")
|
||||
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
|
||||
ACE_Dynamic_Service_Dependency::ACE_Dynamic_Service_Dependency (const ACE_TCHAR *principal)
|
||||
{
|
||||
this->init (ACE_Service_Config::current (), principal);
|
||||
@@ -23,7 +21,6 @@ ACE_Dynamic_Service_Dependency::ACE_Dynamic_Service_Dependency (const ACE_Servic
|
||||
this->init (cfg, principal);
|
||||
}
|
||||
|
||||
|
||||
ACE_Dynamic_Service_Dependency::~ACE_Dynamic_Service_Dependency (void)
|
||||
{
|
||||
if (ACE::debug ())
|
||||
@@ -47,6 +44,5 @@ ACE_Dynamic_Service_Dependency::init (const ACE_Service_Gestalt *cfg,
|
||||
this->tracker_ = st->dll ();
|
||||
}
|
||||
|
||||
|
||||
ACE_END_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
|
||||
#if !defined (ACE_LACKS_PRAGMA_ONCE)
|
||||
# pragma once
|
||||
#endif /* ACE_LACKS_PRAGMA_ONCE */
|
||||
@@ -64,7 +63,6 @@ private:
|
||||
|
||||
ACE_END_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
|
||||
#include /**/ "ace/post.h"
|
||||
|
||||
#endif /* ACE_DYNAMIC_SERVICE_DEPENDENCY_H */
|
||||
|
||||
@@ -145,7 +145,6 @@ ACE_Event_Handler::resume_handler (void)
|
||||
return ACE_Event_Handler::ACE_REACTOR_RESUMES_HANDLER;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
ACE_Event_Handler::handle_qos (ACE_HANDLE)
|
||||
{
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
//==========================================================================
|
||||
|
||||
|
||||
#ifndef ACE_FIFO_H
|
||||
#define ACE_FIFO_H
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
//==========================================================================
|
||||
|
||||
|
||||
#ifndef ACE_FIFO_RECV_H
|
||||
#define ACE_FIFO_RECV_H
|
||||
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef ACE_FIFO_RECV_MSG_H
|
||||
#define ACE_FIFO_RECV_MSG_H
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
@@ -43,12 +43,12 @@ ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg)
|
||||
ssize_t recv_len = ACE_OS::read (this->get_handle (),
|
||||
(char *) recv_msg.buf,
|
||||
ACE_MIN (remaining, requested));
|
||||
|
||||
|
||||
if (recv_len == -1)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
// Tell caller what's really in the buffer.
|
||||
recv_msg.len = static_cast<int> (recv_len);
|
||||
|
||||
@@ -60,7 +60,7 @@ ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg)
|
||||
// saving the indication here either to read the remainder later.
|
||||
size_t total_msg_size = remaining;
|
||||
remaining -= recv_len;
|
||||
|
||||
|
||||
while (remaining > 0)
|
||||
{
|
||||
const size_t throw_away = 1024;
|
||||
@@ -68,15 +68,15 @@ ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg)
|
||||
recv_len = ACE_OS::read (this->get_handle (),
|
||||
dev_null,
|
||||
ACE_MIN (remaining, throw_away));
|
||||
|
||||
|
||||
if (recv_len == -1)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
remaining -= recv_len;
|
||||
}
|
||||
|
||||
|
||||
return ACE_Utils::truncate_cast<ssize_t> (total_msg_size);
|
||||
}
|
||||
#endif /* ACE_HAS_STREAM_PIPES */
|
||||
@@ -118,7 +118,7 @@ ACE_FIFO_Recv_Msg::recv (int *band,
|
||||
int *flags)
|
||||
{
|
||||
ACE_TRACE ("ACE_FIFO_Recv_Msg::recv");
|
||||
|
||||
|
||||
if (ACE_OS::getpmsg (this->get_handle (),
|
||||
(strbuf *) cntl,
|
||||
(strbuf *) data,
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
//==========================================================================
|
||||
|
||||
|
||||
#ifndef ACE_FIFO_SEND_H
|
||||
#define ACE_FIFO_SEND_H
|
||||
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef ACE_FIFO_SEND_MSG_H
|
||||
#define ACE_FIFO_SEND_MSG_H
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
//
|
||||
// $Id: FILE_Addr.inl 80826 2008-03-04 14:51:23Z wotte $
|
||||
|
||||
|
||||
#include "ace/SString.h"
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
@@ -200,7 +200,6 @@ ACE_Filecache_Hash::equal (const ACE_TCHAR *const &id1,
|
||||
#undef ACE_Filecache_Hash
|
||||
#undef ACE_Filecache_Hash_Entry
|
||||
|
||||
|
||||
// -------------
|
||||
// ACE_Filecache
|
||||
// -------------
|
||||
@@ -307,7 +306,6 @@ ACE_Filecache::find (const ACE_TCHAR *filename)
|
||||
return this->hash_.find (filename);
|
||||
}
|
||||
|
||||
|
||||
ACE_Filecache_Object *
|
||||
ACE_Filecache::remove (const ACE_TCHAR *filename)
|
||||
{
|
||||
@@ -330,7 +328,6 @@ ACE_Filecache::remove (const ACE_TCHAR *filename)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
ACE_Filecache_Object *
|
||||
ACE_Filecache::fetch (const ACE_TCHAR *filename, int mapit)
|
||||
{
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef ACE_FILECACHE_H
|
||||
#define ACE_FILECACHE_H
|
||||
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#include "ace/Functor_T.h"
|
||||
#include "ace/Functor.h"
|
||||
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
*/
|
||||
//==========================================================================
|
||||
|
||||
|
||||
#ifndef ACE_FUNCTOR_H
|
||||
#define ACE_FUNCTOR_H
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#include "ace/ACE.h"
|
||||
#include "ace/OS_NS_string.h"
|
||||
|
||||
@@ -238,7 +237,6 @@ ACE_Less_Than<char *>::operator () (const char *lhs, const char *rhs) const
|
||||
return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0;
|
||||
}
|
||||
|
||||
|
||||
#if defined (ACE_HAS_WCHAR)
|
||||
|
||||
ACE_INLINE unsigned long
|
||||
|
||||
@@ -53,7 +53,6 @@ public:
|
||||
const ACE_CString &rhs) const;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @class ACE_Hash<ACE_CString>
|
||||
*
|
||||
@@ -67,7 +66,6 @@ public:
|
||||
unsigned long operator () (const ACE_CString &lhs) const;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @class ACE_Less_Than<ACE_CString>
|
||||
*
|
||||
@@ -83,7 +81,6 @@ public:
|
||||
const ACE_CString &rhs) const;
|
||||
};
|
||||
|
||||
|
||||
#if defined (ACE_USES_WCHAR)
|
||||
|
||||
/**
|
||||
@@ -100,7 +97,6 @@ public:
|
||||
const ACE_WString &rhs) const;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @class ACE_Hash<ACE_WString>
|
||||
*
|
||||
|
||||
@@ -13,7 +13,6 @@ ACE_Hash<ACE_CString>::operator () (const ACE_CString &t) const
|
||||
return t.hash ();
|
||||
}
|
||||
|
||||
|
||||
ACE_INLINE int
|
||||
ACE_Equal_To<ACE_CString>::operator () (const ACE_CString &lhs,
|
||||
const ACE_CString &rhs) const
|
||||
@@ -28,7 +27,6 @@ ACE_Less_Than<ACE_CString>::operator () (const ACE_CString &lhs,
|
||||
return (lhs < rhs);
|
||||
}
|
||||
|
||||
|
||||
#if defined (ACE_USES_WCHAR)
|
||||
ACE_INLINE unsigned long
|
||||
ACE_Hash<ACE_WString>::operator () (const ACE_WString &t) const
|
||||
@@ -36,7 +34,6 @@ ACE_Hash<ACE_WString>::operator () (const ACE_WString &t) const
|
||||
return t.hash ();
|
||||
}
|
||||
|
||||
|
||||
ACE_INLINE int
|
||||
ACE_Equal_To<ACE_WString>::operator () (const ACE_WString &lhs,
|
||||
const ACE_WString &rhs) const
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef ACE_FUNCTOR_T_H
|
||||
#define ACE_FUNCTOR_T_H
|
||||
#include /**/ "ace/pre.h"
|
||||
@@ -145,7 +144,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
|
||||
#include "ace/Functor_T.inl"
|
||||
#endif /* __ACE_INLINE__ */
|
||||
|
||||
|
||||
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
|
||||
#include "ace/Functor_T.cpp"
|
||||
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
|
||||
|
||||
@@ -462,7 +462,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
|
||||
while (0)
|
||||
# endif /* defined ! ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR */
|
||||
|
||||
|
||||
/*******************************************************************/
|
||||
|
||||
/// Service Objects, i.e., objects dynamically loaded via the service
|
||||
@@ -621,7 +620,6 @@ static ACE_Static_Svc_##SERVICE_CLASS ace_static_svc_##SERVICE_CLASS;
|
||||
#define ACE_MAKE_SVC_CONFIG_FACTORY_NAME(VERSIONED_NAMESPACE,SERVICE_CLASS) ACE_MAKE_SVC_CONFIG_FUNCTION_NAME(_make,VERSIONED_NAMESPACE,SERVICE_CLASS)
|
||||
#define ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(VERSIONED_NAMESPACE,SERVICE_CLASS) ACE_MAKE_SVC_CONFIG_FUNCTION_NAME(_gobble,VERSIONED_NAMESPACE,SERVICE_CLASS)
|
||||
|
||||
|
||||
/// Declare the factory method used to create dynamically loadable
|
||||
/// services.
|
||||
/**
|
||||
@@ -838,7 +836,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
|
||||
# endif /* !defined PIPE_TYPE_MESSAGE */
|
||||
#endif /* ACE_WIN32 */
|
||||
|
||||
|
||||
// Some useful abstrations for expressions involving
|
||||
// ACE_Allocator.malloc (). The difference between ACE_NEW_MALLOC*
|
||||
// with ACE_ALLOCATOR* is that they call constructors also.
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef ACE_HANDLE_GOBBLER_H
|
||||
#define ACE_HANDLE_GOBBLER_H
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
@@ -10,7 +10,6 @@ ACE_RCSID (ace,
|
||||
Handle_Ops,
|
||||
"$Id: Handle_Ops.cpp 80826 2008-03-04 14:51:23Z wotte $")
|
||||
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
ACE_HANDLE
|
||||
|
||||
@@ -499,7 +499,6 @@ ACE_Handle_Set_Iterator::ACE_Handle_Set_Iterator (const ACE_Handle_Set &hs)
|
||||
#endif /* !ACE_WIN32 && !ACE_HAS_BIG_FD_SET */
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
ACE_Handle_Set_Iterator::reset_state (void)
|
||||
{
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
*/
|
||||
//=============================================================================
|
||||
|
||||
|
||||
#ifndef HASH_CACHE_MAP_MANAGER_T_H
|
||||
#define HASH_CACHE_MAP_MANAGER_T_H
|
||||
|
||||
@@ -196,7 +195,6 @@ protected:
|
||||
|
||||
ACE_END_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
|
||||
#if defined (__ACE_INLINE__)
|
||||
#include "ace/Hash_Cache_Map_Manager_T.inl"
|
||||
#endif /* __ACE_INLINE__ */
|
||||
|
||||
@@ -107,7 +107,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
|
||||
#pragma implementation ("Hash_Map_With_Allocator_T.cpp")
|
||||
#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
|
||||
|
||||
|
||||
#include /**/ "ace/post.h"
|
||||
#endif /* ACE_HASH_MAP_WITH_ALLOCATOR_T_H */
|
||||
|
||||
|
||||
@@ -6,12 +6,10 @@
|
||||
#include "ace/Hashable.inl"
|
||||
#endif /* __ACE_INLINE __ */
|
||||
|
||||
|
||||
ACE_RCSID (ace,
|
||||
Hashable,
|
||||
"$Id: Hashable.cpp 80826 2008-03-04 14:51:23Z wotte $")
|
||||
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
ACE_Hashable::~ACE_Hashable (void)
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
//
|
||||
// $Id: Hashable.inl 80826 2008-03-04 14:51:23Z wotte $
|
||||
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
ACE_INLINE
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user