diff options
Diffstat (limited to 'dep')
468 files changed, 119 insertions, 1882 deletions
diff --git a/dep/ACE_wrappers/ace/ACE.cpp b/dep/ACE_wrappers/ace/ACE.cpp index 7ccf15ed341..8897a5c0ea1 100644 --- a/dep/ACE_wrappers/ace/ACE.cpp +++ b/dep/ACE_wrappers/ace/ACE.cpp @@ -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, diff --git a/dep/ACE_wrappers/ace/ACE.inl b/dep/ACE_wrappers/ace/ACE.inl index f800ac80a32..8e92cb2bc39 100644 --- a/dep/ACE_wrappers/ace/ACE.inl +++ b/dep/ACE_wrappers/ace/ACE.inl @@ -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 diff --git a/dep/ACE_wrappers/ace/ACE_crc32.cpp b/dep/ACE_wrappers/ace/ACE_crc32.cpp index e29a6426187..40608e8f7bc 100644 --- a/dep/ACE_wrappers/ace/ACE_crc32.cpp +++ b/dep/ACE_wrappers/ace/ACE_crc32.cpp @@ -6,7 +6,6 @@ ACE_RCSID (ace, ACE_crc32, "$Id: ACE_crc32.cpp 80826 2008-03-04 14:51:23Z wotte $") - namespace { /*****************************************************************/ diff --git a/dep/ACE_wrappers/ace/ATM_Acceptor.cpp b/dep/ACE_wrappers/ace/ATM_Acceptor.cpp index 0a58b7f3b1f..af2e0e1f695 100644 --- a/dep/ACE_wrappers/ace/ATM_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/ATM_Acceptor.cpp @@ -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 */ diff --git a/dep/ACE_wrappers/ace/ATM_Acceptor.h b/dep/ACE_wrappers/ace/ATM_Acceptor.h index 900cec098c5..762a8c2122c 100644 --- a/dep/ACE_wrappers/ace/ATM_Acceptor.h +++ b/dep/ACE_wrappers/ace/ATM_Acceptor.h @@ -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__ */ diff --git a/dep/ACE_wrappers/ace/ATM_Addr.cpp b/dep/ACE_wrappers/ace/ATM_Addr.cpp index 8b4781c5e80..033816743ea 100644 --- a/dep/ACE_wrappers/ace/ATM_Addr.cpp +++ b/dep/ACE_wrappers/ace/ATM_Addr.cpp @@ -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) diff --git a/dep/ACE_wrappers/ace/ATM_Addr.h b/dep/ACE_wrappers/ace/ATM_Addr.h index c111aa44843..3c586f10a11 100644 --- a/dep/ACE_wrappers/ace/ATM_Addr.h +++ b/dep/ACE_wrappers/ace/ATM_Addr.h @@ -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__ */ diff --git a/dep/ACE_wrappers/ace/ATM_Params.h b/dep/ACE_wrappers/ace/ATM_Params.h index a244644915d..c460afbd3c2 100644 --- a/dep/ACE_wrappers/ace/ATM_Params.h +++ b/dep/ACE_wrappers/ace/ATM_Params.h @@ -10,7 +10,6 @@ */ //========================================================================== - #ifndef ACE_ATM_PARAMS_H #define ACE_ATM_PARAMS_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/ATM_QoS.h b/dep/ACE_wrappers/ace/ATM_QoS.h index 3e839fb50d1..927005aa68d 100644 --- a/dep/ACE_wrappers/ace/ATM_QoS.h +++ b/dep/ACE_wrappers/ace/ATM_QoS.h @@ -10,7 +10,6 @@ */ //========================================================================== - #ifndef ACE_ATM_QoS_H #define ACE_ATM_QoS_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/ATM_Stream.h b/dep/ACE_wrappers/ace/ATM_Stream.h index e880f7197d4..2d31c7654d1 100644 --- a/dep/ACE_wrappers/ace/ATM_Stream.h +++ b/dep/ACE_wrappers/ace/ATM_Stream.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_ATM_STREAM_H #define ACE_ATM_STREAM_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Acceptor.h b/dep/ACE_wrappers/ace/Acceptor.h index 855b2f877a3..8f0f16935fb 100644 --- a/dep/ACE_wrappers/ace/Acceptor.h +++ b/dep/ACE_wrappers/ace/Acceptor.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, diff --git a/dep/ACE_wrappers/ace/Active_Map_Manager.h b/dep/ACE_wrappers/ace/Active_Map_Manager.h index 174009910a6..c72d6dbba4c 100644 --- a/dep/ACE_wrappers/ace/Active_Map_Manager.h +++ b/dep/ACE_wrappers/ace/Active_Map_Manager.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_ACTIVE_MAP_MANAGER_H #define ACE_ACTIVE_MAP_MANAGER_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Active_Map_Manager_T.h b/dep/ACE_wrappers/ace/Active_Map_Manager_T.h index 7930628dc94..660f0bbbec4 100644 --- a/dep/ACE_wrappers/ace/Active_Map_Manager_T.h +++ b/dep/ACE_wrappers/ace/Active_Map_Manager_T.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_ACTIVE_MAP_MANAGER_T_H #define ACE_ACTIVE_MAP_MANAGER_T_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Addr.cpp b/dep/ACE_wrappers/ace/Addr.cpp index db6e29c7273..6944bfea740 100644 --- a/dep/ACE_wrappers/ace/Addr.cpp +++ b/dep/ACE_wrappers/ace/Addr.cpp @@ -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... diff --git a/dep/ACE_wrappers/ace/Argv_Type_Converter.cpp b/dep/ACE_wrappers/ace/Argv_Type_Converter.cpp index 6b0860caaee..3679fbc0737 100644 --- a/dep/ACE_wrappers/ace/Argv_Type_Converter.cpp +++ b/dep/ACE_wrappers/ace/Argv_Type_Converter.cpp @@ -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) { diff --git a/dep/ACE_wrappers/ace/Array_Map.h b/dep/ACE_wrappers/ace/Array_Map.h index 18c0dbe1b39..f7b79a4be39 100644 --- a/dep/ACE_wrappers/ace/Array_Map.h +++ b/dep/ACE_wrappers/ace/Array_Map.h @@ -16,7 +16,6 @@ */ //============================================================================= - #ifndef ACE_ARRAY_MAP_H #define ACE_ARRAY_MAP_H diff --git a/dep/ACE_wrappers/ace/Asynch_Connector.h b/dep/ACE_wrappers/ace/Asynch_Connector.h index 64781ad36a5..569242cba22 100644 --- a/dep/ACE_wrappers/ace/Asynch_Connector.h +++ b/dep/ACE_wrappers/ace/Asynch_Connector.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, diff --git a/dep/ACE_wrappers/ace/Asynch_IO.cpp b/dep/ACE_wrappers/ace/Asynch_IO.cpp index f004fb0d234..ad7dedfc671 100644 --- a/dep/ACE_wrappers/ace/Asynch_IO.cpp +++ b/dep/ACE_wrappers/ace/Asynch_IO.cpp @@ -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) { diff --git a/dep/ACE_wrappers/ace/Asynch_IO.h b/dep/ACE_wrappers/ace/Asynch_IO.h index 3b5004ce46e..00b24b82e74 100644 --- a/dep/ACE_wrappers/ace/Asynch_IO.h +++ b/dep/ACE_wrappers/ace/Asynch_IO.h @@ -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 * diff --git a/dep/ACE_wrappers/ace/Asynch_IO_Impl.h b/dep/ACE_wrappers/ace/Asynch_IO_Impl.h index 9e6652e7e8e..087a292f813 100644 --- a/dep/ACE_wrappers/ace/Asynch_IO_Impl.h +++ b/dep/ACE_wrappers/ace/Asynch_IO_Impl.h @@ -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 * diff --git a/dep/ACE_wrappers/ace/Asynch_IO_Impl.inl b/dep/ACE_wrappers/ace/Asynch_IO_Impl.inl index 60dc69dfb31..8e37772f5c9 100644 --- a/dep/ACE_wrappers/ace/Asynch_IO_Impl.inl +++ b/dep/ACE_wrappers/ace/Asynch_IO_Impl.inl @@ -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 () diff --git a/dep/ACE_wrappers/ace/Asynch_Pseudo_Task.cpp b/dep/ACE_wrappers/ace/Asynch_Pseudo_Task.cpp index 34715c2bba4..891cb0cf4d0 100644 --- a/dep/ACE_wrappers/ace/Asynch_Pseudo_Task.cpp +++ b/dep/ACE_wrappers/ace/Asynch_Pseudo_Task.cpp @@ -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, diff --git a/dep/ACE_wrappers/ace/Atomic_Op.inl b/dep/ACE_wrappers/ace/Atomic_Op.inl index ed6bfbdbc1b..8735fa8d85a 100644 --- a/dep/ACE_wrappers/ace/Atomic_Op.inl +++ b/dep/ACE_wrappers/ace/Atomic_Op.inl @@ -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) diff --git a/dep/ACE_wrappers/ace/Atomic_Op_T.inl b/dep/ACE_wrappers/ace/Atomic_Op_T.inl index ff051b0cbce..2ac73d9fd39 100644 --- a/dep/ACE_wrappers/ace/Atomic_Op_T.inl +++ b/dep/ACE_wrappers/ace/Atomic_Op_T.inl @@ -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= ( diff --git a/dep/ACE_wrappers/ace/Auto_IncDec_T.h b/dep/ACE_wrappers/ace/Auto_IncDec_T.h index bc46b8b2f50..8a8840e84b2 100644 --- a/dep/ACE_wrappers/ace/Auto_IncDec_T.h +++ b/dep/ACE_wrappers/ace/Auto_IncDec_T.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_AUTO_INCDEC_T_H #define ACE_AUTO_INCDEC_T_H diff --git a/dep/ACE_wrappers/ace/Auto_Ptr.h b/dep/ACE_wrappers/ace/Auto_Ptr.h index d7547c440e2..ce52100609b 100644 --- a/dep/ACE_wrappers/ace/Auto_Ptr.h +++ b/dep/ACE_wrappers/ace/Auto_Ptr.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. * diff --git a/dep/ACE_wrappers/ace/Base_Thread_Adapter.h b/dep/ACE_wrappers/ace/Base_Thread_Adapter.h index beee7210f42..968535917d2 100644 --- a/dep/ACE_wrappers/ace/Base_Thread_Adapter.h +++ b/dep/ACE_wrappers/ace/Base_Thread_Adapter.h @@ -67,11 +67,8 @@ protected: long flags_; }; - - class ACE_Service_Gestalt; - /** * @class ACE_Base_Thread_Adapter * diff --git a/dep/ACE_wrappers/ace/Based_Pointer_Repository.h b/dep/ACE_wrappers/ace/Based_Pointer_Repository.h index 047e34dca28..4cb49cb078b 100644 --- a/dep/ACE_wrappers/ace/Based_Pointer_Repository.h +++ b/dep/ACE_wrappers/ace/Based_Pointer_Repository.h @@ -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. diff --git a/dep/ACE_wrappers/ace/Basic_Stats.h b/dep/ACE_wrappers/ace/Basic_Stats.h index fcc9996d8ba..2bf96a61c06 100644 --- a/dep/ACE_wrappers/ace/Basic_Stats.h +++ b/dep/ACE_wrappers/ace/Basic_Stats.h @@ -9,7 +9,6 @@ */ //============================================================================= - #ifndef ACE_BASIC_STATS_H #define ACE_BASIC_STATS_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Basic_Types.cpp b/dep/ACE_wrappers/ace/Basic_Types.cpp index f7c87cdb9ce..2aebf729b64 100644 --- a/dep/ACE_wrappers/ace/Basic_Types.cpp +++ b/dep/ACE_wrappers/ace/Basic_Types.cpp @@ -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) diff --git a/dep/ACE_wrappers/ace/Basic_Types.h b/dep/ACE_wrappers/ace/Basic_Types.h index 9b57fd81c43..eb080e4975e 100644 --- a/dep/ACE_wrappers/ace/Basic_Types.h +++ b/dep/ACE_wrappers/ace/Basic_Types.h @@ -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 diff --git a/dep/ACE_wrappers/ace/Basic_Types.inl b/dep/ACE_wrappers/ace/Basic_Types.inl index c6f0013d45e..19cc7579b82 100644 --- a/dep/ACE_wrappers/ace/Basic_Types.inl +++ b/dep/ACE_wrappers/ace/Basic_Types.inl @@ -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 { diff --git a/dep/ACE_wrappers/ace/Bound_Ptr.inl b/dep/ACE_wrappers/ace/Bound_Ptr.inl index 540a5516eab..3165f6f5acc 100644 --- a/dep/ACE_wrappers/ace/Bound_Ptr.inl +++ b/dep/ACE_wrappers/ace/Bound_Ptr.inl @@ -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) { diff --git a/dep/ACE_wrappers/ace/CDR_Base.cpp b/dep/ACE_wrappers/ace/CDR_Base.cpp index e7647006b65..7b271280886 100644 --- a/dep/ACE_wrappers/ace/CDR_Base.cpp +++ b/dep/ACE_wrappers/ace/CDR_Base.cpp @@ -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); diff --git a/dep/ACE_wrappers/ace/CDR_Base.h b/dep/ACE_wrappers/ace/CDR_Base.h index c3b2e368514..47db56002ee 100644 --- a/dep/ACE_wrappers/ace/CDR_Base.h +++ b/dep/ACE_wrappers/ace/CDR_Base.h @@ -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 */ diff --git a/dep/ACE_wrappers/ace/CDR_Size.cpp b/dep/ACE_wrappers/ace/CDR_Size.cpp index 074631080c4..f3c72df2734 100644 --- a/dep/ACE_wrappers/ace/CDR_Size.cpp +++ b/dep/ACE_wrappers/ace/CDR_Size.cpp @@ -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, diff --git a/dep/ACE_wrappers/ace/CDR_Size.h b/dep/ACE_wrappers/ace/CDR_Size.h index 777c29acc4d..3803310c7f2 100644 --- a/dep/ACE_wrappers/ace/CDR_Size.h +++ b/dep/ACE_wrappers/ace/CDR_Size.h @@ -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 */ diff --git a/dep/ACE_wrappers/ace/CDR_Size.inl b/dep/ACE_wrappers/ace/CDR_Size.inl index 4ea81523faf..5d65ab94c09 100644 --- a/dep/ACE_wrappers/ace/CDR_Size.inl +++ b/dep/ACE_wrappers/ace/CDR_Size.inl @@ -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 diff --git a/dep/ACE_wrappers/ace/CDR_Stream.cpp b/dep/ACE_wrappers/ace/CDR_Stream.cpp index 1282f75358a..aa313cdff75 100644 --- a/dep/ACE_wrappers/ace/CDR_Stream.cpp +++ b/dep/ACE_wrappers/ace/CDR_Stream.cpp @@ -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) diff --git a/dep/ACE_wrappers/ace/CDR_Stream.h b/dep/ACE_wrappers/ace/CDR_Stream.h index 348433a0de4..c49a0006266 100644 --- a/dep/ACE_wrappers/ace/CDR_Stream.h +++ b/dep/ACE_wrappers/ace/CDR_Stream.h @@ -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__) diff --git a/dep/ACE_wrappers/ace/CDR_Stream.inl b/dep/ACE_wrappers/ace/CDR_Stream.inl index 9fef2d8fab0..bf5a6e25cb2 100644 --- a/dep/ACE_wrappers/ace/CDR_Stream.inl +++ b/dep/ACE_wrappers/ace/CDR_Stream.inl @@ -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) { diff --git a/dep/ACE_wrappers/ace/CORBA_macros.h b/dep/ACE_wrappers/ace/CORBA_macros.h index ce45893b0a2..7284e9ae8e3 100644 --- a/dep/ACE_wrappers/ace/CORBA_macros.h +++ b/dep/ACE_wrappers/ace/CORBA_macros.h @@ -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. diff --git a/dep/ACE_wrappers/ace/Cache_Map_Manager_T.inl b/dep/ACE_wrappers/ace/Cache_Map_Manager_T.inl index bcd48bd33e9..5c5c4eb593e 100644 --- a/dep/ACE_wrappers/ace/Cache_Map_Manager_T.inl +++ b/dep/ACE_wrappers/ace/Cache_Map_Manager_T.inl @@ -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 { diff --git a/dep/ACE_wrappers/ace/Caching_Strategies_T.h b/dep/ACE_wrappers/ace/Caching_Strategies_T.h index d78332e41f5..e2fa428c3b7 100644 --- a/dep/ACE_wrappers/ace/Caching_Strategies_T.h +++ b/dep/ACE_wrappers/ace/Caching_Strategies_T.h @@ -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, diff --git a/dep/ACE_wrappers/ace/Capabilities.cpp b/dep/ACE_wrappers/ace/Capabilities.cpp index 4f8151d1bc6..a42ff448844 100644 --- a/dep/ACE_wrappers/ace/Capabilities.cpp +++ b/dep/ACE_wrappers/ace/Capabilities.cpp @@ -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)) diff --git a/dep/ACE_wrappers/ace/Capabilities.h b/dep/ACE_wrappers/ace/Capabilities.h index 459afd1c681..8c239825e7d 100644 --- a/dep/ACE_wrappers/ace/Capabilities.h +++ b/dep/ACE_wrappers/ace/Capabilities.h @@ -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 /** diff --git a/dep/ACE_wrappers/ace/Cleanup.cpp b/dep/ACE_wrappers/ace/Cleanup.cpp index 960e74fffa4..e7736972678 100644 --- a/dep/ACE_wrappers/ace/Cleanup.cpp +++ b/dep/ACE_wrappers/ace/Cleanup.cpp @@ -20,7 +20,6 @@ ACE_Cleanup::cleanup (void *) delete this; } - ACE_Cleanup::~ACE_Cleanup (void) { } diff --git a/dep/ACE_wrappers/ace/Cleanup_Strategies_T.h b/dep/ACE_wrappers/ace/Cleanup_Strategies_T.h index 776ae28441b..89775562f6e 100644 --- a/dep/ACE_wrappers/ace/Cleanup_Strategies_T.h +++ b/dep/ACE_wrappers/ace/Cleanup_Strategies_T.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef CLEANUP_STRATEGIES_H #define CLEANUP_STRATEGIES_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Codecs.h b/dep/ACE_wrappers/ace/Codecs.h index 0e0f13ac319..5b1b8bbde70 100644 --- a/dep/ACE_wrappers/ace/Codecs.h +++ b/dep/ACE_wrappers/ace/Codecs.h @@ -30,7 +30,6 @@ #include "ace/Basic_Types.h" #include "ace/Global_Macros.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** diff --git a/dep/ACE_wrappers/ace/Codeset_IBM1047.cpp b/dep/ACE_wrappers/ace/Codeset_IBM1047.cpp index 62488c8927c..dde4eafb42c 100644 --- a/dep/ACE_wrappers/ace/Codeset_IBM1047.cpp +++ b/dep/ACE_wrappers/ace/Codeset_IBM1047.cpp @@ -13,7 +13,6 @@ */ //============================================================================= - #include "ace/Codeset_IBM1047.h" #if defined (ACE_HAS_EBCDIC) diff --git a/dep/ACE_wrappers/ace/Codeset_IBM1047.h b/dep/ACE_wrappers/ace/Codeset_IBM1047.h index 7e0df2b5c08..5e19763f94c 100644 --- a/dep/ACE_wrappers/ace/Codeset_IBM1047.h +++ b/dep/ACE_wrappers/ace/Codeset_IBM1047.h @@ -13,7 +13,6 @@ */ //============================================================================= - #ifndef ACE_CODESET_IMB1047_H #define ACE_CODESET_IMB1047_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Configuration.cpp b/dep/ACE_wrappers/ace/Configuration.cpp index fd8548d9e8d..9c7f1d278b5 100644 --- a/dep/ACE_wrappers/ace/Configuration.cpp +++ b/dep/ACE_wrappers/ace/Configuration.cpp @@ -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; diff --git a/dep/ACE_wrappers/ace/Configuration.h b/dep/ACE_wrappers/ace/Configuration.h index 55bd705bf64..14972e1eca3 100644 --- a/dep/ACE_wrappers/ace/Configuration.h +++ b/dep/ACE_wrappers/ace/Configuration.h @@ -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_; }; diff --git a/dep/ACE_wrappers/ace/Configuration_Import_Export.cpp b/dep/ACE_wrappers/ace/Configuration_Import_Export.cpp index bd5a79b143a..5225ec48331 100644 --- a/dep/ACE_wrappers/ace/Configuration_Import_Export.cpp +++ b/dep/ACE_wrappers/ace/Configuration_Import_Export.cpp @@ -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) { diff --git a/dep/ACE_wrappers/ace/Connection_Recycling_Strategy.cpp b/dep/ACE_wrappers/ace/Connection_Recycling_Strategy.cpp index 6f32c9a2de2..752b2220bb3 100644 --- a/dep/ACE_wrappers/ace/Connection_Recycling_Strategy.cpp +++ b/dep/ACE_wrappers/ace/Connection_Recycling_Strategy.cpp @@ -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) diff --git a/dep/ACE_wrappers/ace/Containers_T.h b/dep/ACE_wrappers/ace/Containers_T.h index 8969d3cf969..d8ba71c64a6 100644 --- a/dep/ACE_wrappers/ace/Containers_T.h +++ b/dep/ACE_wrappers/ace/Containers_T.h @@ -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 * diff --git a/dep/ACE_wrappers/ace/Containers_T.inl b/dep/ACE_wrappers/ace/Containers_T.inl index 912c9df8bb8..b387061ac80 100644 --- a/dep/ACE_wrappers/ace/Containers_T.inl +++ b/dep/ACE_wrappers/ace/Containers_T.inl @@ -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 { diff --git a/dep/ACE_wrappers/ace/Copy_Disabled.cpp b/dep/ACE_wrappers/ace/Copy_Disabled.cpp index 92cc98cd1ef..8fa35ddb02f 100644 --- a/dep/ACE_wrappers/ace/Copy_Disabled.cpp +++ b/dep/ACE_wrappers/ace/Copy_Disabled.cpp @@ -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) diff --git a/dep/ACE_wrappers/ace/DEV.h b/dep/ACE_wrappers/ace/DEV.h index 6a6a7419e37..21b4783ca4a 100644 --- a/dep/ACE_wrappers/ace/DEV.h +++ b/dep/ACE_wrappers/ace/DEV.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_DEV_H #define ACE_DEV_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/DEV_Connector.cpp b/dep/ACE_wrappers/ace/DEV_Connector.cpp index 02763c95296..9f4c985b1d4 100644 --- a/dep/ACE_wrappers/ace/DEV_Connector.cpp +++ b/dep/ACE_wrappers/ace/DEV_Connector.cpp @@ -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) diff --git a/dep/ACE_wrappers/ace/DEV_Connector.h b/dep/ACE_wrappers/ace/DEV_Connector.h index 565d7ae024a..9a949ed92d7 100644 --- a/dep/ACE_wrappers/ace/DEV_Connector.h +++ b/dep/ACE_wrappers/ace/DEV_Connector.h @@ -22,7 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** diff --git a/dep/ACE_wrappers/ace/DEV_IO.cpp b/dep/ACE_wrappers/ace/DEV_IO.cpp index e3c92041f28..82dd891b661 100644 --- a/dep/ACE_wrappers/ace/DEV_IO.cpp +++ b/dep/ACE_wrappers/ace/DEV_IO.cpp @@ -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) diff --git a/dep/ACE_wrappers/ace/DLL.cpp b/dep/ACE_wrappers/ace/DLL.cpp index 43cfa2efa84..7ed04b942c8 100644 --- a/dep/ACE_wrappers/ace/DLL.cpp +++ b/dep/ACE_wrappers/ace/DLL.cpp @@ -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. diff --git a/dep/ACE_wrappers/ace/DLL.h b/dep/ACE_wrappers/ace/DLL.h index a9700daafc0..afd309d02c4 100644 --- a/dep/ACE_wrappers/ace/DLL.h +++ b/dep/ACE_wrappers/ace/DLL.h @@ -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: diff --git a/dep/ACE_wrappers/ace/DLL_Manager.cpp b/dep/ACE_wrappers/ace/DLL_Manager.cpp index 9463aa5e1bc..997c4e13471 100644 --- a/dep/ACE_wrappers/ace/DLL_Manager.cpp +++ b/dep/ACE_wrappers/ace/DLL_Manager.cpp @@ -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) { diff --git a/dep/ACE_wrappers/ace/DLL_Manager.h b/dep/ACE_wrappers/ace/DLL_Manager.h index 0e571b6c03a..9b63c7ead5b 100644 --- a/dep/ACE_wrappers/ace/DLL_Manager.h +++ b/dep/ACE_wrappers/ace/DLL_Manager.h @@ -31,7 +31,6 @@ #define ACE_DEFAULT_DLL_MANAGER_SIZE 1024 - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** diff --git a/dep/ACE_wrappers/ace/Dev_Poll_Reactor.cpp b/dep/ACE_wrappers/ace/Dev_Poll_Reactor.cpp index 2cd90d17738..bcc3127003e 100644 --- a/dep/ACE_wrappers/ace/Dev_Poll_Reactor.cpp +++ b/dep/ACE_wrappers/ace/Dev_Poll_Reactor.cpp @@ -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) { diff --git a/dep/ACE_wrappers/ace/Dev_Poll_Reactor.h b/dep/ACE_wrappers/ace/Dev_Poll_Reactor.h index c675999bb4c..6118d8e0a38 100644 --- a/dep/ACE_wrappers/ace/Dev_Poll_Reactor.h +++ b/dep/ACE_wrappers/ace/Dev_Poll_Reactor.h @@ -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 * diff --git a/dep/ACE_wrappers/ace/Dev_Poll_Reactor.inl b/dep/ACE_wrappers/ace/Dev_Poll_Reactor.inl index 96e71f2dea5..98761f63220 100644 --- a/dep/ACE_wrappers/ace/Dev_Poll_Reactor.inl +++ b/dep/ACE_wrappers/ace/Dev_Poll_Reactor.inl @@ -184,7 +184,6 @@ ACE_Dev_Poll_Reactor::upcall (ACE_Event_Handler *event_handler, return status; } - /************************************************************************/ // Methods for ACE_Dev_Poll_Reactor::Token_Guard /************************************************************************/ diff --git a/dep/ACE_wrappers/ace/Dump.h b/dep/ACE_wrappers/ace/Dump.h index 354b162cfb6..d94a740bce7 100644 --- a/dep/ACE_wrappers/ace/Dump.h +++ b/dep/ACE_wrappers/ace/Dump.h @@ -47,7 +47,6 @@ */ //============================================================================= - #ifndef ACE_DUMP_H #define ACE_DUMP_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Dump_T.h b/dep/ACE_wrappers/ace/Dump_T.h index 4134df75392..fe18af0cdcf 100644 --- a/dep/ACE_wrappers/ace/Dump_T.h +++ b/dep/ACE_wrappers/ace/Dump_T.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_DUMP_T_H #define ACE_DUMP_T_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Dynamic_Message_Strategy.cpp b/dep/ACE_wrappers/ace/Dynamic_Message_Strategy.cpp index e6c89e5238e..1fa3320d5ae 100644 --- a/dep/ACE_wrappers/ace/Dynamic_Message_Strategy.cpp +++ b/dep/ACE_wrappers/ace/Dynamic_Message_Strategy.cpp @@ -82,7 +82,6 @@ ACE_Dynamic_Message_Strategy::priority_status (ACE_Message_Block & mb, return status; } - // Dump the state of the strategy. void diff --git a/dep/ACE_wrappers/ace/Dynamic_Service_Base.cpp b/dep/ACE_wrappers/ace/Dynamic_Service_Base.cpp index 174b009d7b6..474c485b6ff 100644 --- a/dep/ACE_wrappers/ace/Dynamic_Service_Base.cpp +++ b/dep/ACE_wrappers/ace/Dynamic_Service_Base.cpp @@ -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, diff --git a/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.cpp b/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.cpp index 9a371ff3c16..8e814af86a7 100644 --- a/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.cpp +++ b/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.cpp @@ -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 diff --git a/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.h b/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.h index ce4c1d3e7cd..21e63bb9411 100644 --- a/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.h +++ b/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.h @@ -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 */ diff --git a/dep/ACE_wrappers/ace/Event_Handler.cpp b/dep/ACE_wrappers/ace/Event_Handler.cpp index 916998eea52..52aa92f99fe 100644 --- a/dep/ACE_wrappers/ace/Event_Handler.cpp +++ b/dep/ACE_wrappers/ace/Event_Handler.cpp @@ -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) { diff --git a/dep/ACE_wrappers/ace/FIFO.h b/dep/ACE_wrappers/ace/FIFO.h index a1ef6038e35..76090778e8f 100644 --- a/dep/ACE_wrappers/ace/FIFO.h +++ b/dep/ACE_wrappers/ace/FIFO.h @@ -10,7 +10,6 @@ */ //========================================================================== - #ifndef ACE_FIFO_H #define ACE_FIFO_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/FIFO_Recv.h b/dep/ACE_wrappers/ace/FIFO_Recv.h index 7c9ffbec84e..482b9a1f283 100644 --- a/dep/ACE_wrappers/ace/FIFO_Recv.h +++ b/dep/ACE_wrappers/ace/FIFO_Recv.h @@ -10,7 +10,6 @@ */ //========================================================================== - #ifndef ACE_FIFO_RECV_H #define ACE_FIFO_RECV_H diff --git a/dep/ACE_wrappers/ace/FIFO_Recv_Msg.h b/dep/ACE_wrappers/ace/FIFO_Recv_Msg.h index 5490814c56b..c9ce36a1523 100644 --- a/dep/ACE_wrappers/ace/FIFO_Recv_Msg.h +++ b/dep/ACE_wrappers/ace/FIFO_Recv_Msg.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_FIFO_RECV_MSG_H #define ACE_FIFO_RECV_MSG_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/FIFO_Recv_Msg.inl b/dep/ACE_wrappers/ace/FIFO_Recv_Msg.inl index 0a0b0673d38..3055892172b 100644 --- a/dep/ACE_wrappers/ace/FIFO_Recv_Msg.inl +++ b/dep/ACE_wrappers/ace/FIFO_Recv_Msg.inl @@ -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, diff --git a/dep/ACE_wrappers/ace/FIFO_Send.h b/dep/ACE_wrappers/ace/FIFO_Send.h index 7c0928cceaf..414569325d9 100644 --- a/dep/ACE_wrappers/ace/FIFO_Send.h +++ b/dep/ACE_wrappers/ace/FIFO_Send.h @@ -10,7 +10,6 @@ */ //========================================================================== - #ifndef ACE_FIFO_SEND_H #define ACE_FIFO_SEND_H diff --git a/dep/ACE_wrappers/ace/FIFO_Send_Msg.h b/dep/ACE_wrappers/ace/FIFO_Send_Msg.h index ff746969156..79314a89ad5 100644 --- a/dep/ACE_wrappers/ace/FIFO_Send_Msg.h +++ b/dep/ACE_wrappers/ace/FIFO_Send_Msg.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_FIFO_SEND_MSG_H #define ACE_FIFO_SEND_MSG_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/FILE_Addr.inl b/dep/ACE_wrappers/ace/FILE_Addr.inl index 0ae7d31d278..b323911e516 100644 --- a/dep/ACE_wrappers/ace/FILE_Addr.inl +++ b/dep/ACE_wrappers/ace/FILE_Addr.inl @@ -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 diff --git a/dep/ACE_wrappers/ace/Filecache.cpp b/dep/ACE_wrappers/ace/Filecache.cpp index cfb70f94f68..b57581e5668 100644 --- a/dep/ACE_wrappers/ace/Filecache.cpp +++ b/dep/ACE_wrappers/ace/Filecache.cpp @@ -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) { diff --git a/dep/ACE_wrappers/ace/Filecache.h b/dep/ACE_wrappers/ace/Filecache.h index c6dba10f339..126082adc12 100644 --- a/dep/ACE_wrappers/ace/Filecache.h +++ b/dep/ACE_wrappers/ace/Filecache.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_FILECACHE_H #define ACE_FILECACHE_H diff --git a/dep/ACE_wrappers/ace/Functor.cpp b/dep/ACE_wrappers/ace/Functor.cpp index 618adcf5a61..29db0244aac 100644 --- a/dep/ACE_wrappers/ace/Functor.cpp +++ b/dep/ACE_wrappers/ace/Functor.cpp @@ -24,7 +24,6 @@ */ //============================================================================= - #include "ace/Functor_T.h" #include "ace/Functor.h" diff --git a/dep/ACE_wrappers/ace/Functor.h b/dep/ACE_wrappers/ace/Functor.h index d8f393c68b6..bff4cf375b1 100644 --- a/dep/ACE_wrappers/ace/Functor.h +++ b/dep/ACE_wrappers/ace/Functor.h @@ -27,7 +27,6 @@ */ //========================================================================== - #ifndef ACE_FUNCTOR_H #define ACE_FUNCTOR_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Functor.inl b/dep/ACE_wrappers/ace/Functor.inl index 30e539459a8..c8477c2b8eb 100644 --- a/dep/ACE_wrappers/ace/Functor.inl +++ b/dep/ACE_wrappers/ace/Functor.inl @@ -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 diff --git a/dep/ACE_wrappers/ace/Functor_String.h b/dep/ACE_wrappers/ace/Functor_String.h index 5fabef1f625..6167bd5b5b2 100644 --- a/dep/ACE_wrappers/ace/Functor_String.h +++ b/dep/ACE_wrappers/ace/Functor_String.h @@ -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> * diff --git a/dep/ACE_wrappers/ace/Functor_String.inl b/dep/ACE_wrappers/ace/Functor_String.inl index bdac96386f8..f4155044fce 100644 --- a/dep/ACE_wrappers/ace/Functor_String.inl +++ b/dep/ACE_wrappers/ace/Functor_String.inl @@ -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 diff --git a/dep/ACE_wrappers/ace/Functor_T.h b/dep/ACE_wrappers/ace/Functor_T.h index 4a3a621366c..13387119f53 100644 --- a/dep/ACE_wrappers/ace/Functor_T.h +++ b/dep/ACE_wrappers/ace/Functor_T.h @@ -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 */ diff --git a/dep/ACE_wrappers/ace/Global_Macros.h b/dep/ACE_wrappers/ace/Global_Macros.h index 12f6a2465c6..4d8bb016842 100644 --- a/dep/ACE_wrappers/ace/Global_Macros.h +++ b/dep/ACE_wrappers/ace/Global_Macros.h @@ -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. diff --git a/dep/ACE_wrappers/ace/Handle_Gobbler.h b/dep/ACE_wrappers/ace/Handle_Gobbler.h index 9e9805a676f..ed7107a6302 100644 --- a/dep/ACE_wrappers/ace/Handle_Gobbler.h +++ b/dep/ACE_wrappers/ace/Handle_Gobbler.h @@ -11,7 +11,6 @@ */ //============================================================================= - #ifndef ACE_HANDLE_GOBBLER_H #define ACE_HANDLE_GOBBLER_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Handle_Ops.cpp b/dep/ACE_wrappers/ace/Handle_Ops.cpp index 213fa933d7a..ed19109b445 100644 --- a/dep/ACE_wrappers/ace/Handle_Ops.cpp +++ b/dep/ACE_wrappers/ace/Handle_Ops.cpp @@ -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 diff --git a/dep/ACE_wrappers/ace/Handle_Set.cpp b/dep/ACE_wrappers/ace/Handle_Set.cpp index 288d0010169..cb460dcb798 100644 --- a/dep/ACE_wrappers/ace/Handle_Set.cpp +++ b/dep/ACE_wrappers/ace/Handle_Set.cpp @@ -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) { diff --git a/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.h b/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.h index 5326c97d33f..8fa9703d5b4 100644 --- a/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.h +++ b/dep/ACE_wrappers/ace/Hash_Cache_Map_Manager_T.h @@ -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__ */ diff --git a/dep/ACE_wrappers/ace/Hash_Map_With_Allocator_T.h b/dep/ACE_wrappers/ace/Hash_Map_With_Allocator_T.h index cb42eee5929..2bc68aede25 100644 --- a/dep/ACE_wrappers/ace/Hash_Map_With_Allocator_T.h +++ b/dep/ACE_wrappers/ace/Hash_Map_With_Allocator_T.h @@ -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 */ diff --git a/dep/ACE_wrappers/ace/Hashable.cpp b/dep/ACE_wrappers/ace/Hashable.cpp index c3c9bc43a1a..07723697b28 100644 --- a/dep/ACE_wrappers/ace/Hashable.cpp +++ b/dep/ACE_wrappers/ace/Hashable.cpp @@ -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) diff --git a/dep/ACE_wrappers/ace/Hashable.inl b/dep/ACE_wrappers/ace/Hashable.inl index 352b7794eb9..c279e515f32 100644 --- a/dep/ACE_wrappers/ace/Hashable.inl +++ b/dep/ACE_wrappers/ace/Hashable.inl @@ -2,7 +2,6 @@ // // $Id: Hashable.inl 80826 2008-03-04 14:51:23Z wotte $ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE diff --git a/dep/ACE_wrappers/ace/High_Res_Timer.cpp b/dep/ACE_wrappers/ace/High_Res_Timer.cpp index 181c1da5682..03b9d643418 100644 --- a/dep/ACE_wrappers/ace/High_Res_Timer.cpp +++ b/dep/ACE_wrappers/ace/High_Res_Timer.cpp @@ -74,7 +74,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL /* static */ int ACE_High_Res_Timer::global_scale_factor_status_ = 0; - #if defined (linux) // Determine the apparent CPU clock speed from /proc/cpuinfo ACE_UINT32 diff --git a/dep/ACE_wrappers/ace/High_Res_Timer.inl b/dep/ACE_wrappers/ace/High_Res_Timer.inl index 85df18abe8b..7a20845e496 100644 --- a/dep/ACE_wrappers/ace/High_Res_Timer.inl +++ b/dep/ACE_wrappers/ace/High_Res_Timer.inl @@ -38,7 +38,6 @@ ACE_High_Res_Timer::hrtime_to_tv (ACE_Time_Value &tv, tv.usec ((long) ((hrt - tmp) / global_scale_factor ())); } - ACE_INLINE ACE_Time_Value ACE_High_Res_Timer::gettimeofday (const ACE_OS::ACE_HRTimer_Op op) { @@ -57,7 +56,6 @@ ACE_High_Res_Timer::gettimeofday (const ACE_OS::ACE_HRTimer_Op op) return tv; } - // Get the current high res timer as the time of day. This is intended // to be used for a gettimeofday replacement in ACE_Timer_Queue and // derived classes so the timers will bebased on high res timers rather @@ -70,7 +68,6 @@ ACE_High_Res_Timer::gettimeofday_hr (void) return ACE_High_Res_Timer::gettimeofday (); } - ACE_INLINE ACE_hrtime_t ACE_High_Res_Timer::gettime (const ACE_OS::ACE_HRTimer_Op op) { diff --git a/dep/ACE_wrappers/ace/ICMP_Socket.cpp b/dep/ACE_wrappers/ace/ICMP_Socket.cpp index 51f8a9b2064..8274805d4ec 100644 --- a/dep/ACE_wrappers/ace/ICMP_Socket.cpp +++ b/dep/ACE_wrappers/ace/ICMP_Socket.cpp @@ -9,17 +9,14 @@ #include "ace/OS_NS_netdb.h" #include "ace/OS_NS_sys_socket.h" - ACE_RCSID (ace, ICMP_Socket, "$Id: ICMP_Socket.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE (ACE_ICMP_Socket) - void ACE_ICMP_Socket::dump (void) const { diff --git a/dep/ACE_wrappers/ace/INET_Addr.cpp b/dep/ACE_wrappers/ace/INET_Addr.cpp index 6da4417f08e..20b7bbb382f 100644 --- a/dep/ACE_wrappers/ace/INET_Addr.cpp +++ b/dep/ACE_wrappers/ace/INET_Addr.cpp @@ -142,7 +142,6 @@ ACE_INET_Addr::is_ip_equal (const ACE_INET_Addr &sap) const return this->get_ip_address () == sap.get_ip_address(); } - u_long ACE_INET_Addr::hash (void) const { @@ -314,7 +313,6 @@ ACE_INET_Addr::set (u_short port_number, return 0; } - // Initializes a ACE_INET_Addr from a PORT_NUMBER and the remote // HOST_NAME. @@ -947,7 +945,6 @@ int ACE_INET_Addr::set_address (const char *ip_addr, if (encode) ip4 = ACE_HTONL (ip4); - if (this->get_type () == AF_INET && map == 0) { this->base_set (AF_INET, sizeof (this->inet_addr_.in4_)); #ifdef ACE_HAS_SOCKADDR_IN_SIN_LEN diff --git a/dep/ACE_wrappers/ace/INET_Addr.inl b/dep/ACE_wrappers/ace/INET_Addr.inl index 4cd9d404b82..e17048e0142 100644 --- a/dep/ACE_wrappers/ace/INET_Addr.inl +++ b/dep/ACE_wrappers/ace/INET_Addr.inl @@ -2,7 +2,6 @@ // // $Id: INET_Addr.inl 80826 2008-03-04 14:51:23Z wotte $ - #include "ace/OS_NS_string.h" #include "ace/Global_Macros.h" #include "ace/OS_NS_arpa_inet.h" diff --git a/dep/ACE_wrappers/ace/IOStream.cpp b/dep/ACE_wrappers/ace/IOStream.cpp index 0b6ac17ca6f..4fc8e851212 100644 --- a/dep/ACE_wrappers/ace/IOStream.cpp +++ b/dep/ACE_wrappers/ace/IOStream.cpp @@ -48,7 +48,6 @@ ACE_RCSID(ace, IOStream, "$Id: IOStream.cpp 80826 2008-03-04 14:51:23Z wotte $") // a reference to iostream. The second >> has no idea of the ACE_IOStream and // gets invoked on iostream. Probably NOT what you wanted! - // In order to make all of this work the way you want, you have to do this: class myiostream : public iostream @@ -79,7 +78,6 @@ ACE_RCSID(ace, IOStream, "$Id: IOStream.cpp 80826 2008-03-04 14:51:23Z wotte $") // OK // invokes myiostream::operator>> (int&) returning myiostream& - foo >> i >> s; // OK // Because you provided operator>> (int&) in class myiostream, that diff --git a/dep/ACE_wrappers/ace/IOStream.h b/dep/ACE_wrappers/ace/IOStream.h index d7995a8e4f6..be66c857962 100644 --- a/dep/ACE_wrappers/ace/IOStream.h +++ b/dep/ACE_wrappers/ace/IOStream.h @@ -427,7 +427,6 @@ typedef ostream& (*__omanip_)(ostream&); #define PUT_PROT(MT,DT,CODE) PUT_SIG(MT,DT) CODE #define PUT_FUNC(MT,DT) PUT_PROT(MT,DT,PUT_CODE) - // These are necessary in case somebody wants to derive from us and // override one of these with a custom approach. diff --git a/dep/ACE_wrappers/ace/IO_Cntl_Msg.h b/dep/ACE_wrappers/ace/IO_Cntl_Msg.h index e99d0189620..fafc1fc7e1a 100644 --- a/dep/ACE_wrappers/ace/IO_Cntl_Msg.h +++ b/dep/ACE_wrappers/ace/IO_Cntl_Msg.h @@ -10,7 +10,6 @@ */ //========================================================================== - #ifndef ACE_IO_CNTL_MSG_H #define ACE_IO_CNTL_MSG_H diff --git a/dep/ACE_wrappers/ace/IO_SAP.h b/dep/ACE_wrappers/ace/IO_SAP.h index 94f717c7981..a9826995195 100644 --- a/dep/ACE_wrappers/ace/IO_SAP.h +++ b/dep/ACE_wrappers/ace/IO_SAP.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_IO_SAP_H #define ACE_IO_SAP_H #include /**/ "ace/pre.h" @@ -22,7 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** diff --git a/dep/ACE_wrappers/ace/Init_ACE.cpp b/dep/ACE_wrappers/ace/Init_ACE.cpp index 655ef539d6f..a71f73b5992 100644 --- a/dep/ACE_wrappers/ace/Init_ACE.cpp +++ b/dep/ACE_wrappers/ace/Init_ACE.cpp @@ -6,7 +6,6 @@ ACE_RCSID (ace, Init_ACE, "$Id: Init_ACE.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL unsigned int ACE::init_fini_count_ = 0; diff --git a/dep/ACE_wrappers/ace/Init_ACE.h b/dep/ACE_wrappers/ace/Init_ACE.h index 9f2afa34669..cc3f5aa6b66 100644 --- a/dep/ACE_wrappers/ace/Init_ACE.h +++ b/dep/ACE_wrappers/ace/Init_ACE.h @@ -11,7 +11,6 @@ */ //============================================================================= - #ifndef ACE_INIT_ACE_H #define ACE_INIT_ACE_H diff --git a/dep/ACE_wrappers/ace/Intrusive_Auto_Ptr.h b/dep/ACE_wrappers/ace/Intrusive_Auto_Ptr.h index 85d52f7f1c5..375ec292527 100644 --- a/dep/ACE_wrappers/ace/Intrusive_Auto_Ptr.h +++ b/dep/ACE_wrappers/ace/Intrusive_Auto_Ptr.h @@ -63,7 +63,6 @@ public: return rep_ == 0 ? 0: unspecified_bool; } - // = Initialization and termination methods. /// Constructor that initializes an ACE_Intrusive_Auto_Ptr to diff --git a/dep/ACE_wrappers/ace/Intrusive_Auto_Ptr.inl b/dep/ACE_wrappers/ace/Intrusive_Auto_Ptr.inl index 4feb83db7b1..aa3e2659930 100644 --- a/dep/ACE_wrappers/ace/Intrusive_Auto_Ptr.inl +++ b/dep/ACE_wrappers/ace/Intrusive_Auto_Ptr.inl @@ -143,5 +143,4 @@ template<class T, class U> ACE_INLINE bool operator==(ACE_Intrusive_Auto_Ptr<T> return a != b.get(); } - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.h b/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.h index 6429a2888c8..1271b1d9060 100644 --- a/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.h +++ b/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_LOCK_SOCK_ACCEPTOR_H #define ACE_LOCK_SOCK_ACCEPTOR_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/LSOCK.h b/dep/ACE_wrappers/ace/LSOCK.h index 250362cdaef..caec4362e0c 100644 --- a/dep/ACE_wrappers/ace/LSOCK.h +++ b/dep/ACE_wrappers/ace/LSOCK.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_LOCAL_SOCK_H #define ACE_LOCAL_SOCK_H diff --git a/dep/ACE_wrappers/ace/LSOCK_Acceptor.h b/dep/ACE_wrappers/ace/LSOCK_Acceptor.h index 1168c389ab6..625f8f72853 100644 --- a/dep/ACE_wrappers/ace/LSOCK_Acceptor.h +++ b/dep/ACE_wrappers/ace/LSOCK_Acceptor.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_LOCAL_SOCK_ACCEPTOR_H #define ACE_LOCAL_SOCK_ACCEPTOR_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/LSOCK_CODgram.h b/dep/ACE_wrappers/ace/LSOCK_CODgram.h index 1ea5ba00386..48fb9c63bcf 100644 --- a/dep/ACE_wrappers/ace/LSOCK_CODgram.h +++ b/dep/ACE_wrappers/ace/LSOCK_CODgram.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_LOCAL_SOCK_CODGRAM_H #define ACE_LOCAL_SOCK_CODGRAM_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/LSOCK_Dgram.h b/dep/ACE_wrappers/ace/LSOCK_Dgram.h index 17fad2b7b43..26a3950a726 100644 --- a/dep/ACE_wrappers/ace/LSOCK_Dgram.h +++ b/dep/ACE_wrappers/ace/LSOCK_Dgram.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_LOCAL_SOCK_DGRAM_H #define ACE_LOCAL_SOCK_DGRAM_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/LSOCK_Stream.h b/dep/ACE_wrappers/ace/LSOCK_Stream.h index e95641ba725..41bb5311d94 100644 --- a/dep/ACE_wrappers/ace/LSOCK_Stream.h +++ b/dep/ACE_wrappers/ace/LSOCK_Stream.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_LOCAL_SOCK_STREAM_H #define ACE_LOCAL_SOCK_STREAM_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Lib_Find.cpp b/dep/ACE_wrappers/ace/Lib_Find.cpp index 3654751bb58..e39b27c6c9d 100644 --- a/dep/ACE_wrappers/ace/Lib_Find.cpp +++ b/dep/ACE_wrappers/ace/Lib_Find.cpp @@ -165,7 +165,6 @@ ACE::ldfind (const ACE_TCHAR* filename, return -1; } - ACE_OS::strcpy(pathname, ACE_DLL_PREFIX); ACE_OS::strcat(pathname, filename); nameDsc.dsc$w_length = ACE_OS::strlen(pathname); @@ -438,7 +437,7 @@ ACE::ldfind (const ACE_TCHAR* filename, nextholder); int result = 0; - for (;;) + for (; ; ) { // Check if at end of search path. if (path_entry == 0) @@ -677,7 +676,6 @@ ACE::strrepl (char *s, char search, char replace) return replaced; } - // Split a string up into 'token'-delimited pieces, ala Perl's // "split". diff --git a/dep/ACE_wrappers/ace/Lib_Find.h b/dep/ACE_wrappers/ace/Lib_Find.h index 1651eb77f43..05bd068fdb3 100644 --- a/dep/ACE_wrappers/ace/Lib_Find.h +++ b/dep/ACE_wrappers/ace/Lib_Find.h @@ -59,7 +59,6 @@ namespace ACE */ extern ACE_Export ACE_TCHAR *ldname (const ACE_TCHAR *entry_point); - #if defined (ACE_OPENVMS) /** * Registers an @a entry_point and its address for later retrieval diff --git a/dep/ACE_wrappers/ace/Local_Name_Space_T.h b/dep/ACE_wrappers/ace/Local_Name_Space_T.h index 1263cebd5ab..a8d556a4eb1 100644 --- a/dep/ACE_wrappers/ace/Local_Name_Space_T.h +++ b/dep/ACE_wrappers/ace/Local_Name_Space_T.h @@ -54,7 +54,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef MAP_MANAGER::ITERATOR MAP_ITERATOR; typedef MAP_MANAGER::ENTRY MAP_ENTRY; - /** * @class ACE_Name_Space_Map * diff --git a/dep/ACE_wrappers/ace/Local_Tokens.cpp b/dep/ACE_wrappers/ace/Local_Tokens.cpp index 2fc6eed1acf..248f7dee9c0 100644 --- a/dep/ACE_wrappers/ace/Local_Tokens.cpp +++ b/dep/ACE_wrappers/ace/Local_Tokens.cpp @@ -12,7 +12,6 @@ #include "ace/Local_Tokens.inl" #endif /* __ACE_INLINE__ */ - ACE_RCSID (ace, Local_Tokens, "$Id: Local_Tokens.cpp 80826 2008-03-04 14:51:23Z wotte $") @@ -869,7 +868,6 @@ ACE_RW_Token::tryacquire (ACE_TPQ_Entry *caller) this->num_writers_--; } - errno = EWOULDBLOCK; ACE_RETURN (-1); @@ -986,7 +984,6 @@ ACE_RW_Token::notify_new_owner (ACE_TPQ_Entry *old_owner) this->owner ()->proxy ()->token_acquired (this->owner ()); } - int ACE_RW_Token::owners (OWNER_STACK &stack, const ACE_TCHAR *id) diff --git a/dep/ACE_wrappers/ace/Local_Tokens.inl b/dep/ACE_wrappers/ace/Local_Tokens.inl index 56b3cb764e2..3d59893f3cf 100644 --- a/dep/ACE_wrappers/ace/Local_Tokens.inl +++ b/dep/ACE_wrappers/ace/Local_Tokens.inl @@ -264,7 +264,6 @@ ACE_Local_WLock::ACE_Local_WLock (const ACE_TCHAR *token_name, // ************************************************************ - ACE_INLINE void ACE_Token_Name::operator= (const ACE_Token_Name &rhs) { diff --git a/dep/ACE_wrappers/ace/Log_Msg.cpp b/dep/ACE_wrappers/ace/Log_Msg.cpp index 1fe455c56c3..4040a4b1978 100644 --- a/dep/ACE_wrappers/ace/Log_Msg.cpp +++ b/dep/ACE_wrappers/ace/Log_Msg.cpp @@ -2005,7 +2005,6 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, break; } - default: // So, it's not a legit format specifier after all... // Copy from the original % to where we are now, then @@ -2175,7 +2174,6 @@ ACE_Log_Msg::log (ACE_Log_Record &log_record, ACE_MT (ACE_Log_Msg_Manager::init_backend ()); } - if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::LOGGER) || ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::SYSLOG)) { @@ -2190,7 +2188,6 @@ ACE_Log_Msg::log (ACE_Log_Record &log_record, ACE_Log_Msg_Manager::custom_backend_->log (log_record); } - // This must come last, after the other two print operations // (see the <ACE_Log_Record::print> method for details). if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, diff --git a/dep/ACE_wrappers/ace/Log_Msg.h b/dep/ACE_wrappers/ace/Log_Msg.h index f799a6500ae..3c5eb5e2f23 100644 --- a/dep/ACE_wrappers/ace/Log_Msg.h +++ b/dep/ACE_wrappers/ace/Log_Msg.h @@ -728,7 +728,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL # define ACE_TSS_CLEANUP_NAME ACE_TSS_cleanup #endif /* ACE_HAS_VERSIONED_NAMESPACE == 1 */ - LOCAL_EXTERN_PREFIX void ACE_TSS_CLEANUP_NAME (void *ptr); diff --git a/dep/ACE_wrappers/ace/Log_Msg.inl b/dep/ACE_wrappers/ace/Log_Msg.inl index 2af6a376b35..e69b59140c7 100644 --- a/dep/ACE_wrappers/ace/Log_Msg.inl +++ b/dep/ACE_wrappers/ace/Log_Msg.inl @@ -229,7 +229,5 @@ ACE_Log_Msg::getpid (void) const return ACE_Log_Msg::pid_; } - - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Log_Msg_Backend.cpp b/dep/ACE_wrappers/ace/Log_Msg_Backend.cpp index f8ed295fec5..8f7e930ae0d 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_Backend.cpp +++ b/dep/ACE_wrappers/ace/Log_Msg_Backend.cpp @@ -4,7 +4,6 @@ ACE_RCSID(ace, Log_Msg_Backend, "$Id: Log_Msg_Backend.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Log_Msg_Backend::~ACE_Log_Msg_Backend (void) diff --git a/dep/ACE_wrappers/ace/Log_Msg_Backend.h b/dep/ACE_wrappers/ace/Log_Msg_Backend.h index f9de2b8bf5b..84e4956f36b 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_Backend.h +++ b/dep/ACE_wrappers/ace/Log_Msg_Backend.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_LOG_MSG_BACKEND_H #define ACE_LOG_MSG_BACKEND_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Log_Msg_Callback.cpp b/dep/ACE_wrappers/ace/Log_Msg_Callback.cpp index b227843733d..7d1a57d5f4a 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_Callback.cpp +++ b/dep/ACE_wrappers/ace/Log_Msg_Callback.cpp @@ -4,7 +4,6 @@ ACE_RCSID(ace, Log_Msg_Callback, "$Id: Log_Msg_Callback.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Log_Msg_Callback::~ACE_Log_Msg_Callback (void) diff --git a/dep/ACE_wrappers/ace/Log_Record.h b/dep/ACE_wrappers/ace/Log_Record.h index be3e0b29e1e..0a19e1f57c4 100644 --- a/dep/ACE_wrappers/ace/Log_Record.h +++ b/dep/ACE_wrappers/ace/Log_Record.h @@ -70,7 +70,6 @@ public: /// Default dtor. ~ACE_Log_Record (void); - /// Write the contents of the logging record to the appropriate /// <FILE> iff the corresponding type is enabled. int print (const ACE_TCHAR host_name[], diff --git a/dep/ACE_wrappers/ace/Logging_Strategy.cpp b/dep/ACE_wrappers/ace/Logging_Strategy.cpp index 36f2726db51..01c3cd5bc40 100644 --- a/dep/ACE_wrappers/ace/Logging_Strategy.cpp +++ b/dep/ACE_wrappers/ace/Logging_Strategy.cpp @@ -484,7 +484,7 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &, else max_num = count_; - for (int i = max_num ; i > 1 ;i--) + for (int i = max_num ; i > 1 ; i--) { ACE_OS::sprintf (backup, ACE_TEXT ("%s.%d"), diff --git a/dep/ACE_wrappers/ace/MEM_Addr.h b/dep/ACE_wrappers/ace/MEM_Addr.h index be67b507982..fa7da740f5d 100644 --- a/dep/ACE_wrappers/ace/MEM_Addr.h +++ b/dep/ACE_wrappers/ace/MEM_Addr.h @@ -10,7 +10,6 @@ */ //========================================================================== - #ifndef ACE_MEM_ADDR_H #define ACE_MEM_ADDR_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/MEM_Addr.inl b/dep/ACE_wrappers/ace/MEM_Addr.inl index ef19536dfe9..3d7a4235f07 100644 --- a/dep/ACE_wrappers/ace/MEM_Addr.inl +++ b/dep/ACE_wrappers/ace/MEM_Addr.inl @@ -2,7 +2,6 @@ // // $Id: MEM_Addr.inl 80826 2008-03-04 14:51:23Z wotte $ - #include "ace/Global_Macros.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/MEM_Connector.cpp b/dep/ACE_wrappers/ace/MEM_Connector.cpp index 21b8d94fa3a..7a8d94e7b2b 100644 --- a/dep/ACE_wrappers/ace/MEM_Connector.cpp +++ b/dep/ACE_wrappers/ace/MEM_Connector.cpp @@ -81,7 +81,6 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream, else this->address_.set_port_number (remote_sap.get_port_number ()); - ACE_SOCK_Stream temp_stream; if (ACE_SOCK_Connector::connect (temp_stream, @@ -93,7 +92,6 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream, ACE_TEXT ("ACE_MEM_Connector::connect")), -1); - ACE_HANDLE new_handle = temp_stream.get_handle (); new_stream.set_handle (new_handle); new_stream.disable (ACE_NONBLOCK); diff --git a/dep/ACE_wrappers/ace/MEM_IO.cpp b/dep/ACE_wrappers/ace/MEM_IO.cpp index b1c31619354..8c4db2871c7 100644 --- a/dep/ACE_wrappers/ace/MEM_IO.cpp +++ b/dep/ACE_wrappers/ace/MEM_IO.cpp @@ -433,7 +433,6 @@ ACE_MEM_IO::send (const ACE_Message_Block *message_block, return 0; } - #if 0 ssize_t ACE_MEM_IO::recvv (iovec *io_vec, diff --git a/dep/ACE_wrappers/ace/MEM_IO.h b/dep/ACE_wrappers/ace/MEM_IO.h index bbea3b3936d..5c05bdc444c 100644 --- a/dep/ACE_wrappers/ace/MEM_IO.h +++ b/dep/ACE_wrappers/ace/MEM_IO.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_MEM_IO_H #define ACE_MEM_IO_H #include /**/ "ace/pre.h" @@ -29,7 +28,6 @@ #include "ace/Process_Semaphore.h" #include "ace/Process_Mutex.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Reactive_MEM_IO : public ACE_MEM_SAP @@ -266,7 +264,6 @@ public: int flags, const ACE_Time_Value *timeout); - /// Dump the state of an object. void dump (void) const; diff --git a/dep/ACE_wrappers/ace/MEM_IO.inl b/dep/ACE_wrappers/ace/MEM_IO.inl index e3ec07fc5ce..7e24f74a1eb 100644 --- a/dep/ACE_wrappers/ace/MEM_IO.inl +++ b/dep/ACE_wrappers/ace/MEM_IO.inl @@ -129,7 +129,7 @@ ACE_MEM_IO::send (const void *buf, const ACE_Time_Value *timeout) { ACE_TRACE ("ACE_MEM_IO::send"); - + if (this->deliver_strategy_ == 0) { return 0; @@ -138,12 +138,12 @@ ACE_MEM_IO::send (const void *buf, ACE_MEM_SAP_Node *sbuf = this->deliver_strategy_->acquire_buffer ( ACE_Utils::truncate_cast<ssize_t> (len)); - + if (sbuf == 0) { return -1; // Memory buffer not initialized. } - + ACE_OS::memcpy (sbuf->data (), buf, len); /// @@ -166,17 +166,17 @@ ACE_MEM_IO::recv (void *buf, size_t count = 0; size_t buf_len = this->buf_size_ - this->cur_offset_; - + if (buf_len == 0) { ssize_t blen = // Buffer length this->fetch_recv_buf (flags, timeout); - + if (blen <= 0) { return blen; } - + buf_len = this->buf_size_; } diff --git a/dep/ACE_wrappers/ace/MEM_SAP.inl b/dep/ACE_wrappers/ace/MEM_SAP.inl index a006fdc1179..94339ac2d78 100644 --- a/dep/ACE_wrappers/ace/MEM_SAP.inl +++ b/dep/ACE_wrappers/ace/MEM_SAP.inl @@ -32,7 +32,6 @@ ACE_MEM_SAP_Node::data (void) return this + 1; } - ACE_INLINE ACE_MEM_SAP_Node * ACE_MEM_SAP::acquire_buffer (const ssize_t size) { diff --git a/dep/ACE_wrappers/ace/MEM_Stream.h b/dep/ACE_wrappers/ace/MEM_Stream.h index 7148e9f15ad..0a50cabfe94 100644 --- a/dep/ACE_wrappers/ace/MEM_Stream.h +++ b/dep/ACE_wrappers/ace/MEM_Stream.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_MEM_STREAM_H #define ACE_MEM_STREAM_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/MEM_Stream.inl b/dep/ACE_wrappers/ace/MEM_Stream.inl index e995db5c5f9..1e965aff1b5 100644 --- a/dep/ACE_wrappers/ace/MEM_Stream.inl +++ b/dep/ACE_wrappers/ace/MEM_Stream.inl @@ -54,7 +54,6 @@ ACE_MEM_Stream::send_n (const void *buf, size_t n) return this->send (buf, n); } - ACE_INLINE ssize_t ACE_MEM_Stream::recv_n (void *buf, size_t n) { diff --git a/dep/ACE_wrappers/ace/MMAP_Memory_Pool.cpp b/dep/ACE_wrappers/ace/MMAP_Memory_Pool.cpp index f323d111a1b..772bb538bc7 100644 --- a/dep/ACE_wrappers/ace/MMAP_Memory_Pool.cpp +++ b/dep/ACE_wrappers/ace/MMAP_Memory_Pool.cpp @@ -102,7 +102,6 @@ ACE_MMAP_Memory_Pool::protect (int prot) return this->mmap_.protect (len, prot); } - // Change the protection of the pages of the mapped region to <prot> // starting at <addr> up to <len> bytes. diff --git a/dep/ACE_wrappers/ace/Malloc.cpp b/dep/ACE_wrappers/ace/Malloc.cpp index b9684654c10..1d6fb1fd83b 100644 --- a/dep/ACE_wrappers/ace/Malloc.cpp +++ b/dep/ACE_wrappers/ace/Malloc.cpp @@ -10,12 +10,10 @@ #include "ace/Malloc_Base.h" #include "ace/OS_NS_string.h" - ACE_RCSID (ace, Malloc, "$Id: Malloc.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Process-wide ACE_Allocator. @@ -153,7 +151,6 @@ ACE_Control_Block::ACE_Name_Node::dump (void) const #endif /* ACE_HAS_DUMP */ } - #if defined (ACE_HAS_MALLOC_STATS) ACE_Malloc_Stats::ACE_Malloc_Stats (void) : nchunks_ (0), diff --git a/dep/ACE_wrappers/ace/Malloc.h b/dep/ACE_wrappers/ace/Malloc.h index 5974f012652..4fd88802933 100644 --- a/dep/ACE_wrappers/ace/Malloc.h +++ b/dep/ACE_wrappers/ace/Malloc.h @@ -33,7 +33,6 @@ # define ACE_PROCESS_MUTEX ACE_SV_Semaphore_Simple # endif /* ACE_HAS_THREADS */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_Atomic_Op<ACE_PROCESS_MUTEX, int> ACE_INT; @@ -96,7 +95,6 @@ typedef ACE_Atomic_Op<ACE_PROCESS_MUTEX, int> ACE_INT; | // Name Node linked list pointers. | +-----------------------------------------+ - * Control_Block Only the first ACE_Malloc instance that uses @@ -147,7 +145,6 @@ typedef ACE_Atomic_Op<ACE_PROCESS_MUTEX, int> ACE_INT; than the sizeof Control_Block, the control block is initialized to the following diagram: - +------------------------------------- |name_head_; | +-------------------------------------+ diff --git a/dep/ACE_wrappers/ace/Malloc_Base.h b/dep/ACE_wrappers/ace/Malloc_Base.h index 7cd204064bb..42feebbc41f 100644 --- a/dep/ACE_wrappers/ace/Malloc_Base.h +++ b/dep/ACE_wrappers/ace/Malloc_Base.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_MALLOC_BASE_H #define ACE_MALLOC_BASE_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Malloc_T.inl b/dep/ACE_wrappers/ace/Malloc_T.inl index 46f6c0c146b..ffc20dfbe51 100644 --- a/dep/ACE_wrappers/ace/Malloc_T.inl +++ b/dep/ACE_wrappers/ace/Malloc_T.inl @@ -168,7 +168,6 @@ ACE_Malloc_FIFO_Iterator<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc_FIFO_Iterator (AC { } - #if 0 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> ACE_INLINE void ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::init_malloc_header_ptr (void* ptr) diff --git a/dep/ACE_wrappers/ace/Manual_Event.cpp b/dep/ACE_wrappers/ace/Manual_Event.cpp index 33183c53f4d..504b061a8e9 100644 --- a/dep/ACE_wrappers/ace/Manual_Event.cpp +++ b/dep/ACE_wrappers/ace/Manual_Event.cpp @@ -6,7 +6,6 @@ #include "ace/Manual_Event.inl" #endif /* __ACE_INLINE__ */ - ACE_RCSID(ace, Manual_Event, "$Id: Manual_Event.cpp 80826 2008-03-04 14:51:23Z wotte $") ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Manual_Event.h b/dep/ACE_wrappers/ace/Manual_Event.h index 6a46535e6c5..ff7774f59fc 100644 --- a/dep/ACE_wrappers/ace/Manual_Event.h +++ b/dep/ACE_wrappers/ace/Manual_Event.h @@ -69,7 +69,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Manual_Event.inl" #endif /* __ACE_INLINE__ */ - #include /**/ "ace/post.h" #endif /* ACE_MANUAL_EVENT_H */ diff --git a/dep/ACE_wrappers/ace/Map.h b/dep/ACE_wrappers/ace/Map.h index 2ea515fd2dc..2095d833528 100644 --- a/dep/ACE_wrappers/ace/Map.h +++ b/dep/ACE_wrappers/ace/Map.h @@ -12,7 +12,6 @@ */ //============================================================================= - #ifndef ACE_MAP_H #define ACE_MAP_H diff --git a/dep/ACE_wrappers/ace/Mem_Map.cpp b/dep/ACE_wrappers/ace/Mem_Map.cpp index 1c79d93f33c..692839b580b 100644 --- a/dep/ACE_wrappers/ace/Mem_Map.cpp +++ b/dep/ACE_wrappers/ace/Mem_Map.cpp @@ -19,7 +19,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Mem_Map) - void ACE_Mem_Map::dump (void) const { diff --git a/dep/ACE_wrappers/ace/Mem_Map.inl b/dep/ACE_wrappers/ace/Mem_Map.inl index 3fd3235db9b..263847253ab 100644 --- a/dep/ACE_wrappers/ace/Mem_Map.inl +++ b/dep/ACE_wrappers/ace/Mem_Map.inl @@ -185,7 +185,6 @@ ACE_Mem_Map::protect (size_t len, int prot) return ACE_OS::mprotect (this->base_addr_, len, prot); } - // Change the protection of all the pages of the mapped region to <prot> // starting at <this->base_addr_>. diff --git a/dep/ACE_wrappers/ace/Message_Block.cpp b/dep/ACE_wrappers/ace/Message_Block.cpp index 072693613ea..426622cbc24 100644 --- a/dep/ACE_wrappers/ace/Message_Block.cpp +++ b/dep/ACE_wrappers/ace/Message_Block.cpp @@ -50,7 +50,6 @@ enum ACE_DATA_BLOCK_CLONE_LEAVE }; - // Setup Timeprobes ACE_TIMEPROBE_EVENT_DESCRIPTIONS (ACE_MB_Timeprobe_Description, ACE_MESSAGE_BLOCK_INIT_I_ENTER); @@ -1160,7 +1159,6 @@ ACE_Data_Block::clone_nocopy (ACE_Message_Block::Message_Flags mask, return 0; } - // Set new flags minus the mask... nb->clr_flags (mask | always_clear); return nb; diff --git a/dep/ACE_wrappers/ace/Message_Block.h b/dep/ACE_wrappers/ace/Message_Block.h index ea039a386a4..00b130968e3 100644 --- a/dep/ACE_wrappers/ace/Message_Block.h +++ b/dep/ACE_wrappers/ace/Message_Block.h @@ -33,7 +33,6 @@ class ACE_Allocator; class ACE_Data_Block; class ACE_Lock; - /** * @class ACE_Message_Block * diff --git a/dep/ACE_wrappers/ace/Message_Block.inl b/dep/ACE_wrappers/ace/Message_Block.inl index bf756e4dddb..b47b0b552b2 100644 --- a/dep/ACE_wrappers/ace/Message_Block.inl +++ b/dep/ACE_wrappers/ace/Message_Block.inl @@ -343,7 +343,6 @@ ACE_Message_Block::end (void) const return this->data_block ()->end (); } - ACE_INLINE void ACE_Message_Block::rd_ptr (char *new_ptr) { diff --git a/dep/ACE_wrappers/ace/Message_Queue_NT.cpp b/dep/ACE_wrappers/ace/Message_Queue_NT.cpp index a8c9c8859b7..57155a4dccf 100644 --- a/dep/ACE_wrappers/ace/Message_Queue_NT.cpp +++ b/dep/ACE_wrappers/ace/Message_Queue_NT.cpp @@ -11,7 +11,6 @@ ACE_RCSID (ace, Message_Queue_NT, "$Id: Message_Queue_NT.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) diff --git a/dep/ACE_wrappers/ace/Message_Queue_T.h b/dep/ACE_wrappers/ace/Message_Queue_T.h index b4c764b4de8..8f5f0217108 100644 --- a/dep/ACE_wrappers/ace/Message_Queue_T.h +++ b/dep/ACE_wrappers/ace/Message_Queue_T.h @@ -388,7 +388,6 @@ public: //@} - /** @name Water mark (flow control) methods */ //@{ @@ -619,7 +618,6 @@ private: // This typedef is used to get around a compiler bug in g++/vxworks. typedef ACE_Message_Queue<ACE_SYNCH> ACE_DEFAULT_MESSAGE_QUEUE_TYPE; - /** * @class ACE_Message_Queue_Iterator * @@ -818,7 +816,6 @@ public: virtual int enqueue_head (ACE_Message_Block *new_item, ACE_Time_Value *timeout = 0); - /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -941,7 +938,6 @@ public: u_long dynamic_priority_max = 0x3FFFFFUL, // 2^(22)-1 u_long dynamic_priority_offset = 0x200000UL); // 2^(22-1) - #if defined (ACE_VXWORKS) /// Factory method for a wrapped VxWorks message queue diff --git a/dep/ACE_wrappers/ace/Message_Queue_Vx.cpp b/dep/ACE_wrappers/ace/Message_Queue_Vx.cpp index e224f5078e9..7ffdb1cd0af 100644 --- a/dep/ACE_wrappers/ace/Message_Queue_Vx.cpp +++ b/dep/ACE_wrappers/ace/Message_Queue_Vx.cpp @@ -11,7 +11,6 @@ ACE_RCSID (ace, Message_Queue_Vx, "$Id: Message_Queue_Vx.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (ACE_VXWORKS) diff --git a/dep/ACE_wrappers/ace/Method_Object.h b/dep/ACE_wrappers/ace/Method_Object.h index cb330d4ae2b..2c75bec61f3 100644 --- a/dep/ACE_wrappers/ace/Method_Object.h +++ b/dep/ACE_wrappers/ace/Method_Object.h @@ -15,7 +15,6 @@ */ //============================================================================= - #ifndef ACE_METHOD_OBJECT_H #define ACE_METHOD_OBJECT_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Method_Request.h b/dep/ACE_wrappers/ace/Method_Request.h index 56548a71e92..2aab2ef3491 100644 --- a/dep/ACE_wrappers/ace/Method_Request.h +++ b/dep/ACE_wrappers/ace/Method_Request.h @@ -11,7 +11,6 @@ */ //============================================================================= - #ifndef ACE_METHOD_REQUEST_H #define ACE_METHOD_REQUEST_H @@ -95,7 +94,6 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ACE_METHOD_REQUEST_H */ diff --git a/dep/ACE_wrappers/ace/Metrics_Cache.h b/dep/ACE_wrappers/ace/Metrics_Cache.h index b318ab028de..1fe84b0f17d 100644 --- a/dep/ACE_wrappers/ace/Metrics_Cache.h +++ b/dep/ACE_wrappers/ace/Metrics_Cache.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_METRICS_CACHE_H #define ACE_METRICS_CACHE_H @@ -92,7 +91,6 @@ do { if((METRICS_PTR->metrics_enabled())) { \ METRICS_PTR->report_##NAME##_resume(X); \ } } while (0) - /** * Mystery macros. I could not find where there were functions like 'report_base_metrics_start ()'. All the * start and stop functions had an argument to find the probe in the cache diff --git a/dep/ACE_wrappers/ace/Metrics_Cache_T.h b/dep/ACE_wrappers/ace/Metrics_Cache_T.h index 5785163c413..4625603357e 100644 --- a/dep/ACE_wrappers/ace/Metrics_Cache_T.h +++ b/dep/ACE_wrappers/ace/Metrics_Cache_T.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_METRICS_CACHE_T_H #define ACE_METRICS_CACHE_T_H diff --git a/dep/ACE_wrappers/ace/Metrics_Cache_T.inl b/dep/ACE_wrappers/ace/Metrics_Cache_T.inl index e3cc3b8cc66..98bc73e7243 100644 --- a/dep/ACE_wrappers/ace/Metrics_Cache_T.inl +++ b/dep/ACE_wrappers/ace/Metrics_Cache_T.inl @@ -11,7 +11,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Class ACE_Metrics_Cache // ///////////////////////////// - template <class ACE_LOCK, class ALLOCATOR> ACE_INLINE void ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_enqueue_start (u_long i) @@ -41,7 +40,6 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_enqueue_start (u_long i) } } - template <class ACE_LOCK, class ALLOCATOR> ACE_INLINE void ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_enqueue_stop (u_long i) @@ -65,7 +63,6 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_enqueue_stop (u_long i) } - template <class ACE_LOCK, class ALLOCATOR> ACE_INLINE void ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_enqueue_suspend (u_long i) @@ -82,7 +79,6 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_enqueue_suspend (u_long i) } } - template <class ACE_LOCK, class ALLOCATOR> ACE_INLINE void ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_enqueue_resume (u_long i) @@ -99,7 +95,6 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_enqueue_resume (u_long i) } } - template <class ACE_LOCK, class ALLOCATOR> ACE_INLINE void ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_dequeue_start (u_long i) @@ -129,7 +124,6 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_dequeue_start (u_long i) } } - template <class ACE_LOCK, class ALLOCATOR> ACE_INLINE void ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_dequeue_stop (u_long i) @@ -152,7 +146,6 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_dequeue_stop (u_long i) } } - template <class ACE_LOCK, class ALLOCATOR> ACE_INLINE void ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_dequeue_suspend (u_long i) @@ -169,7 +162,6 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_dequeue_suspend (u_long i) } } - template <class ACE_LOCK, class ALLOCATOR> ACE_INLINE void ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_dequeue_resume (u_long i) @@ -186,7 +178,6 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::report_dequeue_resume (u_long i) } } - template <class ACE_LOCK, class ALLOCATOR> ACE_INLINE void ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::reset_base_statistics () @@ -209,7 +200,6 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::reset_base_statistics () } } - // Flips the supplier and consumer positions. template <class ACE_LOCK, class ALLOCATOR> diff --git a/dep/ACE_wrappers/ace/Monitor_Control_Action.cpp b/dep/ACE_wrappers/ace/Monitor_Control_Action.cpp index 4a4757a5111..5ab52b36941 100644 --- a/dep/ACE_wrappers/ace/Monitor_Control_Action.cpp +++ b/dep/ACE_wrappers/ace/Monitor_Control_Action.cpp @@ -43,4 +43,3 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */ - diff --git a/dep/ACE_wrappers/ace/Monitor_Control_Types.cpp b/dep/ACE_wrappers/ace/Monitor_Control_Types.cpp index e9934a96f74..782227c5684 100644 --- a/dep/ACE_wrappers/ace/Monitor_Control_Types.cpp +++ b/dep/ACE_wrappers/ace/Monitor_Control_Types.cpp @@ -76,4 +76,3 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */ - diff --git a/dep/ACE_wrappers/ace/Msg_WFMO_Reactor.h b/dep/ACE_wrappers/ace/Msg_WFMO_Reactor.h index 714f4ce7a26..879dcef9c8b 100644 --- a/dep/ACE_wrappers/ace/Msg_WFMO_Reactor.h +++ b/dep/ACE_wrappers/ace/Msg_WFMO_Reactor.h @@ -11,7 +11,6 @@ */ //============================================================================= - #ifndef ACE_MSG_WFMO_REACTOR_H #define ACE_MSG_WFMO_REACTOR_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Multihomed_INET_Addr.cpp b/dep/ACE_wrappers/ace/Multihomed_INET_Addr.cpp index f5c50a6c278..37a50b84d02 100644 --- a/dep/ACE_wrappers/ace/Multihomed_INET_Addr.cpp +++ b/dep/ACE_wrappers/ace/Multihomed_INET_Addr.cpp @@ -291,7 +291,6 @@ ACE_Multihomed_INET_Addr::get_addresses(sockaddr_in6 *addrs, } #endif /* ACE_HAS_IPV6 */ - ACE_Multihomed_INET_Addr::~ACE_Multihomed_INET_Addr (void) { diff --git a/dep/ACE_wrappers/ace/Mutex.cpp b/dep/ACE_wrappers/ace/Mutex.cpp index 8203a1c4ced..6f0ab0683a9 100644 --- a/dep/ACE_wrappers/ace/Mutex.cpp +++ b/dep/ACE_wrappers/ace/Mutex.cpp @@ -10,7 +10,6 @@ #include "ace/OS_NS_string.h" #include "ace/os_include/sys/os_mman.h" - ACE_RCSID (ace, Mutex, "$Id: Mutex.cpp 80826 2008-03-04 14:51:23Z wotte $") diff --git a/dep/ACE_wrappers/ace/Mutex.inl b/dep/ACE_wrappers/ace/Mutex.inl index 8c6c73c8667..10432e9ede8 100644 --- a/dep/ACE_wrappers/ace/Mutex.inl +++ b/dep/ACE_wrappers/ace/Mutex.inl @@ -2,7 +2,6 @@ // // $Id: Mutex.inl 80826 2008-03-04 14:51:23Z wotte $ - #include "ace/OS_NS_sys_mman.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/NT_Service.cpp b/dep/ACE_wrappers/ace/NT_Service.cpp index 2cd94793c52..c38bd3b7239 100644 --- a/dep/ACE_wrappers/ace/NT_Service.cpp +++ b/dep/ACE_wrappers/ace/NT_Service.cpp @@ -86,7 +86,6 @@ ACE_NT_Service::fini (void) return this->report_status (SERVICE_STOPPED, 0); } - void ACE_NT_Service::handle_control (DWORD control_code) { @@ -305,7 +304,6 @@ ACE_NT_Service::startup (void) } - void ACE_NT_Service::capture_log_msg_attributes (void) { @@ -320,7 +318,6 @@ ACE_NT_Service::inherit_log_msg_attributes (void) ACE_Log_Msg::inherit_hook (0, this->log_msg_attributes_); } - int ACE_NT_Service::start_svc (ACE_Time_Value *wait_time, DWORD *svc_state, @@ -558,7 +555,7 @@ ACE_NT_Service::wait_for_service_state (DWORD desired_state, time_out += *wait_time; // Poll until the service reaches the desired state. - for (;;) + for (; ; ) { service_ok = 0 != QueryServiceStatus (this->svc_sc_handle_, &this->svc_status_); diff --git a/dep/ACE_wrappers/ace/NT_Service.h b/dep/ACE_wrappers/ace/NT_Service.h index bc6e39036b2..d3202120622 100644 --- a/dep/ACE_wrappers/ace/NT_Service.h +++ b/dep/ACE_wrappers/ace/NT_Service.h @@ -157,7 +157,6 @@ public: /// the macro-generated service function calls it. void svc_handle (const SERVICE_STATUS_HANDLE new_svc_handle); - // = Methods which can be used to do SCP-like functions. The first group // are used to register/insert and remove the service's definition in the // SCM registry. diff --git a/dep/ACE_wrappers/ace/NT_Service.inl b/dep/ACE_wrappers/ace/NT_Service.inl index 80c2a7a3764..66bf6a4c4fe 100644 --- a/dep/ACE_wrappers/ace/NT_Service.inl +++ b/dep/ACE_wrappers/ace/NT_Service.inl @@ -24,7 +24,6 @@ ACE_NT_Service::ACE_NT_Service (DWORD start_timeout, svc_status_.dwWaitHint = 0; } - ACE_INLINE ACE_NT_Service::ACE_NT_Service (const ACE_TCHAR *name, const ACE_TCHAR *desc, @@ -46,14 +45,12 @@ ACE_NT_Service::ACE_NT_Service (const ACE_TCHAR *name, svc_status_.dwCheckPoint = 0; } - ACE_INLINE int ACE_NT_Service::svc (void) { return -1; } - ACE_INLINE const ACE_TCHAR * ACE_NT_Service::name (void) const diff --git a/dep/ACE_wrappers/ace/Name_Proxy.h b/dep/ACE_wrappers/ace/Name_Proxy.h index 24ca63a30af..cc8790a7fcb 100644 --- a/dep/ACE_wrappers/ace/Name_Proxy.h +++ b/dep/ACE_wrappers/ace/Name_Proxy.h @@ -16,7 +16,6 @@ */ //============================================================================= - #ifndef ACE_NAME_PROXY_H #define ACE_NAME_PROXY_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Name_Request_Reply.h b/dep/ACE_wrappers/ace/Name_Request_Reply.h index 2c32c4cf32c..23244985216 100644 --- a/dep/ACE_wrappers/ace/Name_Request_Reply.h +++ b/dep/ACE_wrappers/ace/Name_Request_Reply.h @@ -15,7 +15,6 @@ */ //============================================================================= - #ifndef ACE_NAME_REQUEST_REPLY_H #define ACE_NAME_REQUEST_REPLY_H diff --git a/dep/ACE_wrappers/ace/Name_Space.cpp b/dep/ACE_wrappers/ace/Name_Space.cpp index 724d3206c16..4e269d71f6a 100644 --- a/dep/ACE_wrappers/ace/Name_Space.cpp +++ b/dep/ACE_wrappers/ace/Name_Space.cpp @@ -17,7 +17,6 @@ ACE_Name_Binding::ACE_Name_Binding (void) ACE_TRACE ("ACE_Name_Binding::ACE_Name_Binding"); } - ACE_Name_Binding::~ACE_Name_Binding (void) { ACE_TRACE ("ACE_Name_Binding::~ACE_Name_Binding"); diff --git a/dep/ACE_wrappers/ace/Name_Space.h b/dep/ACE_wrappers/ace/Name_Space.h index ccd4d4dbfe9..7106587f459 100644 --- a/dep/ACE_wrappers/ace/Name_Space.h +++ b/dep/ACE_wrappers/ace/Name_Space.h @@ -95,7 +95,6 @@ public: const ACE_NS_WString &value_in, const char *type_in = "") = 0; - /** * Overwrite the value or type of an existing name in a * ACE_Name_Space or bind a new name to the context, if it didn't diff --git a/dep/ACE_wrappers/ace/Netlink_Addr.h b/dep/ACE_wrappers/ace/Netlink_Addr.h index cd1c20fd474..8fd5c6b9590 100644 --- a/dep/ACE_wrappers/ace/Netlink_Addr.h +++ b/dep/ACE_wrappers/ace/Netlink_Addr.h @@ -117,5 +117,3 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_NETLINK_ADDR_H */ - - diff --git a/dep/ACE_wrappers/ace/Netlink_Addr.inl b/dep/ACE_wrappers/ace/Netlink_Addr.inl index 4ec38fa4a28..2cb43b73d6c 100644 --- a/dep/ACE_wrappers/ace/Netlink_Addr.inl +++ b/dep/ACE_wrappers/ace/Netlink_Addr.inl @@ -40,7 +40,6 @@ ACE_INLINE int ACE_Netlink_Addr::get_addr_size (void) const return sizeof(this->nl_); } - ACE_INLINE void ACE_Netlink_Addr::set_addr (void *addr, int len){ ACE_OS::memcpy (&this->nl_,addr,len); } diff --git a/dep/ACE_wrappers/ace/Node.h b/dep/ACE_wrappers/ace/Node.h index bf47b15915b..c2eb7a7bb3d 100644 --- a/dep/ACE_wrappers/ace/Node.h +++ b/dep/ACE_wrappers/ace/Node.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_NODE_H #define ACE_NODE_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Null_Mutex.h b/dep/ACE_wrappers/ace/Null_Mutex.h index 5bfbea7e23b..7cf2304e05d 100644 --- a/dep/ACE_wrappers/ace/Null_Mutex.h +++ b/dep/ACE_wrappers/ace/Null_Mutex.h @@ -31,7 +31,6 @@ #include "ace/Global_Macros.h" #include "ace/OS_Memory.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; diff --git a/dep/ACE_wrappers/ace/Numeric_Limits.h b/dep/ACE_wrappers/ace/Numeric_Limits.h index b4ee307fe5c..29de41db76b 100644 --- a/dep/ACE_wrappers/ace/Numeric_Limits.h +++ b/dep/ACE_wrappers/ace/Numeric_Limits.h @@ -71,7 +71,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <typename T> struct ACE_Numeric_Limits; - // ------------------------------------------ // Special cases. template<> diff --git a/dep/ACE_wrappers/ace/OS.h b/dep/ACE_wrappers/ace/OS.h index 9283ed6f417..bc5fe2f3760 100644 --- a/dep/ACE_wrappers/ace/OS.h +++ b/dep/ACE_wrappers/ace/OS.h @@ -109,7 +109,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/os_include/os_unistd.h" #include "ace/os_include/sys/os_wait.h" - // This needs to go here *first* to avoid problems with AIX. # if defined (ACE_HAS_PTHREADS) # include "ace/os_include/os_pthread.h" @@ -280,7 +279,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "ace/os_include/os_syslog.h" # endif /* !defined (ACE_WIN32) && !defined (ACE_LACKS_UNIX_SYSLOG) */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** diff --git a/dep/ACE_wrappers/ace/OS.inl b/dep/ACE_wrappers/ace/OS.inl index 593b582d8ce..1dafebc2543 100644 --- a/dep/ACE_wrappers/ace/OS.inl +++ b/dep/ACE_wrappers/ace/OS.inl @@ -82,7 +82,6 @@ using std::strftime; # endif # endif /* ACE_HAS_GETIFADDRS */ - #endif /* WIN32 */ #if defined (ACE_HAS_SHM_OPEN) && defined(INTEGRITY) diff --git a/dep/ACE_wrappers/ace/OS_NS_Thread.cpp b/dep/ACE_wrappers/ace/OS_NS_Thread.cpp index 187f4bf4078..16a19501f82 100644 --- a/dep/ACE_wrappers/ace/OS_NS_Thread.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_Thread.cpp @@ -29,7 +29,6 @@ ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args) ACE_VERSIONED_NAMESPACE_NAME::ACE_OS::mutex_lock_cleanup (args); } - #if !defined(ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400) # define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \ (*THR_ID = ::_beginthreadex ((void(_Optlink*)(void*))ENTRY_POINT, STACK, STACKSIZE, ARGS), *THR_ID) @@ -245,7 +244,7 @@ ACE_TSS_Emulation::next_key (ACE_thread_key_t &key) { u_int counter = 0; // Loop through all possible keys and check whether a key is free - for ( ;counter < ACE_TSS_THREAD_KEYS_MAX; counter++) + for (; counter < ACE_TSS_THREAD_KEYS_MAX; counter++) { ACE_thread_key_t localkey; # if defined (ACE_HAS_NONSCALAR_THREAD_KEY_T) @@ -600,7 +599,6 @@ private: ACE_thread_key_t in_use_; }; - /*****************************************************************************/ /** * @class TSS_Cleanup_Instance @@ -2769,7 +2767,7 @@ ACE_OS::event_pulse (ACE_event_t *event) event->eventdata_->signal_count_ = event->eventdata_->waiting_threads_; # else event->eventdata_->signal_count_ = event->eventdata_->waiting_threads_; - for (unsigned long i=0; i<event->eventdata_->signal_count_ ;++i) + for (unsigned long i=0; i<event->eventdata_->signal_count_ ; ++i) if (ACE_OS::sema_post(&event->semaphore_) != 0) { event->eventdata_->signal_count_ = 0; @@ -5164,7 +5162,7 @@ add_to_argv (int& argc, char** argv, int max_args, char* string) } // Skip over whitespace in between arguments - for(++i; i < length && ACE_OS::ace_isspace (string[i]); ++i) + for (++i; i < length && ACE_OS::ace_isspace (string[i]); ++i) { } diff --git a/dep/ACE_wrappers/ace/OS_NS_Thread.h b/dep/ACE_wrappers/ace/OS_NS_Thread.h index a16e3750d20..151f0a7c1a1 100644 --- a/dep/ACE_wrappers/ace/OS_NS_Thread.h +++ b/dep/ACE_wrappers/ace/OS_NS_Thread.h @@ -1019,7 +1019,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL # define ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ace_mutex_lock_cleanup_adapter) #endif /* ACE_HAS_VERSIONED_NAMESPACE == 1 */ - # if defined (ACE_HAS_THR_C_FUNC) // This is necessary to work around nasty problems with MVS C++. extern "C" ACE_Export void ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args); @@ -1232,7 +1231,6 @@ namespace ACE_OS { extern ACE_Export int lwp_setparams (const ACE_Sched_Params &); - //@{ @name A set of wrappers for mutex locks. extern ACE_Export @@ -1367,7 +1365,6 @@ namespace ACE_OS { //@} - //@{ @name A set of wrappers for readers/writer locks. ACE_NAMESPACE_INLINE_FUNCTION @@ -1614,7 +1611,6 @@ namespace ACE_OS { size_t cpu_set_size, cpu_set_t * cpu_mask); - /** * Set the thread affinity * diff --git a/dep/ACE_wrappers/ace/OS_NS_Thread.inl b/dep/ACE_wrappers/ace/OS_NS_Thread.inl index 14a32196e8d..9f5e6580526 100644 --- a/dep/ACE_wrappers/ace/OS_NS_Thread.inl +++ b/dep/ACE_wrappers/ace/OS_NS_Thread.inl @@ -573,7 +573,6 @@ ACE_OS::recursive_mutex_cond_unlock (ACE_recursive_thread_mutex_t *m, #endif /* ACE_HAS_THREADS */ } - // This method is called after waiting on a condition variable when a // recursive mutex must be reacquired. If the platform doesn't natively // integrate recursive mutexes and condition variables, it's taken care @@ -1586,7 +1585,7 @@ ACE_OS::sema_init (ACE_sema_t *s, if (creator && count) { char c = 1; - for (u_int i=0; i<count ;++i) + for (u_int i=0; i<count ; ++i) if (ACE_OS::write (s->fd_[1], &c, sizeof (char)) != 1) return (-1); } @@ -2064,7 +2063,7 @@ ACE_OS::sema_wait (ACE_sema_t *s) # else /* ACE_USES_WINCE_SEMA_SIMULATION */ // Timed wait. int result = -1; - for (;;) + for (; ; ) // Check if the semaphore is avialable or not and wait forever. // Don't bother to grab the lock if it is not available (to avoid // deadlock.) @@ -3569,7 +3568,6 @@ ACE_OS_Recursive_Thread_Mutex_Guard::~ACE_OS_Recursive_Thread_Mutex_Guard () #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ - /*****************************************************************************/ ACE_INLINE diff --git a/dep/ACE_wrappers/ace/OS_NS_macros.h b/dep/ACE_wrappers/ace/OS_NS_macros.h index b80db9eebdb..5568bd46203 100644 --- a/dep/ACE_wrappers/ace/OS_NS_macros.h +++ b/dep/ACE_wrappers/ace/OS_NS_macros.h @@ -107,8 +107,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL # endif /* _FILE_OFFSET_BITS==64 */ #endif /* ACE_WIN32 */ - - # include /**/ "ace/post.h" #endif /* ACE_OS_NS_MACROS_H */ diff --git a/dep/ACE_wrappers/ace/OS_NS_math.h b/dep/ACE_wrappers/ace/OS_NS_math.h index 0ed1d6ce892..6207692cb30 100644 --- a/dep/ACE_wrappers/ace/OS_NS_math.h +++ b/dep/ACE_wrappers/ace/OS_NS_math.h @@ -34,7 +34,6 @@ #endif #define ACE_EXPORT_MACRO ACE_Export - /* * We inline and undef some functions that may be implemented * as macros on some platforms. This way macro definitions will @@ -63,7 +62,6 @@ inline double ace_log2_helper (double x) meaning the binary logarithm of x using the natural logarithm, for example, is: - log (x) e log (x) = ------- @@ -82,7 +80,6 @@ inline double ace_log2_helper (double x) #endif /* defined (log2) */ } - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS diff --git a/dep/ACE_wrappers/ace/OS_NS_netdb.cpp b/dep/ACE_wrappers/ace/OS_NS_netdb.cpp index f4fa87906a9..d0687014c8a 100644 --- a/dep/ACE_wrappers/ace/OS_NS_netdb.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_netdb.cpp @@ -240,7 +240,7 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node) result = Netbios (&ncb); - for(int i = 0; i < lenum.length; i++) + for (int i = 0; i < lenum.length; i++) { ACE_OS::memset (&ncb, 0, sizeof(ncb)); ncb.ncb_command = NCBRESET; diff --git a/dep/ACE_wrappers/ace/OS_NS_netdb.h b/dep/ACE_wrappers/ace/OS_NS_netdb.h index 2cf78998db1..6b29e067b96 100644 --- a/dep/ACE_wrappers/ace/OS_NS_netdb.h +++ b/dep/ACE_wrappers/ace/OS_NS_netdb.h @@ -76,7 +76,6 @@ namespace ACE_OS ACE_HOSTENT_DATA buffer, int *h_errnop); - ACE_NAMESPACE_INLINE_FUNCTION struct hostent *getipnodebyaddr (const void *src, size_t len, int family); diff --git a/dep/ACE_wrappers/ace/OS_NS_pwd.h b/dep/ACE_wrappers/ace/OS_NS_pwd.h index a70a6d3f3bc..bf6bb4cea97 100644 --- a/dep/ACE_wrappers/ace/OS_NS_pwd.h +++ b/dep/ACE_wrappers/ace/OS_NS_pwd.h @@ -44,7 +44,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - //@{ @name A set of wrappers for password routines. ACE_NAMESPACE_INLINE_FUNCTION diff --git a/dep/ACE_wrappers/ace/OS_NS_stdio.cpp b/dep/ACE_wrappers/ace/OS_NS_stdio.cpp index 01ceec72279..784382ecd5a 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stdio.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_stdio.cpp @@ -7,7 +7,6 @@ ACE_RCSID (ace, OS_NS_stdio, "$Id: OS_NS_stdio.cpp 82586 2008-08-11 12:46:00Z johnnyw $") - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_stdio.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/dep/ACE_wrappers/ace/OS_NS_stdio.h b/dep/ACE_wrappers/ace/OS_NS_stdio.h index a27d90822c9..be497f6cf90 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stdio.h +++ b/dep/ACE_wrappers/ace/OS_NS_stdio.h @@ -108,7 +108,6 @@ inline int ace_ungetc_helper (int ch, FILE *fp) #endif /* defined (ungetc) */ } - #if !defined (ACE_LACKS_CUSERID) && !defined(ACE_HAS_ALT_CUSERID) \ && !defined(ACE_WIN32) && !defined (ACE_VXWORKS) /// Helper for the ACE_OS::cuserid() function diff --git a/dep/ACE_wrappers/ace/OS_NS_stdlib.cpp b/dep/ACE_wrappers/ace/OS_NS_stdlib.cpp index 78d01380c0f..4ccd743cc90 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stdlib.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_stdlib.cpp @@ -568,7 +568,7 @@ ACE_OS::strtol_emulation (const char *nptr, char **endptr, int base) cutoff = neg ? -(unsigned long)LONG_MIN : LONG_MAX; cutlim = cutoff % (unsigned long)base; cutoff /= (unsigned long)base; - for (acc = 0, any = 0;; c = *s++) { + for (acc = 0, any = 0; ; c = *s++) { if (ACE_OS::ace_isdigit(c)) c -= '0'; else if (ACE_OS::ace_isalpha(c)) @@ -633,7 +633,7 @@ ACE_OS::strtoul_emulation (const char *nptr, cutoff = (unsigned long) ULONG_MAX / (unsigned long) base; cutlim = (unsigned long) ULONG_MAX % (unsigned long) base; - for (acc = 0, any = 0;; c = *s++) + for (acc = 0, any = 0; ; c = *s++) { if (ACE_OS::ace_isdigit(c)) c -= '0'; @@ -703,7 +703,7 @@ ACE_OS::strtoull_emulation (const char *nptr, cutoff = (ACE_UINT64) ACE_UINT64_MAX / (ACE_UINT64) base; cutlim = (ACE_UINT64) ACE_UINT64_MAX % (ACE_UINT64) base; - for (acc = 0, any = 0;; c = *s++) + for (acc = 0, any = 0; ; c = *s++) { if (ACE_OS::ace_isdigit(c)) c -= '0'; diff --git a/dep/ACE_wrappers/ace/OS_NS_stdlib.h b/dep/ACE_wrappers/ace/OS_NS_stdlib.h index 237956efc7e..696d5110eb2 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stdlib.h +++ b/dep/ACE_wrappers/ace/OS_NS_stdlib.h @@ -63,7 +63,6 @@ namespace ACE_OS { */ //@{ - ACE_NAMESPACE_INLINE_FUNCTION void _exit (int status = 0); diff --git a/dep/ACE_wrappers/ace/OS_NS_stropts.cpp b/dep/ACE_wrappers/ace/OS_NS_stropts.cpp index 0917715924a..83fb822606b 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stropts.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_stropts.cpp @@ -98,7 +98,6 @@ ACE_OS::ioctl (ACE_HANDLE socket, 0, 0); - if (result == SOCKET_ERROR) { unsigned long dwErr = ::WSAGetLastError (); @@ -174,7 +173,6 @@ ACE_OS::ioctl (ACE_HANDLE socket, ace_qos.receiving_flowspec (&receiving_flowspec); ace_qos.provider_specific (*((struct iovec *) (&qos->ProviderSpecific))); - return result; } diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_resource.h b/dep/ACE_wrappers/ace/OS_NS_sys_resource.h index 5b9a7abea92..b8467975d5f 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_resource.h +++ b/dep/ACE_wrappers/ace/OS_NS_sys_resource.h @@ -46,7 +46,6 @@ namespace ACE_OS int getrusage (int who, struct rusage *rusage); - ACE_NAMESPACE_INLINE_FUNCTION int setrlimit (int resource, const struct rlimit *rl); diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.h b/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.h index 85487530097..3948a88b25e 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.h +++ b/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.h @@ -28,7 +28,6 @@ #endif #define ACE_EXPORT_MACRO ACE_Export - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_socket.h b/dep/ACE_wrappers/ace/OS_NS_sys_socket.h index c545a2c017a..a0e644f190e 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_socket.h +++ b/dep/ACE_wrappers/ace/OS_NS_sys_socket.h @@ -227,7 +227,6 @@ namespace ACE_OS const iovec *iov, int iovcnt); - /// Manipulate the options associated with a socket. ACE_NAMESPACE_INLINE_FUNCTION int setsockopt (ACE_HANDLE handle, diff --git a/dep/ACE_wrappers/ace/OS_NS_time.h b/dep/ACE_wrappers/ace/OS_NS_time.h index 61b51ffebf1..7fc53fda787 100644 --- a/dep/ACE_wrappers/ace/OS_NS_time.h +++ b/dep/ACE_wrappers/ace/OS_NS_time.h @@ -96,7 +96,6 @@ inline long ace_timezone() #endif } - #if !defined (ACE_LACKS_DIFFTIME) /// Helper for the ACE_OS::difftime() function /** @@ -275,7 +274,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL # define ACE_GETHRTIME_NAME ACE_gethrtime #endif /* ACE_HAS_VERSIONED_NAMESPACE == 1 */ - # if defined (ACE_HAS_INLINED_OSCALLS) # if defined (ACE_INLINE) # undef ACE_INLINE diff --git a/dep/ACE_wrappers/ace/OS_NS_time.inl b/dep/ACE_wrappers/ace/OS_NS_time.inl index 661ecb81748..9a77531a108 100644 --- a/dep/ACE_wrappers/ace/OS_NS_time.inl +++ b/dep/ACE_wrappers/ace/OS_NS_time.inl @@ -262,7 +262,7 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op) # endif /* ! ACE_LACKS_LONGLONG_T */ #if defined (__amd64__) || defined (__x86_64__) - // Read the high res tick counter into 32 bit int variables "eax" and + // Read the high res tick counter into 32 bit int variables "eax" and // "edx", and then combine them into 64 bit int "now" ACE_UINT32 eax, edx; asm volatile ("rdtsc" : "=a" (eax), "=d" (edx) : : "memory"); diff --git a/dep/ACE_wrappers/ace/OS_NS_unistd.h b/dep/ACE_wrappers/ace/OS_NS_unistd.h index 576cf37bae4..b9b7604b797 100644 --- a/dep/ACE_wrappers/ace/OS_NS_unistd.h +++ b/dep/ACE_wrappers/ace/OS_NS_unistd.h @@ -31,7 +31,6 @@ #include "ace/os_include/os_unistd.h" #include "ace/os_include/os_stdio.h" - #if defined (ACE_EXPORT_MACRO) # undef ACE_EXPORT_MACRO #endif diff --git a/dep/ACE_wrappers/ace/OS_NS_unistd.inl b/dep/ACE_wrappers/ace/OS_NS_unistd.inl index 806a895d8b3..be2ec3cff25 100644 --- a/dep/ACE_wrappers/ace/OS_NS_unistd.inl +++ b/dep/ACE_wrappers/ace/OS_NS_unistd.inl @@ -62,7 +62,6 @@ ACE_OS::access (const char *path, int amode) #endif /* ACE_LACKS_ACCESS */ } - #if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::access (const wchar_t *path, int amode) diff --git a/dep/ACE_wrappers/ace/OS_NS_wchar.cpp b/dep/ACE_wrappers/ace/OS_NS_wchar.cpp index a29f0597224..7ec0d7b8380 100644 --- a/dep/ACE_wrappers/ace/OS_NS_wchar.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_wchar.cpp @@ -69,7 +69,7 @@ ACE_OS::wcscat_emulation (wchar_t *destination, wchar_t * ACE_OS::wcschr_emulation (const wchar_t *string, wchar_t c) { - for (;*string ; ++string) + for (; *string ; ++string) if (*string == c) return const_cast<wchar_t *> (string); @@ -290,7 +290,7 @@ ACE_OS::wcspbrk_emulation (const wchar_t *string, while ((c = *string++) != 0) { - for (scanp = charset; (sc = *scanp++) != 0;) + for (scanp = charset; (sc = *scanp++) != 0; ) if (sc == c) return const_cast<wchar_t *> (string - 1); } @@ -341,7 +341,7 @@ ACE_OS::wcsspn_emulation (const wchar_t *string, // Skip any characters in charset, excluding the terminating \0. cont: c = *p++; - for (spanp = charset; (sc = *spanp++) != 0;) + for (spanp = charset; (sc = *spanp++) != 0; ) if (sc == c) goto cont; return (p - 1 - string); diff --git a/dep/ACE_wrappers/ace/OS_QoS.h b/dep/ACE_wrappers/ace/OS_QoS.h index 022a17bee30..c1dddf3e01c 100644 --- a/dep/ACE_wrappers/ace/OS_QoS.h +++ b/dep/ACE_wrappers/ace/OS_QoS.h @@ -390,7 +390,6 @@ typedef int (*ACE_QOS_CONDITION_FUNC) (iovec *caller_id, ACE_SOCK_GROUP *g, unsigned long callbackdata); - /** * @class ACE_Accept_QoS_Params * diff --git a/dep/ACE_wrappers/ace/OS_TLI.h b/dep/ACE_wrappers/ace/OS_TLI.h index 8e607acd4b4..bccc3cd18ae 100644 --- a/dep/ACE_wrappers/ace/OS_TLI.h +++ b/dep/ACE_wrappers/ace/OS_TLI.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_OS_TLI_H # define ACE_OS_TLI_H # include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Obchunk.h b/dep/ACE_wrappers/ace/Obchunk.h index 1cb7c24b76c..053b144979e 100644 --- a/dep/ACE_wrappers/ace/Obchunk.h +++ b/dep/ACE_wrappers/ace/Obchunk.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_OBCHUNK_H #define ACE_OBCHUNK_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Object_Manager.cpp b/dep/ACE_wrappers/ace/Object_Manager.cpp index bd97cc9ecaf..157c26a0441 100644 --- a/dep/ACE_wrappers/ace/Object_Manager.cpp +++ b/dep/ACE_wrappers/ace/Object_Manager.cpp @@ -259,7 +259,6 @@ ACE_Object_Manager::init (void) SetUnhandledExceptionFilter (&ACE_UnhandledExceptionFilter); #endif /* ACE_DISABLE_WIN32_ERROR_WINDOWS && ACE_WIN32 && !ACE_HAS_WINCE */ - # if !defined (ACE_LACKS_ACE_SVCCONF) ACE_NEW_RETURN (preallocations_, ACE_Object_Manager_Preallocations, @@ -605,7 +604,6 @@ ACE_Object_Manager::get_singleton_lock (ACE_RW_Thread_Mutex *&lock) -1); lock = &lock_adapter->object (); - // Register the lock for destruction at program // termination. This call will cause us to grab the // ACE_Object_Manager::instance ()->internal_lock_ @@ -759,7 +757,6 @@ ACE_Object_Manager::fini (void) return 0; } - #if !defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) /** * @class ACE_Object_Manager_Manager diff --git a/dep/ACE_wrappers/ace/Object_Manager.h b/dep/ACE_wrappers/ace/Object_Manager.h index 741b9e3eebf..69952d4d018 100644 --- a/dep/ACE_wrappers/ace/Object_Manager.h +++ b/dep/ACE_wrappers/ace/Object_Manager.h @@ -461,7 +461,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_DECLARE (ACE, ACE_Service_Manager) #endif /* ! ACE_LACKS_ACE_SVCCONF */ - #include /**/ "ace/post.h" #endif /* ACE_OBJECT_MANAGER_H */ diff --git a/dep/ACE_wrappers/ace/Object_Manager_Base.h b/dep/ACE_wrappers/ace/Object_Manager_Base.h index d1058874d7d..60ca037f885 100644 --- a/dep/ACE_wrappers/ace/Object_Manager_Base.h +++ b/dep/ACE_wrappers/ace/Object_Manager_Base.h @@ -122,7 +122,6 @@ extern "C" void ACE_OS_Object_Manager_Internal_Exit_Hook (void); - // @@ This forward declaration should go away. class ACE_Log_Msg; diff --git a/dep/ACE_wrappers/ace/POSIX_Asynch_IO.cpp b/dep/ACE_wrappers/ace/POSIX_Asynch_IO.cpp index 26b9eb33164..f4aeebb2269 100644 --- a/dep/ACE_wrappers/ace/POSIX_Asynch_IO.cpp +++ b/dep/ACE_wrappers/ace/POSIX_Asynch_IO.cpp @@ -18,7 +18,6 @@ ACE_RCSID (ace, POSIX_Asynch_IO, "$Id: POSIX_Asynch_IO.cpp 81535 2008-04-29 20:08:52Z shuston $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL size_t @@ -702,7 +701,6 @@ ACE_POSIX_Asynch_Write_File::write (ACE_Message_Block &message_block, // ********************************************************************* - size_t ACE_POSIX_Asynch_Accept_Result::bytes_to_read (void) const { @@ -1147,7 +1145,6 @@ void ACE_POSIX_Asynch_Connect_Result::connect_handle (ACE_HANDLE handle) this->aio_fildes = handle; } - ACE_POSIX_Asynch_Connect_Result::ACE_POSIX_Asynch_Connect_Result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE connect_handle, @@ -1320,7 +1317,6 @@ ACE_POSIX_Asynch_Connect::connect (ACE_HANDLE connect_handle, else result = 0; - return 0; } @@ -1429,7 +1425,7 @@ ACE_POSIX_Asynch_Connect::connect_i (ACE_POSIX_Asynch_Connect_Result *result, -1); } - for (;;) + for (; ; ) { int rc = ACE_OS::connect (handle, @@ -1452,7 +1448,6 @@ ACE_POSIX_Asynch_Connect::connect_i (ACE_POSIX_Asynch_Connect_Result *result, ACE_NOTREACHED (return 0); } - //@@ New method cancel_uncompleted // It performs cancellation of all pending requests // @@ -1478,7 +1473,7 @@ ACE_POSIX_Asynch_Connect::cancel_uncompleted (bool flg_notify, set.reset (); - for (; iter.next (me) != 0; retval++ , iter.advance ()) + for (; iter.next (me) != 0; retval++ , iter.advance ()) { ACE_HANDLE handle = me->ext_id_; ACE_POSIX_Asynch_Connect_Result* result = me->int_id_ ; @@ -1589,7 +1584,6 @@ ACE_POSIX_Asynch_Connect::handle_output (ACE_HANDLE fd) return 0; } - int ACE_POSIX_Asynch_Connect::handle_close (ACE_HANDLE fd, ACE_Reactor_Mask) { @@ -1719,7 +1713,6 @@ ACE_POSIX_Asynch_Transmit_File_Result::~ACE_POSIX_Asynch_Transmit_File_Result (v { } - // ********************************************************************* /** @@ -1829,7 +1822,6 @@ ACE_POSIX_Asynch_Transmit_Handler::~ACE_POSIX_Asynch_Transmit_Handler (void) mb_->release (); } - // Do the transmission. // Initiate transmitting the header. When that completes // handle_write_stream will be called, there start transmitting the file. @@ -2163,7 +2155,6 @@ ACE_POSIX_Asynch_Read_Dgram_Result::saddr () const return (sockaddr *) this->remote_address_->get_addr (); } - int ACE_POSIX_Asynch_Read_Dgram_Result::flags (void) const { @@ -2262,7 +2253,6 @@ ACE_POSIX_Asynch_Write_Dgram_Result::handle (void) const return this->handle_; } - ACE_Message_Block* ACE_POSIX_Asynch_Write_Dgram_Result::message_block () const { diff --git a/dep/ACE_wrappers/ace/POSIX_Asynch_IO.h b/dep/ACE_wrappers/ace/POSIX_Asynch_IO.h index 79e46f47c79..713d08f0e95 100644 --- a/dep/ACE_wrappers/ace/POSIX_Asynch_IO.h +++ b/dep/ACE_wrappers/ace/POSIX_Asynch_IO.h @@ -300,7 +300,6 @@ public: virtual ~ACE_POSIX_Asynch_Read_Stream (void); }; - /** * @class ACE_POSIX_Asynch_Write_Stream_Result * @@ -484,7 +483,6 @@ private: int signal_number = 0); }; - /** * @class ACE_POSIX_Asynch_Write_File_Result * @@ -651,7 +649,6 @@ protected: // I/O handle for the new connection. }; - /** * @class ACE_POSIX_Asynch_Accept * @@ -798,7 +795,6 @@ protected: void connect_handle (ACE_HANDLE handle); }; - /** * @class ACE_POSIX_Asynch_Connect * @@ -906,7 +902,6 @@ private: ACE_SYNCH_MUTEX lock_; }; - /** * @class ACE_POSIX_Asynch_Transmit_File_Result * @@ -1036,7 +1031,6 @@ public: virtual ~ACE_POSIX_Asynch_Transmit_File (void); }; - /** * @class ACE_POSIX_Asynch_Read_Dgram * @@ -1216,7 +1210,6 @@ protected: ACE_POSIX_Asynch_Write_Dgram (void); }; - /*****************************************************/ /** diff --git a/dep/ACE_wrappers/ace/POSIX_CB_Proactor.cpp b/dep/ACE_wrappers/ace/POSIX_CB_Proactor.cpp index 8bf356d5f58..8003781a8c2 100644 --- a/dep/ACE_wrappers/ace/POSIX_CB_Proactor.cpp +++ b/dep/ACE_wrappers/ace/POSIX_CB_Proactor.cpp @@ -75,7 +75,6 @@ ACE_POSIX_CB_Proactor::notify_completion (int sig_num) return this->sema_.release(); } - ssize_t ACE_POSIX_CB_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result) { @@ -150,7 +149,7 @@ ACE_POSIX_CB_Proactor::handle_events_i (u_long milli_seconds) int ret_aio = 0; int ret_que = 0; - for (;; ret_aio++) + for (; ; ret_aio++) { ACE_POSIX_Asynch_Result * asynch_result = this->find_completed_aio (error_status, diff --git a/dep/ACE_wrappers/ace/POSIX_CB_Proactor.h b/dep/ACE_wrappers/ace/POSIX_CB_Proactor.h index 1900a9422c5..8969d57acfe 100644 --- a/dep/ACE_wrappers/ace/POSIX_CB_Proactor.h +++ b/dep/ACE_wrappers/ace/POSIX_CB_Proactor.h @@ -27,7 +27,6 @@ #include "ace/POSIX_Proactor.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** diff --git a/dep/ACE_wrappers/ace/POSIX_Proactor.cpp b/dep/ACE_wrappers/ace/POSIX_Proactor.cpp index 8079ac40fd8..c8c727277fb 100644 --- a/dep/ACE_wrappers/ace/POSIX_Proactor.cpp +++ b/dep/ACE_wrappers/ace/POSIX_Proactor.cpp @@ -49,7 +49,6 @@ public: /// Destructor. virtual ~ACE_POSIX_Wakeup_Completion (void); - /// This method calls the <handler>'s <handle_wakeup> method. virtual void complete (size_t bytes_transferred = 0, int success = 1, @@ -184,7 +183,6 @@ ACE_POSIX_Proactor::create_asynch_read_stream_result return implementation; } - ACE_Asynch_Write_Stream_Impl * ACE_POSIX_Proactor::create_asynch_write_stream (void) { @@ -220,7 +218,6 @@ ACE_POSIX_Proactor::create_asynch_write_stream_result return implementation; } - ACE_Asynch_Read_File_Impl * ACE_POSIX_Proactor::create_asynch_read_file (void) { @@ -260,7 +257,6 @@ ACE_POSIX_Proactor::create_asynch_read_file_result return implementation; } - ACE_Asynch_Write_File_Impl * ACE_POSIX_Proactor::create_asynch_write_file (void) { @@ -300,7 +296,6 @@ ACE_POSIX_Proactor::create_asynch_write_file_result return implementation; } - ACE_Asynch_Read_Dgram_Impl * ACE_POSIX_Proactor::create_asynch_read_dgram (void) { @@ -341,7 +336,6 @@ ACE_POSIX_Proactor::create_asynch_read_dgram_result return implementation; } - ACE_Asynch_Write_Dgram_Impl * ACE_POSIX_Proactor::create_asynch_write_dgram (void) { @@ -381,7 +375,6 @@ ACE_POSIX_Proactor::create_asynch_write_dgram_result return implementation; } - ACE_Asynch_Accept_Impl * ACE_POSIX_Proactor::create_asynch_accept (void) { @@ -420,7 +413,6 @@ ACE_POSIX_Proactor::create_asynch_accept_result return implementation; } - ACE_Asynch_Connect_Impl * ACE_POSIX_Proactor::create_asynch_connect (void) { @@ -453,7 +445,6 @@ ACE_POSIX_Proactor::create_asynch_connect_result return implementation; } - ACE_Asynch_Transmit_File_Impl * ACE_POSIX_Proactor::create_asynch_transmit_file (void) { @@ -530,7 +521,7 @@ ACE_POSIX_Proactor::handle_signal (int, siginfo_t *, ucontext_t *) ACE_Time_Value timeout (0, 0); int result = 0; - for (;;) + for (; ; ) { result = this->handle_events (timeout); if (result != 0 || errno == ETIME) @@ -598,7 +589,6 @@ ACE_POSIX_Proactor::get_impl_type (void) return PROACTOR_POSIX; } - /** * @class ACE_AIOCB_Notify_Pipe_Manager * @@ -726,7 +716,6 @@ ACE_AIOCB_Notify_Pipe_Manager::~ACE_AIOCB_Notify_Pipe_Manager (void) } - int ACE_AIOCB_Notify_Pipe_Manager::notify () { @@ -773,7 +762,6 @@ ACE_AIOCB_Notify_Pipe_Manager::handle_read_stream ACE_TEXT ("ACE_AIOCB_Notify_Pipe_Manager::handle_read_stream:") ACE_TEXT ("Read from pipe failed"))); - // 2. Do the upcalls // this->posix_aiocb_proactor_->process_result_queue (); } @@ -835,7 +823,6 @@ ACE_POSIX_AIOCB_Proactor::get_impl_type (void) return PROACTOR_AIOCB; } - int ACE_POSIX_AIOCB_Proactor::close (void) { @@ -914,7 +901,6 @@ int ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list (void) char * op = (aiocb_list_[ai]->aio_lio_opcode == LIO_WRITE )? "WRITE":"READ" ; - ACE_ERROR ((LM_ERROR, ACE_TEXT("slot=%d op=%s status=%d xfercnt=%d %s\n"), ai, @@ -1117,7 +1103,6 @@ ACE_POSIX_Asynch_Result * ACE_POSIX_AIOCB_Proactor::getq_result (void) { ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0)); - ACE_POSIX_Asynch_Result* result = 0; if (this->result_queue_.dequeue_head (result) != 0) @@ -1206,7 +1191,7 @@ ACE_POSIX_AIOCB_Proactor::handle_events_i (u_long milli_seconds) int error_status = 0; size_t transfer_count = 0; - for (;; retval++) + for (; ; retval++) { ACE_POSIX_Asynch_Result *asynch_result = find_completed_aio (error_status, @@ -1300,7 +1285,6 @@ ACE_POSIX_AIOCB_Proactor::find_completed_aio (int &error_status, return asynch_result; } - int ACE_POSIX_AIOCB_Proactor::start_aio (ACE_POSIX_Asynch_Result *result, ACE_POSIX_Proactor::Opcode op) @@ -1460,7 +1444,6 @@ ACE_POSIX_AIOCB_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result) return ret_val; } - int ACE_POSIX_AIOCB_Proactor::start_deferred_aio () { @@ -1611,7 +1594,6 @@ ACE_POSIX_AIOCB_Proactor::cancel_aiocb (ACE_POSIX_Asynch_Result * result) return 2; } - // ********************************************************************* #if defined(ACE_HAS_POSIX_REALTIME_SIGNALS) @@ -1843,7 +1825,6 @@ ACE_POSIX_SIG_Proactor::setup_signal_handler (int signal_number) const return 0; } - int ACE_POSIX_SIG_Proactor::block_signals (void) const { @@ -1963,7 +1944,7 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout) int ret_que = 0; if (flg_aio) - for (;; ret_aio++) + for (; ; ret_aio++) { ACE_POSIX_Asynch_Result *asynch_result = find_completed_aio (error_status, @@ -2023,7 +2004,6 @@ ACE_POSIX_Asynch_Timer::complete (size_t /* bytes_transferred */, handler->handle_time_out (this->time_, this->act ()); } - // ********************************************************************* ACE_POSIX_Wakeup_Completion::ACE_POSIX_Wakeup_Completion diff --git a/dep/ACE_wrappers/ace/POSIX_Proactor.h b/dep/ACE_wrappers/ace/POSIX_Proactor.h index e3088d756a5..da2c48eae6f 100644 --- a/dep/ACE_wrappers/ace/POSIX_Proactor.h +++ b/dep/ACE_wrappers/ace/POSIX_Proactor.h @@ -73,7 +73,6 @@ public: PROACTOR_CB = 4 }; - enum SystemType // open for future extention { ACE_OS_UNDEFINED= 0x0000, @@ -336,7 +335,6 @@ class ACE_Export ACE_POSIX_AIOCB_Proactor : public ACE_POSIX_Proactor friend class ACE_POSIX_Asynch_Accept; friend class ACE_POSIX_Asynch_Connect; - public: /// Constructor defines max number asynchronous operations /// which can be started at the same time @@ -459,7 +457,6 @@ protected: /// Process the internal results queue int process_result_queue (void); - /// This class takes care of doing <accept> when we use /// AIO_CONTROL_BLOCKS strategy. ACE_AIOCB_Notify_Pipe_Manager *aiocb_notify_pipe_manager_; @@ -606,7 +603,6 @@ protected: sigset_t RT_completion_signals_; }; - #endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ /** diff --git a/dep/ACE_wrappers/ace/Pair.h b/dep/ACE_wrappers/ace/Pair.h index e1d8b526639..a92767790d9 100644 --- a/dep/ACE_wrappers/ace/Pair.h +++ b/dep/ACE_wrappers/ace/Pair.h @@ -12,7 +12,6 @@ */ //============================================================================= - #ifndef ACE_PAIR_H #define ACE_PAIR_H diff --git a/dep/ACE_wrappers/ace/Pair_T.h b/dep/ACE_wrappers/ace/Pair_T.h index 09629b49a26..313446d3678 100644 --- a/dep/ACE_wrappers/ace/Pair_T.h +++ b/dep/ACE_wrappers/ace/Pair_T.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_PAIR_T_H #define ACE_PAIR_T_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Parse_Node.cpp b/dep/ACE_wrappers/ace/Parse_Node.cpp index 1132a345feb..27d74b905dd 100644 --- a/dep/ACE_wrappers/ace/Parse_Node.cpp +++ b/dep/ACE_wrappers/ace/Parse_Node.cpp @@ -15,7 +15,6 @@ ACE_RCSID (ace, Parse_Node, "$Id: Parse_Node.cpp 81245 2008-04-05 13:37:47Z johnnyw $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE (ACE_Stream_Node) @@ -135,7 +134,6 @@ ACE_Stream_Node::ACE_Stream_Node (const ACE_Static_Node *str_ops, ACE_TRACE ("ACE_Stream_Node::ACE_Stream_Node"); } - ACE_Stream_Node::~ACE_Stream_Node (void) { ACE_TRACE ("ACE_Stream_Node::~ACE_Stream_Node"); @@ -152,7 +150,6 @@ ACE_Parse_Node::ACE_Parse_Node (void) ACE_TRACE ("ACE_Parse_Node::ACE_Parse_Node"); } - ACE_Parse_Node::ACE_Parse_Node (const ACE_TCHAR *nm) : name_ (ACE::strnew (nm)), next_ (0) @@ -173,7 +170,6 @@ ACE_Parse_Node::print (void) const this->next_->print (); } - ACE_Parse_Node::~ACE_Parse_Node (void) { ACE_TRACE ("ACE_Parse_Node::~ACE_Parse_Node"); @@ -293,7 +289,6 @@ ACE_Remove_Node::apply (ACE_Service_Gestalt *config, int &yyerrno) #endif /* ACE_NLOGGING */ } - ACE_Dynamic_Node::ACE_Dynamic_Node (ACE_Service_Type_Factory const *stf, ACE_TCHAR *parms) : ACE_Static_Node (stf->name (), parms) @@ -397,7 +392,6 @@ ACE_Static_Node::~ACE_Static_Node (void) delete[] this->parameters_; } - ACE_ALLOC_HOOK_DEFINE (ACE_Location_Node) void @@ -823,12 +817,10 @@ ACE_Service_Type_Factory::ACE_Service_Type_Factory (ACE_TCHAR const *name, { } - ACE_Service_Type_Factory::~ACE_Service_Type_Factory (void) { } - ACE_Service_Type * ACE_Service_Type_Factory::make_service_type (ACE_Service_Gestalt *cfg) const { @@ -879,7 +871,6 @@ ACE_Service_Type_Factory::name (void) const return name_.c_str (); } - ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */ diff --git a/dep/ACE_wrappers/ace/Parse_Node.h b/dep/ACE_wrappers/ace/Parse_Node.h index 232b3890396..eeb743e26c3 100644 --- a/dep/ACE_wrappers/ace/Parse_Node.h +++ b/dep/ACE_wrappers/ace/Parse_Node.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_PARSE_NODE_H #define ACE_PARSE_NODE_H @@ -194,7 +193,6 @@ private: ACE_UNIMPLEMENTED_FUNC (ACE_Static_Node& operator= (const ACE_Static_Node&)) }; - class ACE_Service_Type_Factory; /** diff --git a/dep/ACE_wrappers/ace/Ping_Socket.cpp b/dep/ACE_wrappers/ace/Ping_Socket.cpp index a09e3731a80..56411a3cf5f 100644 --- a/dep/ACE_wrappers/ace/Ping_Socket.cpp +++ b/dep/ACE_wrappers/ace/Ping_Socket.cpp @@ -14,7 +14,6 @@ # include "ace/Ping_Socket.inl" #endif /* !__ACE_INLINE__ */ - ACE_RCSID (ace, Ping_Socket, "$Id: Ping_Socket.cpp 81737 2008-05-20 09:46:39Z johnnyw $") @@ -81,14 +80,12 @@ struct icmp #endif /* #if ! defined (ACE_WIN32) */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL int const ICMP_MIN = 8; // Minimal size of ICMP packet, header only int const ICMP_DATA_LENGTH = 56; // For ICMP data with Echo request ACE_Time_Value const ACE_Ping_Socket::time_default_ (0, 500000); - void ACE_Ping_Socket::dump (void) const { diff --git a/dep/ACE_wrappers/ace/Proactor.cpp b/dep/ACE_wrappers/ace/Proactor.cpp index c56f352e789..0834d8eafbc 100644 --- a/dep/ACE_wrappers/ace/Proactor.cpp +++ b/dep/ACE_wrappers/ace/Proactor.cpp @@ -16,12 +16,10 @@ # include "ace/Service_Config.h" #endif /* !ACE_HAS_WINCE && !ACE_LACKS_ACE_SVCCONF */ - ACE_RCSID (ace, Proactor, "$Id: Proactor.cpp 81535 2008-04-29 20:08:52Z shuston $") - #include "ace/Task_T.h" #include "ace/Log_Msg.h" #include "ace/Framework_Component.h" @@ -460,7 +458,7 @@ ACE_Proactor::proactor_run_event_loop (PROACTOR_EVENT_HOOK eh) } // Run the event loop. - for (;;) + for (; ; ) { // Check the end loop flag. It is ok to do this without lock, // since we care just whether it is zero or non-zero. @@ -517,7 +515,7 @@ ACE_Proactor::proactor_run_event_loop (ACE_Time_Value &tv, } // Run the event loop. - for (;;) + for (; ; ) { // Check the end loop flag. It is ok to do this without lock, // since we care just whether it is zero or non-zero. @@ -815,7 +813,6 @@ ACE_Proactor::implementation (void) const return this->implementation_; } - ACE_Asynch_Read_Stream_Impl * ACE_Proactor::create_asynch_read_stream (void) { @@ -892,7 +889,6 @@ ACE_Proactor::create_asynch_read_stream_result signal_number); } - ACE_Asynch_Write_Stream_Result_Impl * ACE_Proactor::create_asynch_write_stream_result (ACE_Handler::Proxy_Ptr &handler_proxy, diff --git a/dep/ACE_wrappers/ace/Proactor.h b/dep/ACE_wrappers/ace/Proactor.h index 04e4aac19a5..17afb7ecd3f 100644 --- a/dep/ACE_wrappers/ace/Proactor.h +++ b/dep/ACE_wrappers/ace/Proactor.h @@ -297,7 +297,6 @@ public: /// <run_event_loop> method can be restarted. int proactor_reset_event_loop (void); - /// This method adds the @a handle to the I/O completion port. This /// function is a no-op function for Unix systems and returns 0; int register_handle (ACE_HANDLE handle, @@ -628,7 +627,6 @@ protected: /// Mutex to protect work with lists. ACE_SYNCH_MUTEX mutex_; - private: /// Deny access since member-wise won't work... ACE_Proactor (const ACE_Proactor &); diff --git a/dep/ACE_wrappers/ace/Proactor_Impl.h b/dep/ACE_wrappers/ace/Proactor_Impl.h index dc79c8f57c1..b93606f443e 100644 --- a/dep/ACE_wrappers/ace/Proactor_Impl.h +++ b/dep/ACE_wrappers/ace/Proactor_Impl.h @@ -11,7 +11,6 @@ */ //============================================================================= - #ifndef ACE_PROACTOR_IMPL_H #define ACE_PROACTOR_IMPL_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Process.cpp b/dep/ACE_wrappers/ace/Process.cpp index a39a02beb52..059d57bbbb5 100644 --- a/dep/ACE_wrappers/ace/Process.cpp +++ b/dep/ACE_wrappers/ace/Process.cpp @@ -40,7 +40,6 @@ sigchld_nop (int, siginfo_t *, ucontext_t *) } #endif /* ACE_WIN32 */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Process::ACE_Process (void) @@ -1146,7 +1145,6 @@ ACE_Process_Options::set_handles (ACE_HANDLE std_in, return 0; // Success. } - void ACE_Process_Options::release_handles () { @@ -1166,7 +1164,6 @@ ACE_Process_Options::release_handles () } #endif /* !ACE_HAS_WINCE */ - ACE_Process_Options::~ACE_Process_Options (void) { #if !defined (ACE_HAS_WINCE) diff --git a/dep/ACE_wrappers/ace/Process.h b/dep/ACE_wrappers/ace/Process.h index 908d3d0cf97..6f83dc3bb1c 100644 --- a/dep/ACE_wrappers/ace/Process.h +++ b/dep/ACE_wrappers/ace/Process.h @@ -602,7 +602,6 @@ private: #endif }; - /** * @class ACE_Managed_Process * diff --git a/dep/ACE_wrappers/ace/Process_Manager.cpp b/dep/ACE_wrappers/ace/Process_Manager.cpp index 95c92329a65..cf9b1e4b2c6 100644 --- a/dep/ACE_wrappers/ace/Process_Manager.cpp +++ b/dep/ACE_wrappers/ace/Process_Manager.cpp @@ -52,7 +52,6 @@ sigchld_nop (int, siginfo_t *, ucontext_t *) } #endif /* ACE_WIN32 */ - ACE_ALLOC_HOOK_DEFINE(ACE_Process_Manager) // Singleton instance. @@ -640,7 +639,6 @@ ACE_Process_Manager::terminate (pid_t pid, int sig) return ACE_OS::kill (pid, sig); } - int ACE_Process_Manager::set_scheduler (const ACE_Sched_Params & params, pid_t pid) diff --git a/dep/ACE_wrappers/ace/Process_Semaphore.h b/dep/ACE_wrappers/ace/Process_Semaphore.h index 7a3e148ace3..aa5b8b1aa58 100644 --- a/dep/ACE_wrappers/ace/Process_Semaphore.h +++ b/dep/ACE_wrappers/ace/Process_Semaphore.h @@ -152,7 +152,6 @@ public: ACE_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "ace/Process_Semaphore.inl" #endif /* __ACE_INLINE__ */ diff --git a/dep/ACE_wrappers/ace/Profile_Timer.cpp b/dep/ACE_wrappers/ace/Profile_Timer.cpp index 2680ad06810..5400836095a 100644 --- a/dep/ACE_wrappers/ace/Profile_Timer.cpp +++ b/dep/ACE_wrappers/ace/Profile_Timer.cpp @@ -24,7 +24,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Profile_Timer) - void ACE_Profile_Timer::dump (void) const { @@ -429,7 +428,6 @@ ACE_Profile_Timer::get_rusage (ACE_Profile_Timer::Rusage &usage) usage = 0; } - void ACE_Profile_Timer::elapsed_rusage (ACE_Profile_Timer::Rusage &usage) { diff --git a/dep/ACE_wrappers/ace/Profile_Timer.h b/dep/ACE_wrappers/ace/Profile_Timer.h index c46cdab2168..64721603362 100644 --- a/dep/ACE_wrappers/ace/Profile_Timer.h +++ b/dep/ACE_wrappers/ace/Profile_Timer.h @@ -10,7 +10,6 @@ */ //========================================================================== - #ifndef ACE_PROFILE_TIMER_H #define ACE_PROFILE_TIMER_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/RB_Tree.h b/dep/ACE_wrappers/ace/RB_Tree.h index 536d7073ccc..b02e3e41139 100644 --- a/dep/ACE_wrappers/ace/RB_Tree.h +++ b/dep/ACE_wrappers/ace/RB_Tree.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_RB_TREE_H #define ACE_RB_TREE_H #include /**/ "ace/pre.h" @@ -208,7 +207,6 @@ public: /// Constructor. ACE_RB_Tree (ACE_Allocator *alloc = 0); - /// Copy constructor. ACE_RB_Tree (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &rbt); @@ -242,7 +240,6 @@ public: const INT_ID &int_id, ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry); - /** * Associate @a ext_id with @a int_id if and only if @a ext_id is not * in the tree. If @a ext_id is already in the tree then the @a int_id diff --git a/dep/ACE_wrappers/ace/RB_Tree.inl b/dep/ACE_wrappers/ace/RB_Tree.inl index 7de889abf5b..e4e5ab3d759 100644 --- a/dep/ACE_wrappers/ace/RB_Tree.inl +++ b/dep/ACE_wrappers/ace/RB_Tree.inl @@ -22,7 +22,6 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::key () return k_; } - // Item accessor. template <class EXT_ID, class INT_ID> @@ -33,7 +32,6 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::item () return t_; } - // Set color of the node. template <class EXT_ID, class INT_ID> @@ -44,7 +42,6 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::color (ACE_RB_Tree_Node_Base::RB_Tree_Node_Col color_ = c; } - // Get color of the node. template <class EXT_ID, class INT_ID> @@ -55,7 +52,6 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::color () return color_; } - // Accessor for node's parent pointer. template <class EXT_ID, class INT_ID> @@ -66,7 +62,6 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::parent () return parent_; } - // Mutator for node's parent pointer. template <class EXT_ID, class INT_ID> @@ -77,8 +72,6 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::parent (ACE_RB_Tree_Node<EXT_ID, INT_ID> * p) parent_ = p; } - - // Accessor for node's left child pointer. template <class EXT_ID, class INT_ID> @@ -89,7 +82,6 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::left () return left_; } - // Mutator for node's left child pointer. template <class EXT_ID, class INT_ID> @@ -100,7 +92,6 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::left (ACE_RB_Tree_Node<EXT_ID, INT_ID> * l) left_ = l; } - // Accessor for node's right child pointer. template <class EXT_ID, class INT_ID> @@ -111,7 +102,6 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::right () return right_; } - // Mutator for node's right child pointer. template <class EXT_ID, class INT_ID> @@ -122,12 +112,10 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::right (ACE_RB_Tree_Node<EXT_ID, INT_ID> * r) right_ = r; } - //////////////////////////////////////////////////////////////////////// // template class ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> // //////////////////////////////////////////////////////////////////////// - // Initialize an RB Tree. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -165,7 +153,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close (void) return this->close_i (); } - // Associate <ext_id> with <int_id>. If <ext_id> is already in the // tree then the <ACE_RB_Tree_Node> is not changed. Returns 0 if a // new entry is bound successfully, returns 1 if an attempt is made @@ -183,7 +170,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::bind (const EXT_ID &ext_id, return this->insert_i (ext_id, int_id, entry); } - // Same as a normal bind, except the tree entry is also passed back // to the caller. The entry in this case will either be the newly // created entry, or the existing one. @@ -201,7 +187,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::bind (const EXT_ID &ext_id, return this->insert_i (ext_id, int_id, entry); } - // Associate <ext_id> with <int_id> if and only if <ext_id> is not // in the tree. If <ext_id> is already in the tree then the <int_id> // parameter is assigned the existing value in the tree. Returns 0 @@ -227,7 +212,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::trybind (const EXT_ID &ext_ return result; } - // Same as a normal trybind, except the tree entry is also passed // back to the caller. The entry in this case will either be the // newly created entry, or the existing one. @@ -249,11 +233,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::trybind (const EXT_ID &ext_ int_id = entry->item (); } - return result; } - // Reassociate <ext_id> with <int_id>. If <ext_id> is not in the // tree then behaves just like <bind>. Returns 0 if a new entry is // bound successfully, returns 1 if an existing entry was rebound, @@ -279,7 +261,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i return result; } - // Same as a normal rebind, except the tree entry is also passed back // to the caller. The entry in this case will either be the newly // created entry, or the existing one. @@ -305,7 +286,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i return result; } - // Associate <ext_id> with <int_id>. If <ext_id> is not in the tree // then behaves just like <bind>. Otherwise, store the old value of // <int_id> into the "out" parameter and rebind the new parameters. @@ -335,7 +315,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i return result; } - // Same as a normal rebind, except the tree entry is also passed back // to the caller. The entry in this case will either be the newly // created entry, or the existing one. @@ -363,7 +342,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i return result; } - // Associate <ext_id> with <int_id>. If <ext_id> is not in the tree // then behaves just like <bind>. Otherwise, store the old values // of <ext_id> and <int_id> into the "out" parameters and rebind the @@ -398,7 +376,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i return result; } - // Same as a normal rebind, except the tree entry is also passed back // to the caller. The entry in this case will either be the newly // created entry, or the existing one. @@ -429,7 +406,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i return result; } - // Locate <ext_id> and pass out parameter via <int_id>. If found, // return 0, returns -1 if not found. @@ -466,7 +442,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find (const EXT_ID &ext_id, return this->find_i (ext_id, entry); } - // Unbind (remove) the <ext_id> from the tree. Don't return the // <int_id> to the caller (this is useful for collections where the // <int_id>s are *not* dynamically allocated...). @@ -502,7 +477,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::unbind (const EXT_ID &ext_i return -1; } - // Break any association of <ext_id>. Returns the value of <int_id> // in case the caller needs to deallocate memory. @@ -537,7 +511,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::unbind (const EXT_ID &ext_i return -1; } - // Remove entry from the tree. This method should be used with *extreme* // caution, and only for optimization purposes. The node being passed // in had better have been allocated by the tree that is unbinding it. @@ -551,7 +524,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::unbind (ACE_RB_Tree_Node<EX return this->remove_i (entry); } - // Returns a reference to the underlying <ACE_LOCK>. This makes it // possible to acquire the lock explicitly, which can be useful in // some cases if you instantiate the <ACE_Atomic_Op> with an @@ -567,7 +539,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::mutex (void) return this->lock_; } - // Dump the state of an object. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -586,7 +557,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const #endif /* ACE_HAS_DUMP */ } - // Return forward iterator positioned at first node in tree. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -598,7 +568,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::begin (void) return ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> (*this); } - // Return forward iterator positioned at last node in tree. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -610,7 +579,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::end (void) return ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> (); } - // Return reverse iterator positioned at last node in tree. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -622,7 +590,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rbegin (void) return ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> (*this); } - // Return reverse iterator positioned at first node in tree. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -634,7 +601,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rend (void) return ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> (); } - // Returns a pointer to the item corresponding to the given key, // or 0 if it cannot find the key in the tree. DEPRECATED. @@ -682,7 +648,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert (const EXT_ID &k, co return this->insert_i (k, t); } - // Removes the item associated with the given key from the // tree and destroys it. Returns 1 if it found the item // and successfully destroyed it, 0 if it did not find the @@ -699,7 +664,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove (const EXT_ID &k) return this->remove_i (k, i); } - // Destroys all nodes and sets the root pointer null. DEPRECATED template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -722,7 +686,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::current_size () const return current_size_; } - /////////////////////////////////////////////////////////////////////// // template class // // ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> // @@ -747,7 +710,6 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::done (void) c return node_ ? 0 : 1; } - // STL-like iterator dereference operator: returns a reference // to the node underneath the iterator. @@ -759,7 +721,6 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator* (vo return *(this->node_); } - // STL-like iterator dereference operator: returns a reference // to the node underneath the iterator. @@ -771,7 +732,6 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-> (v return this->node_; } - // Returns a reference to the tree over which we're iterating. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>ACE_INLINE const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & @@ -781,7 +741,6 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::tree (void) return *tree_; } - // Comparison operator: returns 1 if both iterators point to the same position, otherwise 0. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -793,7 +752,6 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator== return (this->node_ == rbt.node_) ? true : false; } - // Comparison operator: returns 1 if the iterators point to different positions, otherwise 0. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -805,7 +763,6 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator!= return (this->node_ == rbt.node_) ? false : true; } - // Move forward by one element in the tree. Returns 0 when // there are no more elements in the tree, otherwise 1. @@ -823,7 +780,6 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::forward_i (vo return node_ ? 1 : 0; } - // Move back by one element in the tree. Returns 0 when // there are no more elements in the tree, otherwise 1. @@ -841,7 +797,6 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::reverse_i (vo return node_ ? 1 : 0; } - ////////////////////////////////////////////////////////////////// // template class // // ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> // @@ -867,7 +822,6 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance (void) return this->forward_i (); } - // Dump the state of an object. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -881,7 +835,6 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const #endif /* ACE_HAS_DUMP */ } - // Prefix advance. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -894,7 +847,6 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ (void) return *this; } - // Postfix advance. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -908,7 +860,6 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ (int) return retv; } - // Prefix reverse. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -921,7 +872,6 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- (void) return *this; } - // Postfix reverse. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -935,7 +885,6 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- (int) return retv; } - // Passes back the <entry> under the iterator. Returns 0 if // the iteration has completed, otherwise 1. This method must // be declared and defined in both the derived forward and @@ -961,7 +910,6 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next (ACE_RB_Tree_ return 0; } - // Accessor for key of node under iterator (if any). DEPRECATED. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -972,7 +920,6 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::key () return this->node_ ? (&(this->node_->key ())) : 0; } - // Accessor for item of node under iterator (if any). DEPRECATED. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -983,7 +930,6 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::item () return this->node_ ? (&(this->node_->item ())) : 0; } - // Move to the first item in the tree. DEPRECATED. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -995,7 +941,6 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::first () return this->node_ ? 1 : 0; } - // Move to the last item in the tree. DEPRECATED. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -1007,7 +952,6 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::last () return this->node_ ? 1 : 0; } - // Moves to the next item in the tree, // returns 1 if there is a next item, 0 otherwise. DEPRECATED. @@ -1020,7 +964,6 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next () return this->node_ ? 1 : 0; } - // Moves to the previous item in the tree, // returns 1 if there is a previous item, 0 otherwise. DEPRECATED. @@ -1033,7 +976,6 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::previous () return this->node_ ? 1 : 0; } - // Returns 0 if the iterator is positioned over a valid ACE_RB_Tree // node, returns 1 if not. DEPRECATED. @@ -1045,13 +987,11 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::is_done () return this->node_ ? 0 : 1; } - ////////////////////////////////////////////////////////////////////////// // template class // // ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> // ////////////////////////////////////////////////////////////////////////// - template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Reverse_Iterator (void) @@ -1072,7 +1012,6 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance (v return this->reverse_i (); } - // Dump the state of an object. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -1086,7 +1025,6 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void #endif /* ACE_HAS_DUMP */ } - // Prefix advance. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -1099,7 +1037,6 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ return *this; } - // Postfix advance. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -1113,7 +1050,6 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ return retv; } - // Prefix reverse. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -1126,7 +1062,6 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- return *this; } - // Postfix reverse. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> @@ -1140,7 +1075,6 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- return retv; } - // Passes back the <entry> under the iterator. Returns 0 if // the iteration has completed, otherwise 1. This method must // be declared and defined in both the derived forward and diff --git a/dep/ACE_wrappers/ace/Reactor.cpp b/dep/ACE_wrappers/ace/Reactor.cpp index 024a36129d2..02419d3ef4f 100644 --- a/dep/ACE_wrappers/ace/Reactor.cpp +++ b/dep/ACE_wrappers/ace/Reactor.cpp @@ -308,7 +308,7 @@ ACE_Reactor::run_alertable_reactor_event_loop (ACE_Time_Value &tv, if (this->reactor_event_loop_done ()) return 0; - for (;;) + for (; ; ) { int result = this->implementation_->alertable_handle_events (tv); diff --git a/dep/ACE_wrappers/ace/Reactor.h b/dep/ACE_wrappers/ace/Reactor.h index 223c25b103f..dc89ed4d6cc 100644 --- a/dep/ACE_wrappers/ace/Reactor.h +++ b/dep/ACE_wrappers/ace/Reactor.h @@ -870,7 +870,6 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "ace/Reactor.inl" #endif /* __ACE_INLINE__ */ diff --git a/dep/ACE_wrappers/ace/Reactor_Impl.h b/dep/ACE_wrappers/ace/Reactor_Impl.h index d943e9ee5ec..db5a6ea2524 100644 --- a/dep/ACE_wrappers/ace/Reactor_Impl.h +++ b/dep/ACE_wrappers/ace/Reactor_Impl.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_REACTOR_IMPL_H #define ACE_REACTOR_IMPL_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Reactor_Timer_Interface.cpp b/dep/ACE_wrappers/ace/Reactor_Timer_Interface.cpp index 91a4f48810a..504f0107980 100644 --- a/dep/ACE_wrappers/ace/Reactor_Timer_Interface.cpp +++ b/dep/ACE_wrappers/ace/Reactor_Timer_Interface.cpp @@ -6,7 +6,6 @@ ACE_RCSID (ace, Reactor_Timer_Interface, "$Id: Reactor_Timer_Interface.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Reactor_Timer_Interface::~ACE_Reactor_Timer_Interface() diff --git a/dep/ACE_wrappers/ace/Reactor_Token_T.h b/dep/ACE_wrappers/ace/Reactor_Token_T.h index 4fcd2dae4f2..9eedb7b4d0b 100644 --- a/dep/ACE_wrappers/ace/Reactor_Token_T.h +++ b/dep/ACE_wrappers/ace/Reactor_Token_T.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_REACTOR_TOKEN_T_H #define ACE_REACTOR_TOKEN_T_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Read_Buffer.cpp b/dep/ACE_wrappers/ace/Read_Buffer.cpp index d87e2c55d3c..f7cb7944eb6 100644 --- a/dep/ACE_wrappers/ace/Read_Buffer.cpp +++ b/dep/ACE_wrappers/ace/Read_Buffer.cpp @@ -15,7 +15,6 @@ ACE_RCSID(ace, Read_Buffer, "$Id: Read_Buffer.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL void diff --git a/dep/ACE_wrappers/ace/Recyclable.cpp b/dep/ACE_wrappers/ace/Recyclable.cpp index 1a31631fd9a..ec281377bac 100644 --- a/dep/ACE_wrappers/ace/Recyclable.cpp +++ b/dep/ACE_wrappers/ace/Recyclable.cpp @@ -1,7 +1,6 @@ //$Id: Recyclable.cpp 80826 2008-03-04 14:51:23Z wotte $ #include "ace/Recyclable.h" - #if !defined (__ACE_INLINE__) #include "ace/Recyclable.inl" #endif /* __ACE_INLINE __ */ diff --git a/dep/ACE_wrappers/ace/Registry.cpp b/dep/ACE_wrappers/ace/Registry.cpp index 897df00a9af..5244f9feb16 100644 --- a/dep/ACE_wrappers/ace/Registry.cpp +++ b/dep/ACE_wrappers/ace/Registry.cpp @@ -24,7 +24,6 @@ ACE_RCSID (ace, return 0; \ } while (0) - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_TCHAR const ACE_Registry::STRING_SEPARATOR[] = ACE_TEXT ("\\"); @@ -50,7 +49,6 @@ ACE_Registry::Binding::Binding () { } - // Binding constructor // (Name version) ACE_Registry::Binding::Binding (const Name &name, @@ -60,7 +58,6 @@ ACE_Registry::Binding::Binding (const Name &name, { } - // Binding constructor // (String version) ACE_Registry::Binding::Binding (const ACE_TString &name, @@ -70,7 +67,6 @@ ACE_Registry::Binding::Binding (const ACE_TString &name, { } - bool ACE_Registry::Binding::operator== (const Binding &rhs) const { @@ -93,7 +89,6 @@ ACE_Registry::Binding::name (Name &name) name = ACE_Registry::make_name (this->name_); } - // Name accessors // (String version) void @@ -102,7 +97,6 @@ ACE_Registry::Binding::name (ACE_TString &name) name = this->name_; } - // Name accessors // (String version) ACE_TString @@ -111,7 +105,6 @@ ACE_Registry::Binding::name (void) return this->name_; } - // Type accessor ACE_Registry::Binding_Type ACE_Registry::Binding::type (void) @@ -119,7 +112,6 @@ ACE_Registry::Binding::type (void) return this->type_; } - // Simple object constructor ACE_Registry::Object::Object (void *data, u_long size, @@ -137,42 +129,36 @@ ACE_Registry::Object::data (void *data) this->data_ = data; } - void * ACE_Registry::Object::data (void) const { return this->data_; } - void ACE_Registry::Object::size (u_long size) { this->size_ = size; } - u_long ACE_Registry::Object::size (void) const { return this->size_; } - void ACE_Registry::Object::type (u_long type) { this->type_ = type; } - u_long ACE_Registry::Object::type (void) const { return this->type_; } - // Simple context constructor ACE_Registry::Naming_Context::Naming_Context (void) : key_ ((HKEY) 0), @@ -181,7 +167,6 @@ ACE_Registry::Naming_Context::Naming_Context (void) { } - // Context constructor ACE_Registry::Naming_Context::Naming_Context (const HKEY &key) : key_ (key), @@ -190,7 +175,6 @@ ACE_Registry::Naming_Context::Naming_Context (const HKEY &key) { } - ACE_Registry::Naming_Context::Naming_Context (const Naming_Context &rhs) : key_ (rhs.key_), parent_key_ (rhs.parent_key_), @@ -201,7 +185,6 @@ ACE_Registry::Naming_Context::Naming_Context (const Naming_Context &rhs) // But since this is private (and not used), I don't care much } - const ACE_Registry::Naming_Context & ACE_Registry::Naming_Context::operator= (const Naming_Context &rhs) { @@ -211,14 +194,12 @@ ACE_Registry::Naming_Context::operator= (const Naming_Context &rhs) return *this; } - // Destructor ACE_Registry::Naming_Context::~Naming_Context () { this->close (); } - // Insert <object> with <name> into <this> context // (Name version) int @@ -228,7 +209,6 @@ ACE_Registry::Naming_Context::bind_new (const Name &name, return this->bind_new (ACE_Registry::make_string (name), object); } - // Insert <object> with <name> into <this> context // (String version) int @@ -247,7 +227,6 @@ ACE_Registry::Naming_Context::bind_new (const ACE_TString &name, return result; } - // Insert or update <object> with <name> into <this> context // (Name version) int @@ -257,7 +236,6 @@ ACE_Registry::Naming_Context::bind (const Name &name, return this->bind (ACE_Registry::make_string (name), object); } - // Insert or update <object> with <name> into <this> context // (String version) int @@ -273,7 +251,6 @@ ACE_Registry::Naming_Context::bind (const ACE_TString &name, ACE_REGISTRY_CALL_RETURN (result); } - // Update <object> with <name> in <this> context // (Name version) int @@ -283,7 +260,6 @@ ACE_Registry::Naming_Context::rebind (const Name &name, return this->rebind (ACE_Registry::make_string (name), new_object); } - // Update <object> with <name> in <this> context // (String version) int @@ -299,7 +275,6 @@ ACE_Registry::Naming_Context::rebind (const ACE_TString &name, return result; } - // Find <object> with <name> in <this> context // (Name version) int @@ -309,7 +284,6 @@ ACE_Registry::Naming_Context::resolve (const Name &name, return this->resolve (ACE_Registry::make_string (name), object); } - // Find <object> with <name> in <this> context // (String version) int @@ -338,7 +312,6 @@ ACE_Registry::Naming_Context::resolve (const ACE_TString &name, ACE_REGISTRY_CALL_RETURN (result); } - // Remove object with <name> in <this> context // (Name version) int @@ -347,7 +320,6 @@ ACE_Registry::Naming_Context::unbind (const Name &name) return this->unbind (ACE_Registry::make_string (name)); } - // Remove object with <name> in <this> context // (String version) int @@ -359,7 +331,6 @@ ACE_Registry::Naming_Context::unbind (const ACE_TString &name) ACE_REGISTRY_CALL_RETURN (result); } - // Create new <naming_context> relative to <this> context // This method may not mean a lot in this implementation int @@ -369,7 +340,6 @@ ACE_Registry::Naming_Context::new_context (Naming_Context &naming_context) return naming_context.close (); } - // Insert <naming_context> with <name> relative to <this> context // (Name version) int @@ -386,7 +356,6 @@ ACE_Registry::Naming_Context::bind_new_context (const Name &name, security_attributes); } - // Insert <naming_context> with <name> relative to <this> context // (String version) int @@ -434,7 +403,6 @@ ACE_Registry::Naming_Context::bind_new_context (const ACE_TString &name, ACE_REGISTRY_CALL_RETURN (result); } - // Insert or update <naming_context> with <name> relative to <this> context // (Name version) int @@ -451,7 +419,6 @@ ACE_Registry::Naming_Context::bind_context (const Name &name, security_attributes); } - // Insert or update <naming_context> with <name> relative to <this> context // (String version) int @@ -483,7 +450,6 @@ ACE_Registry::Naming_Context::bind_context (const ACE_TString &name, ACE_REGISTRY_CALL_RETURN (result); } - // Rename <naming_context> to <name> // (Name version) int @@ -494,7 +460,6 @@ ACE_Registry::Naming_Context::rebind_context (const Name &name, new_naming_context); } - // Rename <naming_context> to <name> // (String version) int @@ -520,7 +485,6 @@ ACE_Registry::Naming_Context::rebind_context (const ACE_TString &name, return result; } - // Remove naming_context with <name> from <this> context // (Name version) int @@ -529,7 +493,6 @@ ACE_Registry::Naming_Context::unbind_context (const Name &name) return this->unbind_context (ACE_Registry::make_string (name)); } - // Remove naming_context with <name> from <this> context // (String version) int @@ -541,7 +504,6 @@ ACE_Registry::Naming_Context::unbind_context (const ACE_TString &name) ACE_REGISTRY_CALL_RETURN (result); } - // Find <naming_context> with <name> in <this> context // (Name version) int @@ -554,7 +516,6 @@ ACE_Registry::Naming_Context::resolve_context (const Name &name, security_access); } - // Find <naming_context> with <name> in <this> context // (String version) int @@ -578,7 +539,6 @@ ACE_Registry::Naming_Context::resolve_context (const ACE_TString &name, ACE_REGISTRY_CALL_RETURN (result); } - // Same as unbind_context() with <this> as naming_context int ACE_Registry::Naming_Context::destroy (void) @@ -590,7 +550,6 @@ ACE_Registry::Naming_Context::destroy (void) ACE_REGISTRY_CALL_RETURN (result); } - // Sync content of context to disk int ACE_Registry::Naming_Context::flush (void) @@ -599,7 +558,6 @@ ACE_Registry::Naming_Context::flush (void) ACE_REGISTRY_CALL_RETURN (result); } - // Close the handle of the context int ACE_Registry::Naming_Context::close (void) @@ -608,7 +566,6 @@ ACE_Registry::Naming_Context::close (void) ACE_REGISTRY_CALL_RETURN (result); } - // Convert a <name> to a <string> ACE_TString ACE_Registry::make_string (const Name &const_name) @@ -632,7 +589,6 @@ ACE_Registry::make_string (const Name &const_name) return string; } - // Convert a <string> to a <name> ACE_Registry::Name ACE_Registry::make_name (const ACE_TString &string) @@ -671,7 +627,6 @@ ACE_Registry::make_name (const ACE_TString &string) return name; } - // Set key void ACE_Registry::Naming_Context::key (HKEY key) @@ -679,7 +634,6 @@ ACE_Registry::Naming_Context::key (HKEY key) this->key_ = key; } - // Get key HKEY ACE_Registry::Naming_Context::key (void) @@ -687,7 +641,6 @@ ACE_Registry::Naming_Context::key (void) return this->key_; } - // Set parent void ACE_Registry::Naming_Context::parent (HKEY parent) @@ -695,7 +648,6 @@ ACE_Registry::Naming_Context::parent (HKEY parent) this->parent_key_ = parent; } - // Get parent HKEY ACE_Registry::Naming_Context::parent (void) @@ -703,7 +655,6 @@ ACE_Registry::Naming_Context::parent (void) return this->parent_key_; } - // Set name // (Name version) void @@ -712,7 +663,6 @@ ACE_Registry::Naming_Context::name (const Name &name) this->name_ = ACE_Registry::make_string (name); } - // Get name // (Name version) void @@ -721,7 +671,6 @@ ACE_Registry::Naming_Context::name (Name &name) name = ACE_Registry::make_name (this->name_); } - // Set name // (String version) void @@ -730,7 +679,6 @@ ACE_Registry::Naming_Context::name (const ACE_TString &name) this->name_ = name; } - // Get name // (String version) ACE_TString @@ -739,7 +687,6 @@ ACE_Registry::Naming_Context::name (void) return this->name_; } - // Get name // (String version) void @@ -776,7 +723,6 @@ ACE_Registry::Naming_Context::list (u_long how_many, return iter.next_n (how_many, list); } - // listing function: iterator creator // This gives back a listing of all entries in <this> context. int @@ -807,7 +753,6 @@ ACE_Registry::Naming_Context::list (Binding_List &list) return 0; } - // Default constructor ACE_Registry::Binding_Iterator::Binding_Iterator () { @@ -817,7 +762,6 @@ ACE_Registry::Binding_Iterator::Binding_Iterator () this->reset (); } - void ACE_Registry::Binding_Iterator::reset () { @@ -827,27 +771,23 @@ ACE_Registry::Binding_Iterator::reset () this->context_iteration_.reset (); } - void ACE_Registry::Binding_Iterator::Iteration_State::reset () { this->index_ = 0; } - void ACE_Registry::Binding_Iterator::Iteration_State::iterator (Binding_Iterator *iter) { this->parent_ = iter; } - ACE_Registry::Binding_Iterator::Iteration_State::Iteration_State () : index_ (0) { } - // Next entry int ACE_Registry::Binding_Iterator::next_one (Binding &binding) @@ -865,7 +805,6 @@ ACE_Registry::Binding_Iterator::next_one (Binding &binding) return result; } - // Next <how_many> entries int ACE_Registry::Binding_Iterator::next_n (u_long how_many, @@ -877,7 +816,6 @@ ACE_Registry::Binding_Iterator::next_n (u_long how_many, return this->current_enumeration_->next_n (how_many, list); } - // Destroy iterator int ACE_Registry::Binding_Iterator::destroy (void) @@ -886,7 +824,6 @@ ACE_Registry::Binding_Iterator::destroy (void) return 0; } - // Set/Get naming_context void ACE_Registry::Binding_Iterator::naming_context (Naming_Context &naming_context) @@ -894,14 +831,12 @@ ACE_Registry::Binding_Iterator::naming_context (Naming_Context &naming_context) this->naming_context_ = &naming_context; } - ACE_Registry::Naming_Context & ACE_Registry::Binding_Iterator::naming_context (void) { return *this->naming_context_; } - // Set/Get current enumeration void ACE_Registry::Binding_Iterator::current_enumeration (Iteration_State ¤t_enumeration) @@ -909,14 +844,12 @@ ACE_Registry::Binding_Iterator::current_enumeration (Iteration_State ¤t_en this->current_enumeration_ = ¤t_enumeration; } - ACE_Registry::Binding_Iterator::Iteration_State & ACE_Registry::Binding_Iterator::current_enumeration (void) { return *this->current_enumeration_; } - int ACE_Registry::Binding_Iterator::Object_Iteration::next_n (u_long how_many, Binding_List &list) @@ -986,7 +919,6 @@ ACE_Registry::Binding_Iterator::Object_Iteration::next_n (u_long how_many, return 0; } - int ACE_Registry::Binding_Iterator::Context_Iteration::next_n (u_long how_many, Binding_List &list) @@ -1051,7 +983,6 @@ ACE_Registry::Binding_Iterator::Context_Iteration::next_n (u_long how_many, return 0; } - int ACE_Registry::Binding_Iterator::Iteration_Complete::next_n (u_long how_many, Binding_List &list) @@ -1063,7 +994,6 @@ ACE_Registry::Binding_Iterator::Iteration_Complete::next_n (u_long how_many, return -1; } - // Factory method to connect to predefined registries // This method works for both remote and local machines // However, for remote machines CLASSES_ROOT and CURRENT_USER diff --git a/dep/ACE_wrappers/ace/Registry.h b/dep/ACE_wrappers/ace/Registry.h index 2fc7a37d6d1..f3521829c2a 100644 --- a/dep/ACE_wrappers/ace/Registry.h +++ b/dep/ACE_wrappers/ace/Registry.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_REGISTRY_H #define ACE_REGISTRY_H #include /**/ "ace/pre.h" @@ -258,7 +257,6 @@ public: /// Delete object with @a name in @c this context int unbind (const ACE_TString &name); - // The following interfaces are for Naming Context /// Create new @c naming_context diff --git a/dep/ACE_wrappers/ace/Registry_Name_Space.cpp b/dep/ACE_wrappers/ace/Registry_Name_Space.cpp index f59890e6c23..bfb27ef7dc5 100644 --- a/dep/ACE_wrappers/ace/Registry_Name_Space.cpp +++ b/dep/ACE_wrappers/ace/Registry_Name_Space.cpp @@ -20,12 +20,10 @@ ACE_Registry_Name_Space::ACE_Registry_Name_Space (ACE_Name_Options *name_options ACE_TEXT ("ACE_Registry_Name_Space::open"))); } - ACE_Registry_Name_Space::~ACE_Registry_Name_Space (void) { } - int ACE_Registry_Name_Space::open (ACE_Name_Options *name_options) { @@ -57,7 +55,6 @@ ACE_Registry_Name_Space::open (ACE_Name_Options *name_options) return 0; } - int ACE_Registry_Name_Space::bind (const ACE_NS_WString &name, const ACE_NS_WString &value, @@ -85,7 +82,6 @@ ACE_Registry_Name_Space::bind (const ACE_NS_WString &name, #endif /* ACE_HAS_WCHAR */ } - int ACE_Registry_Name_Space::rebind (const ACE_NS_WString &name, const ACE_NS_WString &value, @@ -113,7 +109,6 @@ ACE_Registry_Name_Space::rebind (const ACE_NS_WString &name, #endif /* ACE_USES_WCHAR */ } - int ACE_Registry_Name_Space::unbind (const ACE_NS_WString &name) { @@ -124,7 +119,6 @@ ACE_Registry_Name_Space::unbind (const ACE_NS_WString &name) #endif /* ACE_USES_WCHAR */ } - int ACE_Registry_Name_Space::resolve (const ACE_NS_WString &name, ACE_NS_WString &value, @@ -166,7 +160,6 @@ ACE_Registry_Name_Space::resolve (const ACE_NS_WString &name, return 0; } - int ACE_Registry_Name_Space:: list_names (ACE_WSTRING_SET &set, const ACE_NS_WString &pattern) @@ -188,7 +181,6 @@ ACE_Registry_Name_Space:: list_names (ACE_WSTRING_SET &set, return 0; } - int ACE_Registry_Name_Space::list_values (ACE_WSTRING_SET &set, const ACE_NS_WString &pattern) @@ -210,7 +202,6 @@ ACE_Registry_Name_Space::list_values (ACE_WSTRING_SET &set, return 0; } - int ACE_Registry_Name_Space::list_types (ACE_WSTRING_SET &set, const ACE_NS_WString &pattern) @@ -221,7 +212,6 @@ ACE_Registry_Name_Space::list_types (ACE_WSTRING_SET &set, return 0; } - int ACE_Registry_Name_Space::list_name_entries (ACE_BINDING_SET &set, const ACE_NS_WString &pattern) @@ -264,7 +254,6 @@ ACE_Registry_Name_Space::list_name_entries (ACE_BINDING_SET &set, return 0; } - int ACE_Registry_Name_Space::list_value_entries (ACE_BINDING_SET &set, const ACE_NS_WString &pattern) @@ -272,7 +261,6 @@ ACE_Registry_Name_Space::list_value_entries (ACE_BINDING_SET &set, return this->list_name_entries (set, pattern); } - int ACE_Registry_Name_Space::list_type_entries (ACE_BINDING_SET &set, const ACE_NS_WString &pattern) @@ -280,7 +268,6 @@ ACE_Registry_Name_Space::list_type_entries (ACE_BINDING_SET &set, return this->list_name_entries (set, pattern); } - void ACE_Registry_Name_Space::dump (void) const { diff --git a/dep/ACE_wrappers/ace/Registry_Name_Space.h b/dep/ACE_wrappers/ace/Registry_Name_Space.h index 842231777b6..213856bd17d 100644 --- a/dep/ACE_wrappers/ace/Registry_Name_Space.h +++ b/dep/ACE_wrappers/ace/Registry_Name_Space.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_REGISTRY_NAME_SPACE_H #define ACE_REGISTRY_NAME_SPACE_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Remote_Name_Space.h b/dep/ACE_wrappers/ace/Remote_Name_Space.h index 8b4ebdfc65e..ea9e43a90c0 100644 --- a/dep/ACE_wrappers/ace/Remote_Name_Space.h +++ b/dep/ACE_wrappers/ace/Remote_Name_Space.h @@ -10,7 +10,6 @@ */ //========================================================================== - #ifndef ACE_REMOTE_NAME_SPACE_H #define ACE_REMOTE_NAME_SPACE_H diff --git a/dep/ACE_wrappers/ace/Remote_Tokens.cpp b/dep/ACE_wrappers/ace/Remote_Tokens.cpp index 3df59910fa7..560307b5550 100644 --- a/dep/ACE_wrappers/ace/Remote_Tokens.cpp +++ b/dep/ACE_wrappers/ace/Remote_Tokens.cpp @@ -10,12 +10,10 @@ #include "ace/Remote_Tokens.inl" #endif /* __ACE_INLINE__ */ - ACE_RCSID (ace, Remote_Tokens, "$Id: Remote_Tokens.cpp 80826 2008-03-04 14:51:23Z wotte $") - #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) #define ACE_TSS_CONNECTION_MUTEX ACE_Thread_Mutex #else @@ -480,7 +478,6 @@ ACE_Remote_RLock::dump (void) const #endif /* ACE_HAS_DUMP */ } - ACE_Tokens * ACE_Remote_WLock::create_token (const ACE_TCHAR *name) { diff --git a/dep/ACE_wrappers/ace/Remote_Tokens.h b/dep/ACE_wrappers/ace/Remote_Tokens.h index d9a47cf7aa8..77d0acc69d6 100644 --- a/dep/ACE_wrappers/ace/Remote_Tokens.h +++ b/dep/ACE_wrappers/ace/Remote_Tokens.h @@ -63,7 +63,6 @@ public: int ignore_deadlock = 0, int debug = 0); - /** * Open a connection with the token server. This only need be used * when the user wishes to explicitly open a connection to check if diff --git a/dep/ACE_wrappers/ace/SOCK_CODgram.h b/dep/ACE_wrappers/ace/SOCK_CODgram.h index 761a92d9d31..b7641fccb19 100644 --- a/dep/ACE_wrappers/ace/SOCK_CODgram.h +++ b/dep/ACE_wrappers/ace/SOCK_CODgram.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_SOCK_CODGRAM_H #define ACE_SOCK_CODGRAM_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.cpp b/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.cpp index 0a55c5149fa..2fdf4de8c73 100644 --- a/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.cpp +++ b/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.cpp @@ -165,7 +165,6 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) #endif /* ! _UNICOS */ } - #if !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_VXWORKS) && !defined(__APPLE__) for (int n = ifc.ifc_len / sizeof (struct ifreq) ; n > 0; n--, ifr++) diff --git a/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.h b/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.h index a85ffc22052..0590b79d608 100644 --- a/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.h +++ b/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_SOCK_DGRAM_BCAST_H #define ACE_SOCK_DGRAM_BCAST_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.cpp b/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.cpp index 81ea48352d1..2c327f08255 100644 --- a/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.cpp +++ b/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.cpp @@ -96,7 +96,7 @@ ACE_SOCK_Dgram_Mcast::dump (void) const ACE_MT (ACE_GUARD (ACE_SDM_LOCK, guard, this->subscription_list_lock_)); subscription_list_iter_t iter (this->subscription_list_); - for ( ; !iter.done (); iter.advance ()) + for (; !iter.done (); iter.advance ()) { ACE_TCHAR iface_string[MAXNAMELEN + 1]; ip_mreq *pm = iter.next (); @@ -612,7 +612,6 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, { ACE_TRACE ("ACE_SOCK_Dgram_Mcast::unsubscribe_ifs"); - if (ACE_BIT_ENABLED (this->opts_, OPT_NULLIFACE_ALL) && net_if == 0) { @@ -690,7 +689,6 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, return 1; - } else { @@ -797,7 +795,6 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, return 0; } - int ACE_SOCK_Dgram_Mcast::leave (const ACE_INET_Addr &mcast_addr, const ACE_TCHAR *net_if) diff --git a/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.h b/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.h index a14e1fc0994..093e9fc8558 100644 --- a/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.h +++ b/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.h @@ -257,7 +257,6 @@ public: int reuse_addr = 1, // (see above) const ACE_TCHAR *net_if = 0); - /// Leave a multicast group on a given interface (or all interfaces, if /// supported). /** diff --git a/dep/ACE_wrappers/ace/SOCK_Netlink.cpp b/dep/ACE_wrappers/ace/SOCK_Netlink.cpp index 673b64b2958..7ebb6220e88 100644 --- a/dep/ACE_wrappers/ace/SOCK_Netlink.cpp +++ b/dep/ACE_wrappers/ace/SOCK_Netlink.cpp @@ -41,7 +41,6 @@ int ACE_SOCK_Netlink::open (ACE_Netlink_Addr &local, return 0; } - ACE_SOCK_Netlink::ACE_SOCK_Netlink (ACE_Netlink_Addr &local, int protocol_family, int protocol) diff --git a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.h b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.h index 2a524652f5b..526b374f3fd 100644 --- a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.h +++ b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.h @@ -80,7 +80,6 @@ public: int backlog = ACE_DEFAULT_BACKLOG, int protocol = 132); - /** * Initialize a passive-mode BSD-style acceptor socket (no QoS). * @a local_sap is the address that we're going to listen for @@ -102,7 +101,6 @@ public: int backlog = ACE_DEFAULT_BACKLOG, int protocol = 132); - /// Initialize a passive-mode QoS-enabled acceptor socket. Returns 0 /// on success and -1 on failure. int open (const ACE_Addr &local_sap, diff --git a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Association.cpp b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Association.cpp index 13938988826..dcb1cb73ee6 100644 --- a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Association.cpp +++ b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Association.cpp @@ -202,7 +202,6 @@ ACE_SOCK_SEQPACK_Association::get_local_addrs (ACE_INET_Addr *addrs, size_t &siz return 0; } - int ACE_SOCK_SEQPACK_Association::get_remote_addrs (ACE_INET_Addr *addrs, size_t &size) const { diff --git a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.cpp b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.cpp index 3b6adfd7755..63ba98d73f1 100644 --- a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.cpp +++ b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.cpp @@ -40,8 +40,6 @@ ACE_SOCK_SEQPACK_Connector::shared_open (ACE_SOCK_SEQPACK_Association &new_assoc { ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::shared_open"); - - // Only open a new socket if we don't already have a valid handle. if (new_association.get_handle () == ACE_INVALID_HANDLE && #if defined (ACE_HAS_LKSCTP) @@ -269,7 +267,6 @@ ACE_SOCK_SEQPACK_Connector::shared_connect_finish (ACE_SOCK_SEQPACK_Association // Actively connect and produce a new ACE_SOCK_SEQPACK_Association if things go well... - int ACE_SOCK_SEQPACK_Connector::connect (ACE_SOCK_SEQPACK_Association &new_association, const ACE_Addr &remote_sap, diff --git a/dep/ACE_wrappers/ace/SPIPE.h b/dep/ACE_wrappers/ace/SPIPE.h index a65ade1db15..d561a1575a5 100644 --- a/dep/ACE_wrappers/ace/SPIPE.h +++ b/dep/ACE_wrappers/ace/SPIPE.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_SPIPE_H #define ACE_SPIPE_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/SPIPE_Acceptor.h b/dep/ACE_wrappers/ace/SPIPE_Acceptor.h index bf3b3bba461..44b049763d5 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Acceptor.h +++ b/dep/ACE_wrappers/ace/SPIPE_Acceptor.h @@ -11,7 +11,6 @@ */ //============================================================================= - #ifndef ACE_SPIPE_ACCEPTOR_H #define ACE_SPIPE_ACCEPTOR_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/SPIPE_Addr.cpp b/dep/ACE_wrappers/ace/SPIPE_Addr.cpp index 3f84da76cc4..390d2aa49bd 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Addr.cpp +++ b/dep/ACE_wrappers/ace/SPIPE_Addr.cpp @@ -42,7 +42,6 @@ ACE_SPIPE_Addr::get_addr (void) const return (void *) &this->SPIPE_addr_; } - // Do nothing constructor. ACE_SPIPE_Addr::ACE_SPIPE_Addr (void) diff --git a/dep/ACE_wrappers/ace/SPIPE_Addr.inl b/dep/ACE_wrappers/ace/SPIPE_Addr.inl index a20e0e86f7c..e84b2f0bb2e 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Addr.inl +++ b/dep/ACE_wrappers/ace/SPIPE_Addr.inl @@ -2,7 +2,6 @@ // // $Id: SPIPE_Addr.inl 80826 2008-03-04 14:51:23Z wotte $ - #include "ace/SString.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/SPIPE_Connector.cpp b/dep/ACE_wrappers/ace/SPIPE_Connector.cpp index db49ca6c937..ba41f7d500c 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Connector.cpp +++ b/dep/ACE_wrappers/ace/SPIPE_Connector.cpp @@ -76,7 +76,7 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io, absolute_time = ACE_OS::gettimeofday () + *timeout; // Loop until success or failure. - for (;;) + for (; ; ) { handle = ACE_OS::open (remote_sap.get_path_name(), flags, perms, sa); if (handle != ACE_INVALID_HANDLE) diff --git a/dep/ACE_wrappers/ace/SString.cpp b/dep/ACE_wrappers/ace/SString.cpp index 9548a4e6f38..d540d67fde6 100644 --- a/dep/ACE_wrappers/ace/SString.cpp +++ b/dep/ACE_wrappers/ace/SString.cpp @@ -19,12 +19,10 @@ #include "ace/SString.inl" #endif /* __ACE_INLINE__ */ - ACE_RCSID (ace, SString, "SString.cpp,v 4.61 2001/03/04 00:55:30 brunsch Exp") - // ************************************************************ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -448,7 +446,7 @@ ACE_Tokenizer::next (void) ACE_TCHAR *next_token; // Skip all leading delimiters. - for (;;) + for (; ; ) { // Check for end of string. if (buffer_[index_] == '\0') @@ -503,7 +501,7 @@ ACE_Tokenizer::next (void) } // Step through finding the next delimiter or EOS. - for (;;) + for (; ; ) { // Advance pointer. index_++; diff --git a/dep/ACE_wrappers/ace/SString.h b/dep/ACE_wrappers/ace/SString.h index b888521ba86..dc37be1d871 100644 --- a/dep/ACE_wrappers/ace/SString.h +++ b/dep/ACE_wrappers/ace/SString.h @@ -256,7 +256,6 @@ typedef ACE_WString ACE_TString; typedef ACE_CString ACE_TString; #endif /* ACE_USES_WCHAR */ - // ************************************************************ /** diff --git a/dep/ACE_wrappers/ace/SUN_Proactor.cpp b/dep/ACE_wrappers/ace/SUN_Proactor.cpp index 56f2431c86e..7ce76eb0472 100644 --- a/dep/ACE_wrappers/ace/SUN_Proactor.cpp +++ b/dep/ACE_wrappers/ace/SUN_Proactor.cpp @@ -8,12 +8,10 @@ #include "ace/Log_Msg.h" #include "ace/Object_Manager.h" - ACE_RCSID (ace, POSIX_CB_Proactor, "$Id: SUN_Proactor.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_SUN_Proactor::ACE_SUN_Proactor (size_t max_aio_operations) diff --git a/dep/ACE_wrappers/ace/SV_Message.h b/dep/ACE_wrappers/ace/SV_Message.h index cb428f12a3d..26a0d45c975 100644 --- a/dep/ACE_wrappers/ace/SV_Message.h +++ b/dep/ACE_wrappers/ace/SV_Message.h @@ -10,7 +10,6 @@ */ //========================================================================== - #ifndef ACE_SV_MESSAGE_H #define ACE_SV_MESSAGE_H @@ -57,7 +56,6 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "ace/SV_Message.inl" #endif /* __ACE_INLINE__ */ diff --git a/dep/ACE_wrappers/ace/Sample_History.cpp b/dep/ACE_wrappers/ace/Sample_History.cpp index 86a8f449fa2..b3bf7d36a92 100644 --- a/dep/ACE_wrappers/ace/Sample_History.cpp +++ b/dep/ACE_wrappers/ace/Sample_History.cpp @@ -12,7 +12,6 @@ ACE_RCSID(ace, Sample_History, "$Id: Sample_History.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Sample_History::ACE_Sample_History (size_t max_samples) diff --git a/dep/ACE_wrappers/ace/Sample_History.h b/dep/ACE_wrappers/ace/Sample_History.h index fe7dd0aa14e..9e4d39b6a27 100644 --- a/dep/ACE_wrappers/ace/Sample_History.h +++ b/dep/ACE_wrappers/ace/Sample_History.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_SAMPLE_HISTORY_H #define ACE_SAMPLE_HISTORY_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Sbrk_Memory_Pool.h b/dep/ACE_wrappers/ace/Sbrk_Memory_Pool.h index 05fdcdadb30..0eace0f3fe3 100644 --- a/dep/ACE_wrappers/ace/Sbrk_Memory_Pool.h +++ b/dep/ACE_wrappers/ace/Sbrk_Memory_Pool.h @@ -27,7 +27,6 @@ #include "ace/ACE.h" #include "ace/os_include/sys/os_mman.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** diff --git a/dep/ACE_wrappers/ace/Sched_Params.cpp b/dep/ACE_wrappers/ace/Sched_Params.cpp index 34000a91cbc..b6e84f7ca67 100644 --- a/dep/ACE_wrappers/ace/Sched_Params.cpp +++ b/dep/ACE_wrappers/ace/Sched_Params.cpp @@ -9,7 +9,6 @@ */ //============================================================================= - #include "ace/Sched_Params.h" #if !defined (__ACE_INLINE__) diff --git a/dep/ACE_wrappers/ace/Sched_Params.inl b/dep/ACE_wrappers/ace/Sched_Params.inl index 73803ac1785..ef4416e30ec 100644 --- a/dep/ACE_wrappers/ace/Sched_Params.inl +++ b/dep/ACE_wrappers/ace/Sched_Params.inl @@ -10,7 +10,6 @@ */ //============================================================================= - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE diff --git a/dep/ACE_wrappers/ace/Select_Reactor_Base.cpp b/dep/ACE_wrappers/ace/Select_Reactor_Base.cpp index ecd5d4bd746..d4bc11b6ef8 100644 --- a/dep/ACE_wrappers/ace/Select_Reactor_Base.cpp +++ b/dep/ACE_wrappers/ace/Select_Reactor_Base.cpp @@ -22,7 +22,6 @@ ACE_RCSID (ace, Select_Reactor_Base, "$Id: Select_Reactor_Base.cpp 81153 2008-03-29 08:17:58Z johnnyw $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL template<typename iterator> @@ -749,7 +748,6 @@ ACE_Select_Reactor_Notify::dispatch_notifications (int &number_of_active_handles return 0; } - ACE_HANDLE ACE_Select_Reactor_Notify::notify_handle (void) { @@ -758,7 +756,6 @@ ACE_Select_Reactor_Notify::notify_handle (void) return this->notification_pipe_.read_handle (); } - int ACE_Select_Reactor_Notify::is_dispatchable (ACE_Notification_Buffer &buffer) { @@ -893,7 +890,6 @@ ACE_Select_Reactor_Notify::read_notify_pipe (ACE_HANDLE handle, return -1; } - return 1; } @@ -904,7 +900,6 @@ ACE_Select_Reactor_Notify::read_notify_pipe (ACE_HANDLE handle, return 0; } - int ACE_Select_Reactor_Notify::handle_input (ACE_HANDLE handle) { @@ -955,7 +950,6 @@ ACE_Select_Reactor_Impl::purge_pending_notifications (ACE_Event_Handler *eh, return this->notify_handler_->purge_pending_notifications (eh, mask); } - // Perform GET, CLR, SET, and ADD operations on the Handle_Sets. // // GET = 1, Retrieve current value @@ -1103,7 +1097,6 @@ ACE_Select_Reactor_Impl::clear_dispatch_mask (ACE_HANDLE handle, this->state_changed_ = true; } - int ACE_Select_Reactor_Impl::resumable_handler (void) { diff --git a/dep/ACE_wrappers/ace/Service_Config.cpp b/dep/ACE_wrappers/ace/Service_Config.cpp index 6a1cd533e98..80c235314f3 100644 --- a/dep/ACE_wrappers/ace/Service_Config.cpp +++ b/dep/ACE_wrappers/ace/Service_Config.cpp @@ -103,7 +103,6 @@ ACE_Threading_Helper<ACE_Null_Mutex>::get (void) typedef ACE_Unmanaged_Singleton<ACE_Service_Config, ACE_SYNCH_RECURSIVE_MUTEX> ACE_SERVICE_CONFIG_SINGLETON; - /// ctor ACE_Service_Config_Guard::ACE_Service_Config_Guard (ACE_Service_Gestalt * psg) : saved_ (ACE_Service_Config::current ()) @@ -136,7 +135,6 @@ ACE_Service_Config_Guard::~ACE_Service_Config_Guard (void) this->saved_->repo_)); } - ACE_ALLOC_HOOK_DEFINE (ACE_Service_Config) // Set the signal handler to point to the handle_signal() function. @@ -231,7 +229,6 @@ ACE_Service_Config::parse_args_i (int argc, ACE_TCHAR *argv[]) } /* parse_args_i () */ - int ACE_Service_Config::open_i (const ACE_TCHAR program_name[], const ACE_TCHAR *logger_key, @@ -344,7 +341,6 @@ ACE_Service_Config::insert (ACE_Static_Svc_Descriptor* stsd) return ACE_Service_Config::instance ()->insert (stsd); } - // Totally remove <svc_name> from the daemon by removing it from the // ACE_Reactor, and unlinking it if necessary. int @@ -377,7 +373,6 @@ ACE_Service_Config::resume (const ACE_TCHAR svc_name[]) return ACE_Service_Repository::instance ()->resume (svc_name); } - ACE_Service_Config::ACE_Service_Config (bool ignore_static_svcs, size_t size, int signum) @@ -459,8 +454,6 @@ ACE_Service_Config::current (ACE_Service_Gestalt* newcurrent) ACE_Service_Config::singleton()->threadkey_.set (newcurrent); } - - #if (ACE_USES_CLASSIC_SVC_CONF == 0) ACE_Service_Type * ACE_Service_Config::create_service_type (const ACE_TCHAR *n, @@ -517,7 +510,6 @@ ACE_Service_Config::create_service_type_impl (const ACE_TCHAR *name, } - // Signal handling API to trigger dynamic reconfiguration. void ACE_Service_Config::handle_signal (int sig, @@ -573,7 +565,6 @@ ACE_Service_Config::close (void) return 0; } - int ACE_Service_Config::fini_svcs (void) { diff --git a/dep/ACE_wrappers/ace/Service_Config.h b/dep/ACE_wrappers/ace/Service_Config.h index 6b7241e46ae..9fba207fea5 100644 --- a/dep/ACE_wrappers/ace/Service_Config.h +++ b/dep/ACE_wrappers/ace/Service_Config.h @@ -134,7 +134,6 @@ public: bool operator!= (ACE_Static_Svc_Descriptor &) const; }; - /** * @class ACE_Threading_Helper * @@ -435,7 +434,6 @@ private: // instances (called gestalts). The interfaces, however were retained in for // the sake of maintaining source-code compatibility. - // = Accessors and mutators for process-wide Singletons. /// Returns a pointer to the list of statically linked services. @@ -591,7 +589,6 @@ protected: static int process_directives_i (ACE_Svc_Conf_Param *param); #endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */ - // = Process-wide state. private: @@ -672,7 +669,6 @@ private: ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> saved_; }; - ACE_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) diff --git a/dep/ACE_wrappers/ace/Service_Config.inl b/dep/ACE_wrappers/ace/Service_Config.inl index a03e7124eb1..acb38e27a7f 100644 --- a/dep/ACE_wrappers/ace/Service_Config.inl +++ b/dep/ACE_wrappers/ace/Service_Config.inl @@ -30,7 +30,6 @@ ACE_Service_Config::open (const ACE_TCHAR program_name[], ignore_debug_flag); } - ACE_INLINE int ACE_Service_Config::open (int argc, ACE_TCHAR *argv[], @@ -165,7 +164,6 @@ ACE_Service_Config::process_directive (const ACE_Static_Svc_Descriptor &ssd, return ACE_Service_Config::current ()->process_directive (ssd, force_replace); } - #if defined (ACE_HAS_WINCE) && defined (ACE_USES_WCHAR) // We must provide these function to bridge Svc_Conf parser with ACE. diff --git a/dep/ACE_wrappers/ace/Service_Gestalt.cpp b/dep/ACE_wrappers/ace/Service_Gestalt.cpp index cf177525ab4..0f6f83c60af 100644 --- a/dep/ACE_wrappers/ace/Service_Gestalt.cpp +++ b/dep/ACE_wrappers/ace/Service_Gestalt.cpp @@ -72,7 +72,6 @@ ACE_Service_Type_Dynamic_Guard::ACE_Service_Type_Dynamic_Guard ACE_ASSERT (this->name_ != 0); // No name? } - /// Destructor ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void) @@ -130,8 +129,6 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void) } } - - // ---------------------------------------- ACE_Service_Gestalt::Processed_Static_Svc:: @@ -169,7 +166,6 @@ ACE_Service_Gestalt::intrusive_remove_ref (ACE_Service_Gestalt* g) } } - ACE_Service_Gestalt::~ACE_Service_Gestalt (void) { @@ -289,7 +285,6 @@ ACE_Service_Gestalt::init_i (void) return 0; } - // Add the default statically-linked services to the Service // Repository. @@ -315,8 +310,6 @@ ACE_Service_Gestalt::load_static_svcs (void) } /* load_static_svcs () */ - - /// Find a static service descriptor by name int @@ -364,8 +357,6 @@ ACE_Service_Gestalt::find_processed_static_svc (const ACE_TCHAR* name) return 0; } - - /// @brief Captures a list of the direcives processed (explicitely) for this /// Gestalt so that services can be replicated in other repositories /// upon their first initialization. @@ -420,7 +411,6 @@ ACE_Service_Gestalt::add_processed_static_svc assd->name_)); } - /// Queues a static service object descriptor which, during open() /// will be given to process_directive() to create the Service /// Object. Normally, only called from static initializers, prior to @@ -437,10 +427,8 @@ ACE_Service_Gestalt::insert (ACE_Static_Svc_Descriptor *stsd) return this->static_svcs_->insert (stsd); } - ACE_ALLOC_HOOK_DEFINE (ACE_Service_Gestalt) - void ACE_Service_Gestalt::dump (void) const { @@ -449,8 +437,6 @@ ACE_Service_Gestalt::dump (void) const #endif /* ACE_HAS_DUMP */ } - - /// int @@ -516,7 +502,6 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name, return 0; } - #if (ACE_USES_CLASSIC_SVC_CONF == 1) int ACE_Service_Gestalt::initialize (const ACE_Service_Type_Factory *stf, @@ -601,7 +586,6 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type_Factory *stf, } #endif /* (ACE_USES_CLASSIC_SVC_CONF == 1) */ - // Dynamically link the shared object file and retrieve a pointer to // the designated shared object in this file. // @note This is obsolete (and error-prone) in the presense of dynamic @@ -732,7 +716,6 @@ ACE_Service_Gestalt::resume (const ACE_TCHAR svc_name[]) return this->repo_->resume (svc_name); } - int ACE_Service_Gestalt::process_directive (const ACE_Static_Svc_Descriptor &ssd, bool force_replace) @@ -761,7 +744,6 @@ ACE_Service_Gestalt::process_directive_i (const ACE_Static_Svc_Descriptor &ssd, } } - ACE_Service_Object_Exterminator gobbler; void *sym = (ssd.alloc_)(&gobbler); @@ -993,7 +975,6 @@ ACE_Service_Gestalt::process_directive (const ACE_TCHAR directive[]) } /* process_directive () */ - int ACE_Service_Gestalt::init_svc_conf_file_queue (void) { @@ -1018,7 +999,6 @@ ACE_Service_Gestalt::init_svc_conf_file_queue (void) } /* init_svc_conf_file_queue () */ - int ACE_Service_Gestalt::open_i (const ACE_TCHAR /*program_name*/[], const ACE_TCHAR* /*logger_key*/, @@ -1079,7 +1059,6 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR /*program_name*/[], result = this->process_directives (ignore_default_svc_conf_file); } - // Reset debugging back to the way it was when we came into // into <open_i>. { @@ -1096,7 +1075,6 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR /*program_name*/[], return result; } /* open_i () */ - int ACE_Service_Gestalt::is_opened (void) { @@ -1132,7 +1110,6 @@ ACE_Service_Gestalt::process_commandline_directives (void) } /* process_commandline_directives () */ - int ACE_Service_Gestalt::parse_args (int argc, ACE_TCHAR *argv[]) { @@ -1210,8 +1187,6 @@ ACE_Service_Gestalt::parse_args_i (int argc, return 0; } /* parse_args_i () */ - - // Process service configuration directives from the files queued for // processing int @@ -1285,7 +1260,6 @@ ACE_Service_Gestalt::close (void) return 0; } /* close () */ - ACE_END_VERSIONED_NAMESPACE_DECL #if !defined (__ACE_INLINE__) diff --git a/dep/ACE_wrappers/ace/Service_Gestalt.h b/dep/ACE_wrappers/ace/Service_Gestalt.h index 2be4de5ba02..5ccfd940f5d 100644 --- a/dep/ACE_wrappers/ace/Service_Gestalt.h +++ b/dep/ACE_wrappers/ace/Service_Gestalt.h @@ -245,7 +245,6 @@ public: /// down. This method calls <close_svcs>. Returns 0. int close (void); - // Registers a service descriptor for a static service object int insert (ACE_Static_Svc_Descriptor *stsd); @@ -456,7 +455,6 @@ protected: }; /* class ACE_Service_Gestalt */ - /** * @class ACE_Service_Type_Dynamic_Guard * @@ -491,20 +489,17 @@ private: size_t repo_begin_; ACE_TCHAR const * const name_; - # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) ACE_Guard< ACE_Recursive_Thread_Mutex > repo_monitor_; #endif }; - ACE_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "ace/Service_Gestalt.inl" #endif /* __ACE_INLINE__ */ - #include /**/ "ace/post.h" #endif /* ACE_SERVICE_GESTALT_H */ diff --git a/dep/ACE_wrappers/ace/Service_Gestalt.inl b/dep/ACE_wrappers/ace/Service_Gestalt.inl index d7de81361ec..6a87d6794a9 100644 --- a/dep/ACE_wrappers/ace/Service_Gestalt.inl +++ b/dep/ACE_wrappers/ace/Service_Gestalt.inl @@ -2,10 +2,8 @@ // // $Id: Service_Gestalt.inl 81388 2008-04-23 14:02:05Z johnnyw $ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL - // This is the primary entry point into the ACE_Service_Config (the // constructor just handles simple initializations). diff --git a/dep/ACE_wrappers/ace/Service_Object.cpp b/dep/ACE_wrappers/ace/Service_Object.cpp index f737d6a3136..a9656719343 100644 --- a/dep/ACE_wrappers/ace/Service_Object.cpp +++ b/dep/ACE_wrappers/ace/Service_Object.cpp @@ -33,7 +33,6 @@ ACE_Service_Type::dump (void) const ACE_TRACE ("ACE_Service_Type::dump"); #endif /* ACE_HAS_DUMP */ - // Using printf, since the log facility may not have been // initialized yet. Using a "//" prefix, in case the executable // happens to be a code generator and the output gets embedded in diff --git a/dep/ACE_wrappers/ace/Service_Repository.cpp b/dep/ACE_wrappers/ace/Service_Repository.cpp index d7d673ae756..2c181d49555 100644 --- a/dep/ACE_wrappers/ace/Service_Repository.cpp +++ b/dep/ACE_wrappers/ace/Service_Repository.cpp @@ -296,7 +296,6 @@ ACE_Service_Repository::find_i (const ACE_TCHAR name[], return -1; } - /// @brief Relocate (a static) service to another DLL. /// /// Works by having the service type keep a reference to a specific @@ -376,7 +375,6 @@ ACE_Service_Repository::find (const ACE_TCHAR name[], return this->find_i (name, ignore_location, srp, ignore_suspended); } - // Insert the ACE_Service_Type SR into the repository. Note that // services may be inserted either resumed or suspended. Using same // name as in an existing service causes the delete () to be called @@ -493,7 +491,6 @@ ACE_Service_Repository::suspend (const ACE_TCHAR name[], return this->service_vector_[i]->suspend (); } - /** * @brief Completely remove a <name> entry from the Repository and * dynamically unlink it if it was originally dynamically linked. @@ -576,7 +573,6 @@ ACE_Service_Repository_Iterator::dump (void) const #endif /* ACE_HAS_DUMP */ } - // Initializes the iterator and skips over any suspended entries at // the beginning of the table, if necessary. Note, you must not // perform destructive operations on elements during this iteration... diff --git a/dep/ACE_wrappers/ace/Service_Repository.h b/dep/ACE_wrappers/ace/Service_Repository.h index 77b4955683c..99bca07e8fb 100644 --- a/dep/ACE_wrappers/ace/Service_Repository.h +++ b/dep/ACE_wrappers/ace/Service_Repository.h @@ -232,7 +232,6 @@ public: /// Destructor. ~ACE_Service_Repository_Iterator (void); - public: // = Iteration methods. diff --git a/dep/ACE_wrappers/ace/Service_Templates.h b/dep/ACE_wrappers/ace/Service_Templates.h index 34ab6a10eda..9262a51ffc8 100644 --- a/dep/ACE_wrappers/ace/Service_Templates.h +++ b/dep/ACE_wrappers/ace/Service_Templates.h @@ -9,7 +9,6 @@ */ //============================================================================= - #ifndef ACE_SERVICE_TEMPLATES_H #define ACE_SERVICE_TEMPLATES_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Service_Types.cpp b/dep/ACE_wrappers/ace/Service_Types.cpp index 5eb8765337e..a27a869e4b7 100644 --- a/dep/ACE_wrappers/ace/Service_Types.cpp +++ b/dep/ACE_wrappers/ace/Service_Types.cpp @@ -11,7 +11,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" - ACE_RCSID (ace, Service_Types, "$Id: Service_Types.cpp 81826 2008-06-02 15:29:53Z schmidt $") diff --git a/dep/ACE_wrappers/ace/Shared_Memory.h b/dep/ACE_wrappers/ace/Shared_Memory.h index cda765b4d4d..af2060d5b1d 100644 --- a/dep/ACE_wrappers/ace/Shared_Memory.h +++ b/dep/ACE_wrappers/ace/Shared_Memory.h @@ -10,7 +10,6 @@ */ //========================================================================== - #ifndef ACE_SHARED_MEMORY_H #define ACE_SHARED_MEMORY_H diff --git a/dep/ACE_wrappers/ace/Shared_Memory_MM.cpp b/dep/ACE_wrappers/ace/Shared_Memory_MM.cpp index 25ece407bc5..12cbb4415b2 100644 --- a/dep/ACE_wrappers/ace/Shared_Memory_MM.cpp +++ b/dep/ACE_wrappers/ace/Shared_Memory_MM.cpp @@ -6,7 +6,6 @@ #include "ace/Shared_Memory_MM.inl" #endif /* __ACE_INLINE__ */ - ACE_RCSID (ace, Shared_Memory_MM, "$Id: Shared_Memory_MM.cpp 80826 2008-03-04 14:51:23Z wotte $") diff --git a/dep/ACE_wrappers/ace/Shared_Memory_MM.h b/dep/ACE_wrappers/ace/Shared_Memory_MM.h index 27dda8eff57..2a2d92afed5 100644 --- a/dep/ACE_wrappers/ace/Shared_Memory_MM.h +++ b/dep/ACE_wrappers/ace/Shared_Memory_MM.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_SHARED_MALLOC_MM_H #define ACE_SHARED_MALLOC_MM_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Shared_Memory_SV.cpp b/dep/ACE_wrappers/ace/Shared_Memory_SV.cpp index 9cad5d247e2..81e80bca6a0 100644 --- a/dep/ACE_wrappers/ace/Shared_Memory_SV.cpp +++ b/dep/ACE_wrappers/ace/Shared_Memory_SV.cpp @@ -6,12 +6,10 @@ #include "ace/Shared_Memory_SV.inl" #endif /* __ACE_INLINE__ */ - ACE_RCSID (ace, Shared_Memory_SV, "$Id: Shared_Memory_SV.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Shared_Memory_SV) diff --git a/dep/ACE_wrappers/ace/Shared_Memory_SV.h b/dep/ACE_wrappers/ace/Shared_Memory_SV.h index ff0268cfda8..2da27742f05 100644 --- a/dep/ACE_wrappers/ace/Shared_Memory_SV.h +++ b/dep/ACE_wrappers/ace/Shared_Memory_SV.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_SHARED_MALLOC_SV_H #define ACE_SHARED_MALLOC_SV_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Sig_Adapter.cpp b/dep/ACE_wrappers/ace/Sig_Adapter.cpp index 78683d1c911..e53f12d5d5d 100644 --- a/dep/ACE_wrappers/ace/Sig_Adapter.cpp +++ b/dep/ACE_wrappers/ace/Sig_Adapter.cpp @@ -4,7 +4,6 @@ ACE_RCSID(ace, Sig_Adapter, "$Id: Sig_Adapter.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_Sig_Adapter::ACE_Sig_Adapter (ACE_Sig_Action &sa, int sigkey) : sigkey_ (sigkey), type_ (SIG_ACTION), diff --git a/dep/ACE_wrappers/ace/Sig_Handler.cpp b/dep/ACE_wrappers/ace/Sig_Handler.cpp index 2829edcef94..40dd996f3dc 100644 --- a/dep/ACE_wrappers/ace/Sig_Handler.cpp +++ b/dep/ACE_wrappers/ace/Sig_Handler.cpp @@ -40,7 +40,6 @@ ace_sig_handlers_dispatch (int signum, siginfo_t *info, ucontext_t *context) #define ace_signal_handlers_dispatcher ACE_SignalHandler(ACE_Sig_Handlers::dispatch) #endif /* ACE_HAS_SIG_C_FUNC */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Array of Event_Handlers that will handle the signals. @@ -49,7 +48,6 @@ ACE_Event_Handler *ACE_Sig_Handler::signal_handlers_[ACE_NSIG]; // Remembers if a signal has occurred. sig_atomic_t ACE_Sig_Handler::sig_pending_ = 0; - ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Handler) ACE_Sig_Handler::~ACE_Sig_Handler (void) diff --git a/dep/ACE_wrappers/ace/Signal.cpp b/dep/ACE_wrappers/ace/Signal.cpp index 8c9647ca55f..014a6e0234a 100644 --- a/dep/ACE_wrappers/ace/Signal.cpp +++ b/dep/ACE_wrappers/ace/Signal.cpp @@ -9,7 +9,6 @@ ACE_RCSID(ace, Signal, "$Id: Signal.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Action) diff --git a/dep/ACE_wrappers/ace/Signal.h b/dep/ACE_wrappers/ace/Signal.h index 7af918cc6e4..ae679ed7ae6 100644 --- a/dep/ACE_wrappers/ace/Signal.h +++ b/dep/ACE_wrappers/ace/Signal.h @@ -136,7 +136,6 @@ public: const ACE_Sig_Set &sigmask, int flags = 0); - // @@ The next two methods have a parameter as "signalss". Please do // not change the argument name as "signals". This causes the // following problem as reported by diff --git a/dep/ACE_wrappers/ace/Sock_Connect.cpp b/dep/ACE_wrappers/ace/Sock_Connect.cpp index a6b2359c95c..2f3c30d2709 100644 --- a/dep/ACE_wrappers/ace/Sock_Connect.cpp +++ b/dep/ACE_wrappers/ace/Sock_Connect.cpp @@ -157,12 +157,10 @@ namespace static ACE_Auto_Array_Ptr<sockaddr> force_compiler_to_include_socket_h; #endif /* AIX && __IBMCPP__ >= 500 */ - ACE_RCSID (ace, Sock_Connect, "$Id: Sock_Connect.cpp 82276 2008-07-09 17:35:49Z jtc $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Bind socket to an unused port. @@ -668,7 +666,6 @@ get_ip_interfaces_win32 (size_t &count, return 0; - # else // All non-CE, non-Pharlap Windows. Must support Winsock2. @@ -1093,7 +1090,7 @@ get_ip_interfaces_aix (size_t &count, } ACE_NEW_RETURN (addrs,ACE_INET_Addr[num_ifs], -1); - for (char * ptr = buf_start; ptr < buf_end; ) + for (char * ptr = buf_start; ptr < buf_end; ) { struct ifreq *req = reinterpret_cast<struct ifreq *>(ptr); // skip the interface name @@ -1172,7 +1169,6 @@ get_ip_interfaces_vxworks_lt600 (size_t &count, } #endif // ACE_WIN32 || ACE_HAS_GETIFADDRS || __hpux || _AIX || ACE_VXWORKS < 0x600 - // return an array of all configured IP interfaces on this host, count // rc = 0 on success (count == number of interfaces else -1 caller is // responsible for calling delete [] on parray @@ -1545,7 +1541,6 @@ ACE::get_handle (void) return handle; } - #if defined (ACE_HAS_IPV6) static int ip_check (int &ipvn_enabled, int pf) diff --git a/dep/ACE_wrappers/ace/Stack_Trace.cpp b/dep/ACE_wrappers/ace/Stack_Trace.cpp index 1654e599336..e8a94a70db6 100644 --- a/dep/ACE_wrappers/ace/Stack_Trace.cpp +++ b/dep/ACE_wrappers/ace/Stack_Trace.cpp @@ -177,7 +177,6 @@ ACE_Stack_Trace::generate_trace (ssize_t starting_frame_offset, trcStack (®s, (FUNCPTR)ACE_Stack_Trace_Add_Frame_To_Buf, taskIdSelf ()); } - #elif defined(VXWORKS) && defined(__RTP__) # include <setjmp.h> # include <taskLib.h> @@ -493,7 +492,6 @@ typedef struct _dbghelp_functions SymCleanup_t SymCleanup; } dbghelp_functions; - # pragma warning (push) # pragma warning (disable:4706) static bool load_dbghelp_library_if_needed (dbghelp_functions *pDbg) @@ -519,7 +517,6 @@ static bool load_dbghelp_library_if_needed (dbghelp_functions *pDbg) } # pragma warning (pop) - struct frame_state { STACKFRAME64 sf; PSYMBOL_INFO pSym; diff --git a/dep/ACE_wrappers/ace/Stats.cpp b/dep/ACE_wrappers/ace/Stats.cpp index eac726e52df..44461327aba 100644 --- a/dep/ACE_wrappers/ace/Stats.cpp +++ b/dep/ACE_wrappers/ace/Stats.cpp @@ -197,7 +197,6 @@ ACE_Stats::std_dev (ACE_Stats_Value &std_dev, return 0; } - void ACE_Stats::reset (void) { diff --git a/dep/ACE_wrappers/ace/Stats.h b/dep/ACE_wrappers/ace/Stats.h index 1e60ef34dc1..3d1d2be7f69 100644 --- a/dep/ACE_wrappers/ace/Stats.h +++ b/dep/ACE_wrappers/ace/Stats.h @@ -10,7 +10,6 @@ */ //========================================================================== - #ifndef ACE_STATS_H #define ACE_STATS_H diff --git a/dep/ACE_wrappers/ace/Strategies.h b/dep/ACE_wrappers/ace/Strategies.h index 6ce48398f6e..0c31bc144c5 100644 --- a/dep/ACE_wrappers/ace/Strategies.h +++ b/dep/ACE_wrappers/ace/Strategies.h @@ -28,7 +28,6 @@ #include "ace/Recyclable.h" #include "ace/Refcountable.h" - #include /**/ "ace/post.h" #endif /*ACE_STRATEGIES_H*/ diff --git a/dep/ACE_wrappers/ace/Strategies_T.h b/dep/ACE_wrappers/ace/Strategies_T.h index 7bd0d6bb1a3..b962efc797f 100644 --- a/dep/ACE_wrappers/ace/Strategies_T.h +++ b/dep/ACE_wrappers/ace/Strategies_T.h @@ -853,7 +853,6 @@ public: typedef ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> CONNECT_STRATEGY; - typedef ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX> SELF; /// Constructor diff --git a/dep/ACE_wrappers/ace/String_Base.inl b/dep/ACE_wrappers/ace/String_Base.inl index 859bceb4a34..d0fa8ed7e64 100644 --- a/dep/ACE_wrappers/ace/String_Base.inl +++ b/dep/ACE_wrappers/ace/String_Base.inl @@ -111,7 +111,6 @@ ACE_String_Base<CHAR>::operator > (const ACE_String_Base &s) const return compare (s) > 0; } - // Comparison operator. template <class CHAR> ACE_INLINE bool diff --git a/dep/ACE_wrappers/ace/String_Base_Const.h b/dep/ACE_wrappers/ace/String_Base_Const.h index ac76e511289..434fc711370 100644 --- a/dep/ACE_wrappers/ace/String_Base_Const.h +++ b/dep/ACE_wrappers/ace/String_Base_Const.h @@ -22,7 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** diff --git a/dep/ACE_wrappers/ace/Svc_Conf.h b/dep/ACE_wrappers/ace/Svc_Conf.h index db10481a1f0..60ffd572156 100644 --- a/dep/ACE_wrappers/ace/Svc_Conf.h +++ b/dep/ACE_wrappers/ace/Svc_Conf.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_SVC_CONF_H #define ACE_SVC_CONF_H @@ -43,7 +42,6 @@ int ace_yyparse (); #endif #endif /* ! YYPARSE_PARAM */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if (ACE_USES_CLASSIC_SVC_CONF == 1) @@ -102,7 +100,6 @@ ace_create_service_type (ACE_TCHAR const *, unsigned int, ACE_Service_Object_Exterminator = 0); - ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/dep/ACE_wrappers/ace/Svc_Conf_Lexer.cpp b/dep/ACE_wrappers/ace/Svc_Conf_Lexer.cpp index b55af3b4439..48591364a54 100644 --- a/dep/ACE_wrappers/ace/Svc_Conf_Lexer.cpp +++ b/dep/ACE_wrappers/ace/Svc_Conf_Lexer.cpp @@ -430,7 +430,6 @@ ACE_Svc_Conf_Lexer::scan (YYSTYPE* ace_yylval, size - 1); str[size - 1] = '\0'; - if (ACE_OS::strcmp (str, "dynamic") == 0) { buffer->index_ = current; diff --git a/dep/ACE_wrappers/ace/Svc_Conf_Param.h b/dep/ACE_wrappers/ace/Svc_Conf_Param.h index a1c51844cec..3b96aae13b0 100644 --- a/dep/ACE_wrappers/ace/Svc_Conf_Param.h +++ b/dep/ACE_wrappers/ace/Svc_Conf_Param.h @@ -12,7 +12,6 @@ */ //============================================================================= - #ifndef ACE_SVC_CONF_PARAM_H #define ACE_SVC_CONF_PARAM_H @@ -126,7 +125,6 @@ public: ACE_Service_Gestalt *config; }; - // Parameter that is passed down to the yyparse() function, and // eventually to yylex(). #define YYPARSE_PARAM ace_svc_conf_parameter diff --git a/dep/ACE_wrappers/ace/Svc_Conf_Token_Table.h b/dep/ACE_wrappers/ace/Svc_Conf_Token_Table.h index 0ce301a6e15..701032097be 100644 --- a/dep/ACE_wrappers/ace/Svc_Conf_Token_Table.h +++ b/dep/ACE_wrappers/ace/Svc_Conf_Token_Table.h @@ -74,8 +74,6 @@ #define ACE_STRING 271 - - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef int YYSTYPE; # define ace_yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/dep/ACE_wrappers/ace/Svc_Conf_Tokens.h b/dep/ACE_wrappers/ace/Svc_Conf_Tokens.h index 56a5820f46d..6be5c1c592c 100644 --- a/dep/ACE_wrappers/ace/Svc_Conf_Tokens.h +++ b/dep/ACE_wrappers/ace/Svc_Conf_Tokens.h @@ -9,7 +9,6 @@ */ //==================================================================== - #ifndef BISON_SVC_CONF_TAB_H # define BISON_SVC_CONF_TAB_H diff --git a/dep/ACE_wrappers/ace/Svc_Conf_y.cpp b/dep/ACE_wrappers/ace/Svc_Conf_y.cpp index 52b2bcbb2aa..df6de636cb6 100644 --- a/dep/ACE_wrappers/ace/Svc_Conf_y.cpp +++ b/dep/ACE_wrappers/ace/Svc_Conf_y.cpp @@ -58,8 +58,6 @@ /* Using locations. */ #define YYLSP_NEEDED 0 - - /* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE @@ -99,11 +97,8 @@ #define ACE_STRING 271 - - /* Copy the first part of user declarations. */ - // $Id: Svc_Conf_y.cpp 82137 2008-06-23 15:30:20Z sma $ #include "ace/Svc_Conf.h" @@ -152,8 +147,6 @@ static ACE_Module_Type * ACE_END_VERSIONED_NAMESPACE_DECL - - /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -179,14 +172,10 @@ typedef int YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 #endif - - /* Copy the second part of user declarations. */ - /* Line 216 of yacc.c. */ - #ifdef short # undef short #endif @@ -340,7 +329,6 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif #endif /* ! defined ace_yyoverflow || YYERROR_VERBOSE */ - #if (! defined ace_yyoverflow \ && (! defined __cplusplus \ || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) @@ -632,7 +620,6 @@ static const ace_yytype_uint8 ace_yystos[] = #define YYABORT goto ace_yyabortlab #define YYERROR goto ace_yyerrorlab - /* Like YYERROR except do call ace_yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. Once GCC version 2 has supplanted version 1, this can go. */ @@ -658,11 +645,9 @@ do \ } \ while (YYID (0)) - #define YYTERROR 1 #define YYERRCODE 256 - /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. If N is 0, then set CURRENT to the empty location which ends the previous symbol: RHS[0] (always defined). */ @@ -688,7 +673,6 @@ while (YYID (0)) while (YYID (0)) #endif - /* YY_LOCATION_PRINT -- Print the location on the stream. This macro was not mandated originally: define only if we know we won't break user code: when these are the locations we know. */ @@ -704,7 +688,6 @@ while (YYID (0)) # endif #endif - /* YYLEX -- calling `ace_yylex' with the right arguments. */ #ifdef YYLEX_PARAM @@ -738,7 +721,6 @@ do { \ } \ } while (YYID (0)) - /*--------------------------------. | Print this symbol on YYOUTPUT. | `--------------------------------*/ @@ -771,7 +753,6 @@ ace_yy_symbol_value_print (ace_yyoutput, ace_yytype, ace_yyvaluep) } } - /*--------------------------------. | Print this symbol on YYOUTPUT. | `--------------------------------*/ @@ -825,7 +806,6 @@ do { \ ace_yy_stack_print ((Bottom), (Top)); \ } while (YYID (0)) - /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ @@ -873,7 +853,6 @@ int ace_yydebug; # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ - /* YYINITDEPTH -- initial size of the parser's stacks. */ #ifndef YYINITDEPTH # define YYINITDEPTH 200 @@ -890,8 +869,6 @@ int ace_yydebug; # define YYMAXDEPTH 10000 #endif - - #if YYERROR_VERBOSE # ifndef ace_yystrlen @@ -961,7 +938,7 @@ ace_yytnamerr (char *ace_yyres, const char *ace_yystr) YYSIZE_T ace_yyn = 0; char const *ace_yyp = ace_yystr; - for (;;) + for (; ; ) switch (*++ace_yyp) { case '\'': @@ -1102,7 +1079,6 @@ ace_yysyntax_error (char *ace_yyresult, int ace_yystate, int ace_yychar) } #endif /* YYERROR_VERBOSE */ - /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ @@ -1134,7 +1110,6 @@ ace_yydestruct (ace_yymsg, ace_yytype, ace_yyvaluep) } } - /* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM @@ -1153,9 +1128,6 @@ int ace_yyparse (); - - - /*----------. | ace_yyparse. | `----------*/ @@ -1223,8 +1195,6 @@ int ace_yynerrs; YYSTYPE *ace_yyvs = ace_yyvsa; YYSTYPE *ace_yyvsp; - - #define YYPOPSTACK(N) (ace_yyvsp -= (N), ace_yyssp -= (N)) YYSIZE_T ace_yystacksize = YYINITDEPTH; @@ -1233,7 +1203,6 @@ int ace_yynerrs; action routines. */ YYSTYPE ace_yyval; - /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int ace_yylen = 0; @@ -1279,7 +1248,6 @@ int ace_yynerrs; YYSTYPE *ace_yyvs1 = ace_yyvs; ace_yytype_int16 *ace_yyss1 = ace_yyss; - /* Each stack pointer address is followed by the size of the data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might @@ -1323,7 +1291,6 @@ int ace_yynerrs; ace_yyssp = ace_yyss + ace_yysize - 1; ace_yyvsp = ace_yyvs + ace_yysize - 1; - YYDPRINTF ((stderr, "Stack size increased to %lu\n", (unsigned long int) ace_yystacksize)); @@ -1402,7 +1369,6 @@ ace_yybackup: goto ace_yynewstate; - /*-----------------------------------------------------------. | ace_yydefault -- do the default action for the current state. | `-----------------------------------------------------------*/ @@ -1412,7 +1378,6 @@ ace_yydefault: goto ace_yyerrlab; goto ace_yyreduce; - /*-----------------------------. | ace_yyreduce -- Do a reduction. | `-----------------------------*/ @@ -1430,7 +1395,6 @@ ace_yyreduce: GCC warning that YYVAL may be used uninitialized. */ ace_yyval = ace_yyvsp[1-ace_yylen]; - YY_REDUCE_PRINT (ace_yyn); switch (ace_yyn) { @@ -1703,7 +1667,6 @@ ace_yyreduce: { (ace_yyval.ident_) = 0; ;} break; - /* Line 1267 of yacc.c. */ default: break; @@ -1716,7 +1679,6 @@ ace_yyreduce: *++ace_yyvsp = ace_yyval; - /* Now `shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -1731,7 +1693,6 @@ ace_yyreduce: goto ace_yynewstate; - /*------------------------------------. | ace_yyerrlab -- here on detecting error | `------------------------------------*/ @@ -1777,8 +1738,6 @@ ace_yyerrlab: #endif } - - if (ace_yyerrstatus == 3) { /* If just tried and failed to reuse look-ahead token after an @@ -1802,7 +1761,6 @@ ace_yyerrlab: token. */ goto ace_yyerrlab1; - /*---------------------------------------------------. | ace_yyerrorlab -- error raised explicitly by YYERROR. | `---------------------------------------------------*/ @@ -1822,14 +1780,13 @@ ace_yyerrorlab: ace_yystate = *ace_yyssp; goto ace_yyerrlab1; - /*-------------------------------------------------------------. | ace_yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ ace_yyerrlab1: ace_yyerrstatus = 3; /* Each real token shifted decrements this. */ - for (;;) + for (; ; ) { ace_yyn = ace_yypact[ace_yystate]; if (ace_yyn != YYPACT_NINF) @@ -1847,7 +1804,6 @@ ace_yyerrlab1: if (ace_yyssp == ace_yyss) YYABORT; - ace_yydestruct ("Error: popping", ace_yystos[ace_yystate], ace_yyvsp); YYPOPSTACK (1); @@ -1860,14 +1816,12 @@ ace_yyerrlab1: *++ace_yyvsp = ace_yylval; - /* Shift the error token. */ YY_SYMBOL_PRINT ("Shifting", ace_yystos[ace_yyn], ace_yyvsp, ace_yylsp); ace_yystate = ace_yyn; goto ace_yynewstate; - /*-------------------------------------. | ace_yyacceptlab -- YYACCEPT comes here. | `-------------------------------------*/ @@ -1919,9 +1873,6 @@ ace_yyreturn: } - - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Prints the error string to standard output. Cleans up the error diff --git a/dep/ACE_wrappers/ace/TLI.h b/dep/ACE_wrappers/ace/TLI.h index 0beab16a1f8..643b56418e9 100644 --- a/dep/ACE_wrappers/ace/TLI.h +++ b/dep/ACE_wrappers/ace/TLI.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_TLI_H #define ACE_TLI_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/TLI.inl b/dep/ACE_wrappers/ace/TLI.inl index 001d8c65292..a8375130a8e 100644 --- a/dep/ACE_wrappers/ace/TLI.inl +++ b/dep/ACE_wrappers/ace/TLI.inl @@ -4,7 +4,6 @@ #include "ace/TLI.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE diff --git a/dep/ACE_wrappers/ace/TLI_Acceptor.h b/dep/ACE_wrappers/ace/TLI_Acceptor.h index d6851aa0f01..87f73bb92ef 100644 --- a/dep/ACE_wrappers/ace/TLI_Acceptor.h +++ b/dep/ACE_wrappers/ace/TLI_Acceptor.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_TLI_ACCEPTOR_H #define ACE_TLI_ACCEPTOR_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/TLI_Connector.h b/dep/ACE_wrappers/ace/TLI_Connector.h index 538cba1c699..537ea879959 100644 --- a/dep/ACE_wrappers/ace/TLI_Connector.h +++ b/dep/ACE_wrappers/ace/TLI_Connector.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_TLI_CONNECTOR_H #define ACE_TLI_CONNECTOR_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/TLI_Stream.h b/dep/ACE_wrappers/ace/TLI_Stream.h index 96f21de7e4c..62fa9eb7311 100644 --- a/dep/ACE_wrappers/ace/TLI_Stream.h +++ b/dep/ACE_wrappers/ace/TLI_Stream.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_TLI_STREAM_H #define ACE_TLI_STREAM_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/TP_Reactor.cpp b/dep/ACE_wrappers/ace/TP_Reactor.cpp index ffe47704953..64c61607a71 100644 --- a/dep/ACE_wrappers/ace/TP_Reactor.cpp +++ b/dep/ACE_wrappers/ace/TP_Reactor.cpp @@ -97,7 +97,6 @@ ACE_TP_Token_Guard::acquire_token (ACE_Time_Value *max_wait_time) return result; } - ACE_TP_Reactor::ACE_TP_Reactor (ACE_Sig_Handler *sh, ACE_Timer_Queue *tq, bool mask_signals, @@ -252,7 +251,6 @@ ACE_TP_Reactor::dispatch_i (ACE_Time_Value *max_wait_time, return result; } - #if 0 // @Ciju // signal handling isn't in a production state yet. @@ -302,7 +300,6 @@ endif } #endif // #if 0 - int ACE_TP_Reactor::handle_timer_events (int & /*event_count*/, ACE_TP_Token_Guard &guard) @@ -415,7 +412,6 @@ ACE_TP_Reactor::handle_socket_events (int &event_count, dispatch_info.mask_); } - return 0; } diff --git a/dep/ACE_wrappers/ace/TP_Reactor.h b/dep/ACE_wrappers/ace/TP_Reactor.h index 1d8a3f05a1e..5e4a07f3e1c 100644 --- a/dep/ACE_wrappers/ace/TP_Reactor.h +++ b/dep/ACE_wrappers/ace/TP_Reactor.h @@ -25,7 +25,6 @@ */ //============================================================================= - #ifndef ACE_TP_REACTOR_H #define ACE_TP_REACTOR_H @@ -73,7 +72,6 @@ private: ACE_EH_Dispatch_Info &operator= (const ACE_EH_Dispatch_Info &); }; - /** * @class ACE_TP_Token_Guard * diff --git a/dep/ACE_wrappers/ace/TP_Reactor.inl b/dep/ACE_wrappers/ace/TP_Reactor.inl index 2b14a8c9b96..1a3f76deb23 100644 --- a/dep/ACE_wrappers/ace/TP_Reactor.inl +++ b/dep/ACE_wrappers/ace/TP_Reactor.inl @@ -89,7 +89,6 @@ ACE_TP_Token_Guard::is_owner (void) return this->owner_; } - /************************************************************************/ // Methods for ACE_TP_Reactor /************************************************************************/ diff --git a/dep/ACE_wrappers/ace/TSS_T.inl b/dep/ACE_wrappers/ace/TSS_T.inl index 9959a2edd94..571eab8f643 100644 --- a/dep/ACE_wrappers/ace/TSS_T.inl +++ b/dep/ACE_wrappers/ace/TSS_T.inl @@ -13,7 +13,7 @@ ACE_TSS<TYPE>::ACE_TSS (TYPE *type) } template <class TYPE> ACE_INLINE int -ACE_TSS<TYPE>::ts_init (void) +ACE_TSS<TYPE>::ts_init (void) { return 0; } diff --git a/dep/ACE_wrappers/ace/Task.cpp b/dep/ACE_wrappers/ace/Task.cpp index 3746b735811..2add2fb3508 100644 --- a/dep/ACE_wrappers/ace/Task.cpp +++ b/dep/ACE_wrappers/ace/Task.cpp @@ -7,7 +7,6 @@ #include "ace/Task.inl" #endif /* __ACE_INLINE__ */ - ACE_RCSID (ace, Task, "$Id: Task.cpp 80826 2008-03-04 14:51:23Z wotte $") @@ -245,7 +244,6 @@ ACE_Task_Base::cleanup (void *object, void *) // t is undefined here. close() could have deleted it. } - #if defined (ACE_HAS_SIG_C_FUNC) extern "C" void ACE_Task_Base_cleanup (void *object, void *) diff --git a/dep/ACE_wrappers/ace/Test_and_Set.h b/dep/ACE_wrappers/ace/Test_and_Set.h index e31d10f5460..e75b5b31f93 100644 --- a/dep/ACE_wrappers/ace/Test_and_Set.h +++ b/dep/ACE_wrappers/ace/Test_and_Set.h @@ -8,7 +8,6 @@ */ //============================================================================= - #ifndef ACE_TEST_AND_SET_H #define ACE_TEST_AND_SET_H diff --git a/dep/ACE_wrappers/ace/Thread_Control.h b/dep/ACE_wrappers/ace/Thread_Control.h index 8322e73a968..f975aed88fc 100644 --- a/dep/ACE_wrappers/ace/Thread_Control.h +++ b/dep/ACE_wrappers/ace/Thread_Control.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_THREAD_CONTROL_H #define ACE_THREAD_CONTROL_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Thread_Exit.h b/dep/ACE_wrappers/ace/Thread_Exit.h index f56263c9db3..e21cc2bb2e4 100644 --- a/dep/ACE_wrappers/ace/Thread_Exit.h +++ b/dep/ACE_wrappers/ace/Thread_Exit.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_THREAD_EXIT_H #define ACE_THREAD_EXIT_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Thread_Hook.h b/dep/ACE_wrappers/ace/Thread_Hook.h index 16a24cc7afc..6e03b6300cb 100644 --- a/dep/ACE_wrappers/ace/Thread_Hook.h +++ b/dep/ACE_wrappers/ace/Thread_Hook.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_THREAD_HOOK_H #define ACE_THREAD_HOOK_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Thread_Manager.cpp b/dep/ACE_wrappers/ace/Thread_Manager.cpp index 3e1b9d3a091..6488d8483ac 100644 --- a/dep/ACE_wrappers/ace/Thread_Manager.cpp +++ b/dep/ACE_wrappers/ace/Thread_Manager.cpp @@ -460,7 +460,6 @@ ACE_Thread_Manager::~ACE_Thread_Manager (void) this->close (); } - // Run the entry point for thread spawned under the control of the // <ACE_Thread_Manager>. This must be an extern "C" to make certain // compilers happy... @@ -1991,7 +1990,6 @@ ACE_Thread_Manager::thread_all_list (ACE_thread_t thread_list[], return ACE_Utils::truncate_cast<ssize_t> (thread_count); } - int ACE_Thread_Manager::thr_state (ACE_thread_t id, ACE_UINT32& state) diff --git a/dep/ACE_wrappers/ace/Thread_Semaphore.cpp b/dep/ACE_wrappers/ace/Thread_Semaphore.cpp index 13bab6ff340..64c35dc7fac 100644 --- a/dep/ACE_wrappers/ace/Thread_Semaphore.cpp +++ b/dep/ACE_wrappers/ace/Thread_Semaphore.cpp @@ -20,7 +20,6 @@ ACE_RCSID(ace, Thread_Semaphore, "$Id: Thread_Semaphore.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL void diff --git a/dep/ACE_wrappers/ace/Throughput_Stats.cpp b/dep/ACE_wrappers/ace/Throughput_Stats.cpp index 5e2288a39b7..71416b4ce5d 100644 --- a/dep/ACE_wrappers/ace/Throughput_Stats.cpp +++ b/dep/ACE_wrappers/ace/Throughput_Stats.cpp @@ -90,7 +90,6 @@ ACE_Throughput_Stats::accumulate (const ACE_Throughput_Stats &rhs) return; } - if (this->throughput_last_ < rhs.throughput_last_) this->throughput_last_ = rhs.throughput_last_; diff --git a/dep/ACE_wrappers/ace/Throughput_Stats.h b/dep/ACE_wrappers/ace/Throughput_Stats.h index 66e57eee699..9f4a87fdc8f 100644 --- a/dep/ACE_wrappers/ace/Throughput_Stats.h +++ b/dep/ACE_wrappers/ace/Throughput_Stats.h @@ -10,7 +10,6 @@ */ //========================================================================== - #ifndef ACE_THROUGHPUT_STATS_H #define ACE_THROUGHPUT_STATS_H diff --git a/dep/ACE_wrappers/ace/Time_Value.cpp b/dep/ACE_wrappers/ace/Time_Value.cpp index 86db481f042..c895495ec0a 100644 --- a/dep/ACE_wrappers/ace/Time_Value.cpp +++ b/dep/ACE_wrappers/ace/Time_Value.cpp @@ -4,7 +4,6 @@ ACE_RCSID (ace, Time_Value, "$Id: Time_Value.cpp 80826 2008-03-04 14:51:23Z wotte $") - #if !defined (__ACE_INLINE__) #include "ace/Time_Value.inl" #endif /* __ACE_INLINE__ */ @@ -210,7 +209,6 @@ ACE_Time_Value::normalize (void) #endif /* __QNXNTO__ */ } - ACE_Time_Value & ACE_Time_Value::operator *= (double d) { diff --git a/dep/ACE_wrappers/ace/Timeprobe_T.h b/dep/ACE_wrappers/ace/Timeprobe_T.h index c180f7d7a72..db69cb1da2b 100644 --- a/dep/ACE_wrappers/ace/Timeprobe_T.h +++ b/dep/ACE_wrappers/ace/Timeprobe_T.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_TIMEPROBE_T_H #define ACE_TIMEPROBE_T_H #include /**/ "ace/pre.h" @@ -71,7 +70,6 @@ public: */ typedef ACE_Timeprobe_Ex <ACE_LOCK, ACE_Allocator> ACE_Timeprobe; - /// We can hold multiple event description tables. typedef ACE_Unbounded_Set<ACE_Event_Descriptions> EVENT_DESCRIPTIONS; diff --git a/dep/ACE_wrappers/ace/Timer_Hash.h b/dep/ACE_wrappers/ace/Timer_Hash.h index c19291efaf7..f7cc65c3bb7 100644 --- a/dep/ACE_wrappers/ace/Timer_Hash.h +++ b/dep/ACE_wrappers/ace/Timer_Hash.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_TIMER_HASH_H #define ACE_TIMER_HASH_H #include /**/ "ace/pre.h" @@ -43,7 +42,6 @@ typedef ACE_Timer_Heap_T <ACE_Event_Handler *, ACE_Null_Mutex> ACE_Hash_Timer_Heap; - typedef ACE_Timer_Hash_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX, diff --git a/dep/ACE_wrappers/ace/Timer_List.h b/dep/ACE_wrappers/ace/Timer_List.h index 847eac1a1e9..6265e348951 100644 --- a/dep/ACE_wrappers/ace/Timer_List.h +++ b/dep/ACE_wrappers/ace/Timer_List.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_TIMER_LIST_H #define ACE_TIMER_LIST_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Timer_Wheel.h b/dep/ACE_wrappers/ace/Timer_Wheel.h index 888dc4a4470..b8a7e9b03ac 100644 --- a/dep/ACE_wrappers/ace/Timer_Wheel.h +++ b/dep/ACE_wrappers/ace/Timer_Wheel.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_TIMER_WHEEL_H #define ACE_TIMER_WHEEL_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Token.h b/dep/ACE_wrappers/ace/Token.h index e98e5f9a774..405ad28362f 100644 --- a/dep/ACE_wrappers/ace/Token.h +++ b/dep/ACE_wrappers/ace/Token.h @@ -371,7 +371,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Token.inl" #endif /* __ACE_INLINE__ */ - #include /**/ "ace/post.h" #endif /* ACE_TOKEN_H */ diff --git a/dep/ACE_wrappers/ace/Token_Collection.cpp b/dep/ACE_wrappers/ace/Token_Collection.cpp index e9c4964f19e..c10b9734e49 100644 --- a/dep/ACE_wrappers/ace/Token_Collection.cpp +++ b/dep/ACE_wrappers/ace/Token_Collection.cpp @@ -6,7 +6,6 @@ #include "ace/Token_Collection.inl" #endif /* __ACE_INLINE__ */ - ACE_RCSID (ace, Token_Collection, "$Id: Token_Collection.cpp 80826 2008-03-04 14:51:23Z wotte $") @@ -122,7 +121,6 @@ ACE_Token_Collection::acquire (const ACE_TCHAR *token_name, return temp->acquire (notify, sleep_hook, options); } - int ACE_Token_Collection::tryacquire (const ACE_TCHAR *token_name, void (*sleep_hook)(void *)) @@ -256,7 +254,6 @@ ACE_Token_Collection::~ACE_Token_Collection (void) } } - // This method doesn't mean anything for a collection. ACE_Token_Proxy * ACE_Token_Collection::clone (void) const diff --git a/dep/ACE_wrappers/ace/Token_Collection.h b/dep/ACE_wrappers/ace/Token_Collection.h index 6dad64ac6f0..c238004756d 100644 --- a/dep/ACE_wrappers/ace/Token_Collection.h +++ b/dep/ACE_wrappers/ace/Token_Collection.h @@ -162,7 +162,6 @@ public: ACE_Synch_Options &options = ACE_Synch_Options::defaults); - /// Renew the token corresponding to @a token_name. The other /// parameters are passed to <token>::renew. virtual int renew (const ACE_TCHAR *token_name, @@ -180,7 +179,6 @@ public: virtual int release (ACE_Synch_Options &options = ACE_Synch_Options::defaults); - /// Release the token corresponding to <token_name>. The other /// parameters are passed to <token>::release. virtual int release (const ACE_TCHAR *token_name, diff --git a/dep/ACE_wrappers/ace/Token_Invariants.cpp b/dep/ACE_wrappers/ace/Token_Invariants.cpp index e0ca87bdcc4..aa7162c9bee 100644 --- a/dep/ACE_wrappers/ace/Token_Invariants.cpp +++ b/dep/ACE_wrappers/ace/Token_Invariants.cpp @@ -150,7 +150,6 @@ ACE_Token_Invariant_Manager::dump (void) const #endif /* ACE_HAS_DUMP */ } - int ACE_Token_Invariant_Manager::get_mutex (const ACE_TCHAR *token_name, ACE_Mutex_Invariants *&inv) @@ -204,7 +203,6 @@ ACE_Token_Invariant_Manager::get_rwlock (const ACE_TCHAR *token_name, return 0; } - ACE_Token_Invariant_Manager::~ACE_Token_Invariant_Manager (void) { ACE_TRACE ("ACE_Token_Invariant_Manager::~ACE_Token_Invariant_Manager"); diff --git a/dep/ACE_wrappers/ace/Token_Manager.cpp b/dep/ACE_wrappers/ace/Token_Manager.cpp index 178a0e5c63b..64f1194f8b9 100644 --- a/dep/ACE_wrappers/ace/Token_Manager.cpp +++ b/dep/ACE_wrappers/ace/Token_Manager.cpp @@ -192,7 +192,6 @@ ACE_Token_Manager::check_deadlock (ACE_Tokens *token, ACE_Token_Proxy *proxy) } } - ACE_Tokens * ACE_Token_Manager::token_waiting_for (const ACE_TCHAR *client_id) { diff --git a/dep/ACE_wrappers/ace/Token_Request_Reply.h b/dep/ACE_wrappers/ace/Token_Request_Reply.h index 1c09f7af8f6..18bb0d493cf 100644 --- a/dep/ACE_wrappers/ace/Token_Request_Reply.h +++ b/dep/ACE_wrappers/ace/Token_Request_Reply.h @@ -15,7 +15,6 @@ */ //============================================================================= - #ifndef ACE_TOKEN_REQUEST_REPLY_H #define ACE_TOKEN_REQUEST_REPLY_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/Trace.cpp b/dep/ACE_wrappers/ace/Trace.cpp index 5592b8169a3..728adf7f88b 100644 --- a/dep/ACE_wrappers/ace/Trace.cpp +++ b/dep/ACE_wrappers/ace/Trace.cpp @@ -1,6 +1,5 @@ // $Id: Trace.cpp 80826 2008-03-04 14:51:23Z wotte $ - #include "ace/Trace.h" ACE_RCSID (ace, diff --git a/dep/ACE_wrappers/ace/Truncate.h b/dep/ACE_wrappers/ace/Truncate.h index aef1c4ea57e..0af5b022473 100644 --- a/dep/ACE_wrappers/ace/Truncate.h +++ b/dep/ACE_wrappers/ace/Truncate.h @@ -442,7 +442,6 @@ namespace ACE_Utils } }; - #if defined (ACE_LACKS_LONGLONG_T) || defined (ACE_LACKS_UNSIGNEDLONGLONG_T) // Partial specialization for the case where we're casting from // ACE_U_LongLong to a smaller integer. We assume that we're always @@ -833,7 +832,6 @@ namespace ACE_Utils } }; - template<> struct Truncator<unsigned int, signed long> { diff --git a/dep/ACE_wrappers/ace/Typed_SV_Message.h b/dep/ACE_wrappers/ace/Typed_SV_Message.h index 69c87f73c2c..714907bbb22 100644 --- a/dep/ACE_wrappers/ace/Typed_SV_Message.h +++ b/dep/ACE_wrappers/ace/Typed_SV_Message.h @@ -10,7 +10,6 @@ */ //========================================================================== - #ifndef ACE_TYPED_SV_MESSAGE_H #define ACE_TYPED_SV_MESSAGE_H diff --git a/dep/ACE_wrappers/ace/UNIX_Addr.h b/dep/ACE_wrappers/ace/UNIX_Addr.h index 6dd4130f251..253748dfa02 100644 --- a/dep/ACE_wrappers/ace/UNIX_Addr.h +++ b/dep/ACE_wrappers/ace/UNIX_Addr.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_UNIX_ADDR_H #define ACE_UNIX_ADDR_H diff --git a/dep/ACE_wrappers/ace/UNIX_Addr.inl b/dep/ACE_wrappers/ace/UNIX_Addr.inl index 5e801b56fea..7262f0f4250 100644 --- a/dep/ACE_wrappers/ace/UNIX_Addr.inl +++ b/dep/ACE_wrappers/ace/UNIX_Addr.inl @@ -2,10 +2,8 @@ // // $Id: UNIX_Addr.inl 80826 2008-03-04 14:51:23Z wotte $ - #include "ace/OS_NS_string.h" - #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/UPIPE_Acceptor.h b/dep/ACE_wrappers/ace/UPIPE_Acceptor.h index c23acd0fca0..c180a16f2fb 100644 --- a/dep/ACE_wrappers/ace/UPIPE_Acceptor.h +++ b/dep/ACE_wrappers/ace/UPIPE_Acceptor.h @@ -11,7 +11,6 @@ */ //============================================================================= - #ifndef ACE_UPIPE_ACCEPTOR_H #define ACE_UPIPE_ACCEPTOR_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/UPIPE_Addr.h b/dep/ACE_wrappers/ace/UPIPE_Addr.h index 755e10ebefe..ca1db7a67aa 100644 --- a/dep/ACE_wrappers/ace/UPIPE_Addr.h +++ b/dep/ACE_wrappers/ace/UPIPE_Addr.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_UPIPE_ADDR_H #define ACE_UPIPE_ADDR_H diff --git a/dep/ACE_wrappers/ace/UPIPE_Connector.h b/dep/ACE_wrappers/ace/UPIPE_Connector.h index 328587f36a0..69beb1a965b 100644 --- a/dep/ACE_wrappers/ace/UPIPE_Connector.h +++ b/dep/ACE_wrappers/ace/UPIPE_Connector.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_UPIPE_CONNECTOR_H #define ACE_UPIPE_CONNECTOR_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/UPIPE_Stream.h b/dep/ACE_wrappers/ace/UPIPE_Stream.h index 2cf53b1e274..89b8d793cf5 100644 --- a/dep/ACE_wrappers/ace/UPIPE_Stream.h +++ b/dep/ACE_wrappers/ace/UPIPE_Stream.h @@ -11,7 +11,6 @@ */ //============================================================================= - #ifndef ACE_UPIPE_STREAM_H #define ACE_UPIPE_STREAM_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/UTF16_Encoding_Converter.cpp b/dep/ACE_wrappers/ace/UTF16_Encoding_Converter.cpp index 6c660a37c4b..e7013acfd3e 100644 --- a/dep/ACE_wrappers/ace/UTF16_Encoding_Converter.cpp +++ b/dep/ACE_wrappers/ace/UTF16_Encoding_Converter.cpp @@ -75,7 +75,6 @@ static const ACE_UINT32 offsetsFromUTF8[6] = { 0x00000000, 0x00003080, 0x000E2080, 0x03C82080, 0xFA082080, 0x82082080 }; - ACE_UTF16_Encoding_Converter::ACE_UTF16_Encoding_Converter (bool swap) : swap_ (swap) { diff --git a/dep/ACE_wrappers/ace/UTF8_Encoding_Converter.cpp b/dep/ACE_wrappers/ace/UTF8_Encoding_Converter.cpp index 42e452150a4..5756c7dac59 100644 --- a/dep/ACE_wrappers/ace/UTF8_Encoding_Converter.cpp +++ b/dep/ACE_wrappers/ace/UTF8_Encoding_Converter.cpp @@ -74,7 +74,7 @@ ACE_UTF8_Encoding_Converter* ACE_UTF8_Encoding_Converter::encoded (const ACE_Byte* source, size_t source_size) { - for(size_t i = 0; i < source_size; i++) + for (size_t i = 0; i < source_size; i++) { if (source[i] < 0x01 || source[i] > 0x7f) return 0; diff --git a/dep/ACE_wrappers/ace/UTF8_Encoding_Converter.h b/dep/ACE_wrappers/ace/UTF8_Encoding_Converter.h index 989adca194a..a38cffbc0ff 100644 --- a/dep/ACE_wrappers/ace/UTF8_Encoding_Converter.h +++ b/dep/ACE_wrappers/ace/UTF8_Encoding_Converter.h @@ -53,7 +53,6 @@ public: size_t target_size, bool strict = true); - /// This factory helper method determines if the source stream is UTF-8 /// encoded. If it is, allocate an ACE_UTF8_Encoding_Converter and /// return it. The caller then owns the allocated object. diff --git a/dep/ACE_wrappers/ace/UUID.cpp b/dep/ACE_wrappers/ace/UUID.cpp index d27c8f8a33b..8b2427a82e3 100644 --- a/dep/ACE_wrappers/ace/UUID.cpp +++ b/dep/ACE_wrappers/ace/UUID.cpp @@ -19,7 +19,6 @@ ACE_RCSID (ace, UUID, "$Id: UUID.cpp 81541 2008-04-30 13:56:12Z shuston $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_Utils diff --git a/dep/ACE_wrappers/ace/Unbounded_Set.inl b/dep/ACE_wrappers/ace/Unbounded_Set.inl index 365b025c0be..36190c6638c 100644 --- a/dep/ACE_wrappers/ace/Unbounded_Set.inl +++ b/dep/ACE_wrappers/ace/Unbounded_Set.inl @@ -13,7 +13,7 @@ ACE_Unbounded_Set_Default_Comparator<T>::operator () (const T &lhs, const T &rh } template<typename T> -ACE_Unbounded_Set_Iterator<T>::ACE_Unbounded_Set_Iterator (ACE_Unbounded_Set<T> &s, +ACE_Unbounded_Set_Iterator<T>::ACE_Unbounded_Set_Iterator (ACE_Unbounded_Set<T> &s, bool end) : base_type (s, end) { @@ -45,5 +45,4 @@ ACE_Unbounded_Set<T>::ACE_Unbounded_Set (ACE_Allocator *alloc) { } - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Vector_T.h b/dep/ACE_wrappers/ace/Vector_T.h index 7be43bfd631..c8c6a5112ac 100644 --- a/dep/ACE_wrappers/ace/Vector_T.h +++ b/dep/ACE_wrappers/ace/Vector_T.h @@ -75,7 +75,6 @@ public: */ typedef ACE_Vector_Iterator<T, DEFAULT_SIZE> Iterator; - /** * General constructor. * diff --git a/dep/ACE_wrappers/ace/Versioned_Namespace.h b/dep/ACE_wrappers/ace/Versioned_Namespace.h index 9b71d0111fc..8dc3f9ed3e1 100644 --- a/dep/ACE_wrappers/ace/Versioned_Namespace.h +++ b/dep/ACE_wrappers/ace/Versioned_Namespace.h @@ -21,7 +21,6 @@ # error This header is only meant to be included by or after "ace/config-lite.h". #endif /* !ACE_CONFIG_LITE_H */ - #if defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1 # ifndef ACE_VERSIONED_NAMESPACE_NAME diff --git a/dep/ACE_wrappers/ace/WFMO_Reactor.cpp b/dep/ACE_wrappers/ace/WFMO_Reactor.cpp index 7355a025bbd..b78d0a5111c 100644 --- a/dep/ACE_wrappers/ace/WFMO_Reactor.cpp +++ b/dep/ACE_wrappers/ace/WFMO_Reactor.cpp @@ -1478,8 +1478,6 @@ ACE_WFMO_Reactor::mask_ops_i (ACE_HANDLE io_handle, return -1; } - - int ACE_WFMO_Reactor_Handler_Repository::modify_network_events_i (ACE_HANDLE io_handle, ACE_Reactor_Mask new_masks, @@ -1885,7 +1883,6 @@ ACE_WFMO_Reactor::calculate_timeout (ACE_Time_Value *max_wait_time) return time->msec (); } - int ACE_WFMO_Reactor::expire_timers (void) { @@ -2255,7 +2252,6 @@ ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler, return problems; } - int ACE_WFMO_Reactor::update_state (void) { @@ -2723,7 +2719,6 @@ ACE_WFMO_Reactor::resumable_handler (void) return 0; } - // No-op WinSOCK2 methods to help WFMO_Reactor compile #if !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) int diff --git a/dep/ACE_wrappers/ace/WFMO_Reactor.h b/dep/ACE_wrappers/ace/WFMO_Reactor.h index 8a6a8af8ad1..4bd5a514dd1 100644 --- a/dep/ACE_wrappers/ace/WFMO_Reactor.h +++ b/dep/ACE_wrappers/ace/WFMO_Reactor.h @@ -768,7 +768,6 @@ public: virtual int handle_events (ACE_Time_Value &max_wait_time); virtual int alertable_handle_events (ACE_Time_Value &max_wait_time); - // = Event handling control. /** diff --git a/dep/ACE_wrappers/ace/WIN32_Asynch_IO.cpp b/dep/ACE_wrappers/ace/WIN32_Asynch_IO.cpp index 43cb20c4343..7b1268e451b 100644 --- a/dep/ACE_wrappers/ace/WIN32_Asynch_IO.cpp +++ b/dep/ACE_wrappers/ace/WIN32_Asynch_IO.cpp @@ -914,7 +914,7 @@ ACE_WIN32_Asynch_Write_Stream::writev (ACE_Message_Block &message_block, // Re-calculate number bytes to write bytes_to_write = 0; - for ( int i=0; i < iovcnt ; ++i ) + for (int i=0; i < iovcnt ; ++i ) bytes_to_write += iov[i].iov_len; if ( bytes_to_write == 0 ) @@ -923,7 +923,6 @@ ACE_WIN32_Asynch_Write_Stream::writev (ACE_Message_Block &message_block, ACE_TEXT ("Attempt to write 0 bytes\n")), -1); - ACE_WIN32_Asynch_Write_Stream_Result *result = 0; ACE_NEW_RETURN (result, ACE_WIN32_Asynch_Write_Stream_Result (this->handler_proxy_, @@ -1288,7 +1287,6 @@ ACE_WIN32_Asynch_Read_File::read (ACE_Message_Block &message_block, ACE_TEXT ("Attempt to read 0 bytes or no space in the message block\n")), -1); - ACE_WIN32_Asynch_Read_File_Result *result = 0; ACE_NEW_RETURN (result, ACE_WIN32_Asynch_Read_File_Result (this->handler_proxy_, @@ -1427,7 +1425,6 @@ ACE_WIN32_Asynch_Read_File::readv (ACE_Message_Block &message_block, #endif /* ACE_WIN32_OVERLAPPED_IO */ } - ACE_WIN32_Asynch_Read_File::~ACE_WIN32_Asynch_Read_File (void) { } @@ -1834,7 +1831,6 @@ ACE_WIN32_Asynch_Write_File::writev (ACE_Message_Block &message_block, #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ } - ACE_WIN32_Asynch_Write_File::~ACE_WIN32_Asynch_Write_File (void) { } @@ -2225,7 +2221,6 @@ void ACE_WIN32_Asynch_Connect_Result::connect_handle ( ACE_HANDLE handle ) this->connect_handle_ = handle; } - ACE_WIN32_Asynch_Connect_Result::ACE_WIN32_Asynch_Connect_Result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE connect_handle, @@ -2588,7 +2583,7 @@ ACE_WIN32_Asynch_Connect::connect_i (ACE_WIN32_Asynch_Connect_Result *result, -1); } - for (;;) + for (; ; ) { int rc = ACE_OS::connect (handle, @@ -2609,7 +2604,6 @@ ACE_WIN32_Asynch_Connect::connect_i (ACE_WIN32_Asynch_Connect_Result *result, } } - // cancel_uncompleted // It performs cancellation of all pending requests // @@ -2755,7 +2749,6 @@ ACE_WIN32_Asynch_Connect::handle_output (ACE_HANDLE fd) return 0; } - int ACE_WIN32_Asynch_Connect::handle_close (ACE_HANDLE fd, ACE_Reactor_Mask) { @@ -3106,7 +3099,6 @@ ACE_WIN32_Asynch_Read_Dgram_Result::message_block (void) const return this->message_block_; } - int ACE_WIN32_Asynch_Read_Dgram_Result::remote_address (ACE_Addr& addr) const { @@ -3129,7 +3121,6 @@ ACE_WIN32_Asynch_Read_Dgram_Result::saddr () const return (sockaddr *) this->remote_address_->get_addr (); } - int ACE_WIN32_Asynch_Read_Dgram_Result::flags (void) const { @@ -3608,7 +3599,6 @@ ACE_WIN32_Asynch_Write_Dgram_Result::~ACE_WIN32_Asynch_Write_Dgram_Result (void) { } - //*********************************************** ACE_WIN32_Asynch_Write_Dgram::~ACE_WIN32_Asynch_Write_Dgram (void) @@ -3698,7 +3688,6 @@ ACE_WIN32_Asynch_Write_Dgram::send (ACE_Message_Block *message_block, result, 0); - if (initiate_result == SOCKET_ERROR) { // If initiate failed, check for a bad error. diff --git a/dep/ACE_wrappers/ace/WIN32_Asynch_IO.h b/dep/ACE_wrappers/ace/WIN32_Asynch_IO.h index a1cf22ae0a0..f88ff3d45e6 100644 --- a/dep/ACE_wrappers/ace/WIN32_Asynch_IO.h +++ b/dep/ACE_wrappers/ace/WIN32_Asynch_IO.h @@ -704,7 +704,6 @@ public: int priority, int signal_number = 0); - /// Destructor. virtual ~ACE_WIN32_Asynch_Read_File (void); @@ -1228,7 +1227,6 @@ protected: ACE_HANDLE connect_handle_; }; - /** * @class ACE_WIN32_Asynch_Connect */ diff --git a/dep/ACE_wrappers/ace/WIN32_Proactor.cpp b/dep/ACE_wrappers/ace/WIN32_Proactor.cpp index dceb8336277..4367a57f7d1 100644 --- a/dep/ACE_wrappers/ace/WIN32_Proactor.cpp +++ b/dep/ACE_wrappers/ace/WIN32_Proactor.cpp @@ -83,7 +83,7 @@ ACE_WIN32_Proactor::close (void) { // To avoid memory leaks we should delete all results from queue. - for (;;) + for (; ; ) { ACE_OVERLAPPED *overlapped = 0; u_long bytes_transferred = 0; diff --git a/dep/ACE_wrappers/ace/WIN32_Proactor.h b/dep/ACE_wrappers/ace/WIN32_Proactor.h index 1035021fb6d..49cec039b38 100644 --- a/dep/ACE_wrappers/ace/WIN32_Proactor.h +++ b/dep/ACE_wrappers/ace/WIN32_Proactor.h @@ -203,7 +203,6 @@ public: int priority, int signal_number = 0); - virtual ACE_Asynch_Transmit_File_Result_Impl *create_asynch_transmit_file_result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE socket, ACE_HANDLE file, diff --git a/dep/ACE_wrappers/ace/XML_Svc_Conf.h b/dep/ACE_wrappers/ace/XML_Svc_Conf.h index 5455657ece2..c14e30035bc 100644 --- a/dep/ACE_wrappers/ace/XML_Svc_Conf.h +++ b/dep/ACE_wrappers/ace/XML_Svc_Conf.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_XML_SVC_CONF_H #define ACE_XML_SVC_CONF_H diff --git a/dep/ACE_wrappers/ace/XTI_ATM_Mcast.h b/dep/ACE_wrappers/ace/XTI_ATM_Mcast.h index 9cd01f8ac0b..b701d842b67 100644 --- a/dep/ACE_wrappers/ace/XTI_ATM_Mcast.h +++ b/dep/ACE_wrappers/ace/XTI_ATM_Mcast.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_XTI_ATM_MCAST_H #define ACE_XTI_ATM_MCAST_H #include /**/ "ace/pre.h" diff --git a/dep/ACE_wrappers/ace/config-WinCE.h b/dep/ACE_wrappers/ace/config-WinCE.h index 83db197b8e4..a7ba1a72a8a 100644 --- a/dep/ACE_wrappers/ace/config-WinCE.h +++ b/dep/ACE_wrappers/ace/config-WinCE.h @@ -150,7 +150,6 @@ //#define _O_SEQUENTIAL 0x0020 // file access is primarily sequential //#define _O_RANDOM 0x0010 // file access is primarily random - // Non-ANSI names #define O_RDONLY _O_RDONLY #define O_WRONLY _O_WRONLY @@ -167,16 +166,13 @@ //#define O_SEQUENTIAL _O_SEQUENTIAL //#define O_RANDOM _O_RANDOM - // @@ NSIG value. This is definitely not correct. #define NSIG 23 - // @@ For some reason, WinCE forgot to define this. // Need to find out what it is. (Used in MapViewOfFile ().) #define FILE_MAP_COPY 0 - #define ACE_LACKS_STRCASECMP // WinCE doesn't support _stricmp #define ACE_LACKS_GETSERVBYNAME #define ACE_LACKS_ACCESS diff --git a/dep/ACE_wrappers/ace/config-freebsd.h b/dep/ACE_wrappers/ace/config-freebsd.h index d5ead871030..6f4c5750f98 100644 --- a/dep/ACE_wrappers/ace/config-freebsd.h +++ b/dep/ACE_wrappers/ace/config-freebsd.h @@ -92,7 +92,6 @@ enum schedparam_policy { // Use of <malloc.h> is deprecated. #define ACE_LACKS_MALLOC_H - // This won't be necessary after it is fixed in the system include headers. extern "C" { char * cuserid (char *s); } diff --git a/dep/ACE_wrappers/ace/config-hpux-11.00.h b/dep/ACE_wrappers/ace/config-hpux-11.00.h index 17de9afa38c..63f156dcfed 100644 --- a/dep/ACE_wrappers/ace/config-hpux-11.00.h +++ b/dep/ACE_wrappers/ace/config-hpux-11.00.h @@ -360,7 +360,6 @@ #define ACE_HAS_3_PARAM_READDIR_R - ////////////////////////////////////////////////////////////////////////// // // STREAMS information diff --git a/dep/ACE_wrappers/ace/config-integritySCA.h b/dep/ACE_wrappers/ace/config-integritySCA.h index 195027f94ec..be6ccd7a3a8 100644 --- a/dep/ACE_wrappers/ace/config-integritySCA.h +++ b/dep/ACE_wrappers/ace/config-integritySCA.h @@ -49,12 +49,10 @@ #define ACE_LACKS_TEMPNAM /* believe it or not, this is ANSI C */ #define ACE_HAS_STRERROR - #define ACE_LACKS_SENDMSG /***** End Stack Defines *****/ - /* SCA STUFF */ #if defined(INTEGRITY_VERSION) && (INTEGRITY_VERSION >= 40108) #define ACE_HAS_SIG_ATOMIC_T @@ -223,7 +221,6 @@ int unlink(const char *); #define ACE_LACKS_SEEKDIR #define ACE_LACKS_GETHOSTENT - /* end MIKEC Addtions */ // Hack to avoid ensure that things defined in ind_io.h diff --git a/dep/ACE_wrappers/ace/config-irix6.x-common.h b/dep/ACE_wrappers/ace/config-irix6.x-common.h index ab5413412c1..49bc08f6c4e 100644 --- a/dep/ACE_wrappers/ace/config-irix6.x-common.h +++ b/dep/ACE_wrappers/ace/config-irix6.x-common.h @@ -253,6 +253,5 @@ #endif /* (ACE_MT_SAFE == 0) */ - #endif /* ACE_CONFIG_IRIX6X_COMMON_H */ diff --git a/dep/ACE_wrappers/ace/config-lite.h b/dep/ACE_wrappers/ace/config-lite.h index 5af65ccc557..a8157bef1ec 100644 --- a/dep/ACE_wrappers/ace/config-lite.h +++ b/dep/ACE_wrappers/ace/config-lite.h @@ -158,7 +158,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL typedef std::reverse_iterator<const_iterator> const_reverse_iterator; #endif /* _MSC_VER && _WIN64 */ - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_LITE_H */ diff --git a/dep/ACE_wrappers/ace/config-macosx-leopard.h b/dep/ACE_wrappers/ace/config-macosx-leopard.h index ef9ffc59a08..7351f938409 100644 --- a/dep/ACE_wrappers/ace/config-macosx-leopard.h +++ b/dep/ACE_wrappers/ace/config-macosx-leopard.h @@ -58,7 +58,6 @@ #define ACE_HAS_WCHAR #define ACE_SIZEOF_WCHAR 4 - #define ACE_HAS_3_PARAM_WCSTOK #define ACE_LACKS_ITOW #define ACE_LACKS_WCSICMP diff --git a/dep/ACE_wrappers/ace/config-macosx-tiger.h b/dep/ACE_wrappers/ace/config-macosx-tiger.h index 282e8800c3c..447c834ac0c 100644 --- a/dep/ACE_wrappers/ace/config-macosx-tiger.h +++ b/dep/ACE_wrappers/ace/config-macosx-tiger.h @@ -51,7 +51,6 @@ #define ACE_HAS_WCHAR #define ACE_SIZEOF_WCHAR 4 - #define ACE_HAS_3_PARAM_WCSTOK #define ACE_LACKS_ITOW #define ACE_LACKS_WCSICMP diff --git a/dep/ACE_wrappers/ace/config-openbsd.h b/dep/ACE_wrappers/ace/config-openbsd.h index e81e36bc613..10b4f268bcb 100644 --- a/dep/ACE_wrappers/ace/config-openbsd.h +++ b/dep/ACE_wrappers/ace/config-openbsd.h @@ -72,7 +72,6 @@ # define ACE_HAS_UCONTEXT_T #endif /* OpenBSD >= 200405 */ - // OpenBSD has sigwait defined #define ACE_HAS_SIGWAIT #define ACE_HAS_SIGINFO_T diff --git a/dep/ACE_wrappers/ace/config-sunos5.5.h b/dep/ACE_wrappers/ace/config-sunos5.5.h index 83d4d164951..d1148c6b0c3 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.5.h +++ b/dep/ACE_wrappers/ace/config-sunos5.5.h @@ -89,7 +89,6 @@ /* If you want to disable threading with Sun CC, remove -mt from your CFLAGS, e.g., using make threads=0. */ - // Take advantage of Sun Studio 8 (Sun C++ 5.5) or better symbol // visibility to generate improved shared library binaries. # if (__SUNPRO_CC > 0x540) diff --git a/dep/ACE_wrappers/ace/config-sunos5.6.h b/dep/ACE_wrappers/ace/config-sunos5.6.h index 2ebf5a274a0..01855ba37c8 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.6.h +++ b/dep/ACE_wrappers/ace/config-sunos5.6.h @@ -84,7 +84,6 @@ // SunOS 5.6 and above support mkstemp #undef ACE_LACKS_MKSTEMP - // SunOS 5.6 has AIO calls. #if !defined (ACE_HAS_AIO_CALLS) #define ACE_HAS_AIO_CALLS diff --git a/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v2.h b/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v2.h index 18e2cb23f79..cb853c659f0 100644 --- a/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v2.h +++ b/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v2.h @@ -10,12 +10,10 @@ // The following configuration file contains defines for Tandem NSK // platform, MIPS processor, version 2 C++ compiler. - //========================================================================= // Tandem NSK specific parts //========================================================================= - // Disable pthread renaming of symbols such as "open" and "close" #define _CMA_NOWRAPPERS_ 1 @@ -31,7 +29,6 @@ // [@note this causes a significant performance degradation] //#define ACE_TANDEM_T1248_PTHREADS_ALL_IO_WRAPPERS - // Need this include here because some symbols defined by pthreads // (e.g. timespec_t) are needed before spthread.h is normally included // by ACE @@ -213,8 +210,6 @@ typedef enum CMA_T_SCHED_POLICY { // Compile using multi-thread libraries #define ACE_MT_SAFE 1 - - // Platform supports System V IPC #define ACE_HAS_SYSV_IPC @@ -316,7 +311,6 @@ typedef enum CMA_T_SCHED_POLICY { // Platform has <strings.h> (which contains bzero() prototype) #define ACE_HAS_STRINGS 1 - // OS/compiler omits the const from the iovec parameter in the // writev() prototype. #define ACE_HAS_NONCONST_WRITEV diff --git a/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v3.h b/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v3.h index c002835a857..88773d37f92 100644 --- a/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v3.h +++ b/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v3.h @@ -2,7 +2,6 @@ // // $Id: config-tandem-nsk-mips-v3.h 81935 2008-06-12 22:01:53Z jtc $ - #ifndef ACE_CONFIG_NSK_H #define ACE_CONFIG_NSK_H @@ -11,12 +10,10 @@ // The following configuration file contains defines for Tandem NSK // platform, MIPS processor, version 3 C++ compiler. - //========================================================================= // Tandem NSK specific parts //========================================================================= - // Disable pthread renaming of symbols such as "open" and "close" #define _CMA_NOWRAPPERS_ 1 @@ -32,7 +29,6 @@ // [Note: this causes a significant performance degradation] //#define ACE_TANDEM_T1248_PTHREADS_ALL_IO_WRAPPERS - // Need this include here because some symbols defined by pthreads // (e.g. timespec_t) are needed before spthread.h is normally included // by ACE @@ -214,8 +210,6 @@ typedef enum CMA_T_SCHED_POLICY { // Compile using multi-thread libraries #define ACE_MT_SAFE 1 - - // Platform supports System V IPC #define ACE_HAS_SYSV_IPC @@ -261,7 +255,6 @@ typedef enum CMA_T_SCHED_POLICY { // Platform lacks alphasort() #define ACE_LACKS_ALPHASORT - //========================================================================= // Threads specific parts //========================================================================= @@ -348,7 +341,6 @@ typedef enum CMA_T_SCHED_POLICY { // Platform has <strings.h> (which contains bzero() prototype) #define ACE_HAS_STRINGS 1 - // OS/compiler omits the const from the iovec parameter in the // writev() prototype. #define ACE_HAS_NONCONST_WRITEV @@ -440,7 +432,6 @@ typedef enum CMA_T_SCHED_POLICY { #define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class import$ SINGLETON_TYPE <CLASS, LOCK>; #endif - //========================================================================= // Build options //========================================================================= diff --git a/dep/ACE_wrappers/ace/config-tandem.h b/dep/ACE_wrappers/ace/config-tandem.h index 1577e1e6866..2e1be04bc10 100644 --- a/dep/ACE_wrappers/ace/config-tandem.h +++ b/dep/ACE_wrappers/ace/config-tandem.h @@ -142,7 +142,6 @@ // Platform lacks "signed char" type (broken!) #define ACE_LACKS_SIGNED_CHAR - #define ACE_PAGE_SIZE 4096 // Defines the page size of the system (not used on Win32 or // with ACE_HAS_GETPAGESIZE). diff --git a/dep/ACE_wrappers/ace/config-unixware-7.1.0.h b/dep/ACE_wrappers/ace/config-unixware-7.1.0.h index 03725638a70..44eef5d5973 100644 --- a/dep/ACE_wrappers/ace/config-unixware-7.1.0.h +++ b/dep/ACE_wrappers/ace/config-unixware-7.1.0.h @@ -147,7 +147,6 @@ #undef ACE_HAS_PENTIUM #endif /* ACE_HAS_PENTIUM */ - /* Platform contains <poll.h> */ #define ACE_HAS_POLL 1 diff --git a/dep/ACE_wrappers/ace/config-unixware-7.1.0.udk.h b/dep/ACE_wrappers/ace/config-unixware-7.1.0.udk.h index 988c451effb..fc6006889e9 100644 --- a/dep/ACE_wrappers/ace/config-unixware-7.1.0.udk.h +++ b/dep/ACE_wrappers/ace/config-unixware-7.1.0.udk.h @@ -54,8 +54,6 @@ # define PTHREAD_MAX_PRIORITY ACE_THREAD_MAX_PRIORITY #endif /* #if defined (ACE_THREAD_MAX_PRIORITY) */ - - /* UnixWare specific configuration parameters */ /* #undef UNIXWARE */ /* #undef UNIXWARE_2_0 */ @@ -103,7 +101,6 @@ /* Staller: oh yes, let's do this! */ #define ACE_HAS_BROKEN_MAP_FAILED - /* Prototypes for both signal() and struct sigaction are consistent. */ #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 1 @@ -171,7 +168,6 @@ /* Uses ctime_r & asctime_r with only two parameters vs. three. */ #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - /* Platform is an Intel Pentium microprocessor. */ /* There is a problem with the gethrtime() because of (apparently) a problem with the inline assembly instruction. Hopefully there is a way to resolve @@ -181,7 +177,6 @@ //#undef ACE_HAS_PENTIUM #endif /* ACE_HAS_PENTIUM */ - /* Platform contains <poll.h> */ #define ACE_HAS_POLL diff --git a/dep/ACE_wrappers/ace/config-win32-common.h b/dep/ACE_wrappers/ace/config-win32-common.h index 1abeccd4c54..b7beb5ba228 100644 --- a/dep/ACE_wrappers/ace/config-win32-common.h +++ b/dep/ACE_wrappers/ace/config-win32-common.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id: config-win32-common.h 82316 2008-07-15 01:28:39Z johnnyw $ - #ifndef ACE_CONFIG_WIN32_COMMON_H #define ACE_CONFIG_WIN32_COMMON_H #include /**/ "ace/pre.h" @@ -10,7 +9,6 @@ #error Use config-win32.h in config.h instead of this header #endif /* ACE_CONFIG_WIN32_H */ - // Windows Mobile (CE) stuff is primarily further restrictions to what's // in the rest of this file. Also, it defined ACE_HAS_WINCE, which is used // in this file. @@ -171,7 +169,6 @@ #define FD_SETSIZE 1024 #endif /* FD_SETSIZE */ - // Windows doesn't like 65536 ;-) If 65536 is specified, it is // silently ignored by the OS, i.e., setsockopt does not fail, and you // get stuck with the default size of 8k. @@ -434,7 +431,6 @@ # define ACE_HAS_WINSOCK2 1 #endif /* !defined(ACE_HAS_WINSOCK2) */ - #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) # if !defined (_WINSOCK2API_) // will also include windows.h, if not present diff --git a/dep/ACE_wrappers/ace/config-win32-interix.h b/dep/ACE_wrappers/ace/config-win32-interix.h index 71f521af45a..d613444fadb 100644 --- a/dep/ACE_wrappers/ace/config-win32-interix.h +++ b/dep/ACE_wrappers/ace/config-win32-interix.h @@ -98,4 +98,3 @@ IOStream_Test.log ACE_IOSTREAM not supported on this platform */ - diff --git a/dep/ACE_wrappers/ace/config-win32.h b/dep/ACE_wrappers/ace/config-win32.h index 96c351bd567..2cf39c60491 100644 --- a/dep/ACE_wrappers/ace/config-win32.h +++ b/dep/ACE_wrappers/ace/config-win32.h @@ -51,7 +51,6 @@ // end custom config stuff - // NOTE: Please do not add anything besides #include's here. Put other stuff // (definitions, etc.) in the included headers @@ -87,7 +86,6 @@ #undef ACE_HAS_NONSTATIC_OBJECT_MANAGER #endif //ACE_HAS_NONSTATIC_OBJECT_MANAGER - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_H */ diff --git a/dep/ACE_wrappers/ace/iosfwd.h b/dep/ACE_wrappers/ace/iosfwd.h index 561e15e8ad8..1dc1c581213 100644 --- a/dep/ACE_wrappers/ace/iosfwd.h +++ b/dep/ACE_wrappers/ace/iosfwd.h @@ -19,7 +19,6 @@ */ //============================================================================= - #ifndef ACE_IOSFWD_H #define ACE_IOSFWD_H diff --git a/dep/ACE_wrappers/ace/os_include/os_pthread.h b/dep/ACE_wrappers/ace/os_include/os_pthread.h index 6556a64576d..c45fc4cf802 100644 --- a/dep/ACE_wrappers/ace/os_include/os_pthread.h +++ b/dep/ACE_wrappers/ace/os_include/os_pthread.h @@ -49,7 +49,6 @@ extern "C" pthread_t pthread_self (void); # endif /* DIGITAL_UNIX */ # endif /* ACE_HAS_PTHREADS */ - #if !defined (ACE_LACKS_PTHREAD_H) extern "C" { # if defined (ACE_TANDEM_T1248_PTHREADS) diff --git a/dep/ACE_wrappers/ace/os_include/os_stdint.h b/dep/ACE_wrappers/ace/os_include/os_stdint.h index 5786e2a2b71..3cd849de612 100644 --- a/dep/ACE_wrappers/ace/os_include/os_stdint.h +++ b/dep/ACE_wrappers/ace/os_include/os_stdint.h @@ -130,7 +130,6 @@ _POSIX_V6_LPBIG_OFFBIG programming environment. // @todo move the ACE_INT## typedefs here so that ACE_INT64 will // always be available. - // @todo perhaps add macros #ifdef __cplusplus diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_uio.h b/dep/ACE_wrappers/ace/os_include/sys/os_uio.h index ccc5bbeb12e..72a2819e524 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_uio.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_uio.h @@ -54,7 +54,6 @@ extern "C" }; #endif /* ACE_LACKS_IOVEC */ - # if defined (ACE_LACKS_TIMEDWAIT_PROTOTYPES) ssize_t readv_timedwait (ACE_HANDLE handle, diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_un.h b/dep/ACE_wrappers/ace/os_include/sys/os_un.h index 00b07315249..88d86a232a6 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_un.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_un.h @@ -43,7 +43,6 @@ struct sockaddr_un { }; #endif /* ACE_VXWORKS */ - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/dep/ACE_wrappers/ace/streams.h b/dep/ACE_wrappers/ace/streams.h index 2b3ae4390fa..3401435b4b1 100644 --- a/dep/ACE_wrappers/ace/streams.h +++ b/dep/ACE_wrappers/ace/streams.h @@ -18,7 +18,6 @@ */ //============================================================================= - #ifndef ACE_STREAMS_H #define ACE_STREAMS_H #include /**/ "ace/pre.h" @@ -35,7 +34,6 @@ #pragma warning(push) #endif /* _MSC_VER*/ - #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) # if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \ diff --git a/dep/include/g3dlite/G3D/AABox.h b/dep/include/g3dlite/G3D/AABox.h index 699a3d94674..b1b1477fe9f 100644 --- a/dep/include/g3dlite/G3D/AABox.h +++ b/dep/include/g3dlite/G3D/AABox.h @@ -65,7 +65,6 @@ public: hi = high; } - inline const Vector3& low() const { return lo; } @@ -251,6 +250,5 @@ inline unsigned int hashCode(const G3D::AABox& b) { return b.hashCode(); } - #endif diff --git a/dep/include/g3dlite/G3D/Array.h b/dep/include/g3dlite/G3D/Array.h index f58ee5eeedb..34401af40c4 100644 --- a/dep/include/g3dlite/G3D/Array.h +++ b/dep/include/g3dlite/G3D/Array.h @@ -33,7 +33,6 @@ # pragma warning( disable : 4786) #endif - namespace G3D { /** @@ -60,7 +59,6 @@ const int SORT_DECREASING = -1; If SSE is defined Arrays allocate the first element aligned to 16 bytes. - Array is highly optimized compared to std::vector. Array operations are less expensive than on std::vector and for large amounts of data, Array consumes only 1.5x the total size of the @@ -120,13 +118,11 @@ private: return (address >= data) && (address < data + num); } - /** Only compiled if you use the sort procedure. */ static bool __cdecl compareGT(const T& a, const T& b) { return a > b; } - /** Allocates a new array of size numAllocated (not a parameter to the method) and then copies at most oldNum elements from the old array to it. Destructors are @@ -163,7 +159,6 @@ private: ptr->~T(); }} - System::alignedFree(oldData); } @@ -255,7 +250,6 @@ public: numAllocated = 0; } - /** Removes all elements. Use resize(0, false) or fastClear if you want to remove all elements without deallocating the underlying array @@ -329,7 +323,6 @@ public: resize(n, false); } - /** Inserts at the specified index and shifts all other elements up by one. */ @@ -444,7 +437,6 @@ public: } } - inline void append(const T& v1, const T& v2) { if (inArray(&v1) || inArray(&v2)) { T t1 = v1; @@ -463,7 +455,6 @@ public: } } - inline void append(const T& v1, const T& v2, const T& v3) { if (inArray(&v1) || inArray(&v2) || inArray(&v3)) { T t1 = v1; @@ -485,7 +476,6 @@ public: } } - inline void append(const T& v1, const T& v2, const T& v3, const T& v4) { if (inArray(&v1) || inArray(&v2) || inArray(&v3) || inArray(&v4)) { T t1 = v1; @@ -614,7 +604,6 @@ public: resize(num - 1, shrinkUnderlyingArrayIfNecessary); } - /** "The member function swaps the controlled sequences between *this and str." Note that this is slower than the optimal std implementation. @@ -627,7 +616,6 @@ public: *this = temp; } - /** Performs bounds checks in debug mode */ @@ -832,7 +820,6 @@ public: std::sort(data, data + num, lessThan); } - /** Sorts the array in increasing order using the > or < operator. To invoke this method on Array<T>, T must override those operator. @@ -1118,7 +1105,6 @@ public: medianPartition(ltMedian, eqMedian, gtMedian, temp, DefaultComparator()); } - /** Redistributes the elements so that the new order is statistically independent of the original order. O(n) time.*/ void randomize() { @@ -1133,10 +1119,8 @@ public: } } - }; - /** Array::contains for C-arrays */ template<class T> bool contains(const T* array, int len, const T& e) { for (int i = len - 1; i >= 0; --i) { diff --git a/dep/include/g3dlite/G3D/Box.h b/dep/include/g3dlite/G3D/Box.h index 8ec7ea3408d..3ac3c61d0f6 100644 --- a/dep/include/g3dlite/G3D/Box.h +++ b/dep/include/g3dlite/G3D/Box.h @@ -28,7 +28,6 @@ class CoordinateFrame; /** An arbitrary 3D box, useful as a bounding box. - To construct a box from a coordinate frame, center and extent, use the idiom: <CODE>Box box = cframe.toObjectSpace(Box(center - extent/2, center + extent/2));</CODE> @@ -86,7 +85,6 @@ public: Box(const class AABox& b); - /** Returns the object to world transformation for this box. localFrame().worldToObject(...) takes diff --git a/dep/include/g3dlite/G3D/CollisionDetection.h b/dep/include/g3dlite/G3D/CollisionDetection.h index 4add967ed8b..5e95498ffed 100644 --- a/dep/include/g3dlite/G3D/CollisionDetection.h +++ b/dep/include/g3dlite/G3D/CollisionDetection.h @@ -1,7 +1,6 @@ /** @file CollisionDetection.h - Moving collision detection for simple primitives. @author Morgan McGuire, matrix@graphics3d.com @@ -32,7 +31,6 @@ namespace G3D { - /** Collision detection primitives and tools for building higher order collision detection schemes. @@ -108,7 +106,6 @@ private: */ static Array<Vector3> ignoreArray; - // Static class! CollisionDetection() {} virtual ~CollisionDetection() {} @@ -183,7 +180,6 @@ public: const double* ad, const double* bd); - /** Creates a set of standard information about two boxes in order to solve for their collision. This information includes a vector to diff --git a/dep/include/g3dlite/G3D/Crypto.h b/dep/include/g3dlite/G3D/Crypto.h index 2805e8590c2..0bd5b75efca 100644 --- a/dep/include/g3dlite/G3D/Crypto.h +++ b/dep/include/g3dlite/G3D/Crypto.h @@ -3,7 +3,6 @@ @maintainer Morgan McGuire, matrix@graphics3d.com - @created 2006-03-29 @edited 2006-04-06 */ diff --git a/dep/include/g3dlite/G3D/GCamera.h b/dep/include/g3dlite/G3D/GCamera.h index 50d5ca2244e..7bf8e26e562 100644 --- a/dep/include/g3dlite/G3D/GCamera.h +++ b/dep/include/g3dlite/G3D/GCamera.h @@ -81,7 +81,6 @@ public: virtual ~GCamera(); - CoordinateFrame getCoordinateFrame() const; void getCoordinateFrame(CoordinateFrame& c) const; void setCoordinateFrame(const CoordinateFrame& c); @@ -152,14 +151,12 @@ public: float getImagePlaneDepth( const class Rect2D& viewport) const; - /** Returns the world space ray passing through the center of pixel (x, y) on the image plane. The pixel x and y axes are opposite the 3D object space axes: (0,0) is the upper left corner of the screen. They are in viewport coordinates, not screen coordinates. - Integer (x, y) values correspond to the upper left corners of pixels. If you want to cast rays through pixel centers, add 0.5 to x and y. @@ -169,7 +166,6 @@ public: float y, const class Rect2D& viewport) const; - /** Returns a negative z-value. */ diff --git a/dep/include/g3dlite/G3D/Line.h b/dep/include/g3dlite/G3D/Line.h index 724d5ef88cb..fedcb4d8cf0 100644 --- a/dep/include/g3dlite/G3D/Line.h +++ b/dep/include/g3dlite/G3D/Line.h @@ -81,6 +81,5 @@ public: };// namespace - #endif diff --git a/dep/include/g3dlite/G3D/Matrix3.h b/dep/include/g3dlite/G3D/Matrix3.h index 0fd85b306c9..99e049654ee 100644 --- a/dep/include/g3dlite/G3D/Matrix3.h +++ b/dep/include/g3dlite/G3D/Matrix3.h @@ -54,7 +54,6 @@ public: @cite Implementation from Watt and Watt, pg 362*/ Matrix3(const class Quat& q); - /** Sets all elements. */ @@ -126,7 +125,6 @@ public: return kProd; } - /** * vector * matrix [1x3 * 3x3 = 1x3] */ @@ -288,7 +286,6 @@ protected: }; - //---------------------------------------------------------------------------- /** <code>v * M == M.transpose() * v</code> */ inline Vector3 operator* (const Vector3& rkPoint, const Matrix3& rkMatrix) { @@ -304,7 +301,6 @@ inline Vector3 operator* (const Vector3& rkPoint, const Matrix3& rkMatrix) { return kProd; } - } // namespace #endif diff --git a/dep/include/g3dlite/G3D/Quat.h b/dep/include/g3dlite/G3D/Quat.h index f53d70be909..5fc30e8ec49 100644 --- a/dep/include/g3dlite/G3D/Quat.h +++ b/dep/include/g3dlite/G3D/Quat.h @@ -209,13 +209,11 @@ public: return (*this) * other.inverse(); } - /** Is the magnitude nearly 1.0? */ inline bool isUnit(float tolerance = 1e-5) const { return abs(dot(*this) - 1.0f) < tolerance; } - inline float magnitude() const { return sqrtf(dot(*this)); } @@ -268,7 +266,6 @@ public: return Quat(sinf(A) * v, cosf(A)); } - /** Raise this quaternion to a power. For a rotation, this is the effect of rotating x times as much as the original @@ -281,7 +278,6 @@ public: return (log() * x).exp(); } - /** @deprecated Use toUnit() @@ -695,8 +691,6 @@ inline G3D::Quat pow(const G3D::Quat& q, double x) { return q.pow((float)x); } - - #include "Quat.inl" #endif diff --git a/dep/include/g3dlite/G3D/Quat.inl b/dep/include/g3dlite/G3D/Quat.inl index 705cb0455d4..9e4c861d93b 100644 --- a/dep/include/g3dlite/G3D/Quat.inl +++ b/dep/include/g3dlite/G3D/Quat.inl @@ -1,11 +1,11 @@ /** Quat.inl - - @cite Quaternion implementation based on Watt & Watt page 363. + + @cite Quaternion implementation based on Watt & Watt page 363. Thanks to Max McGuire for slerp optimizations. - + @maintainer Morgan McGuire, matrix@graphics3d.com - + @created 2002-01-23 @edited 2004-03-04 */ @@ -24,8 +24,6 @@ inline const float& Quat::operator[] (int i) const { return ((float*)this)[i]; } - - inline Quat Quat::operator-(const Quat& other) const { return Quat(x - other.x, y - other.y, z - other.z, w - other.w); } diff --git a/dep/include/g3dlite/G3D/Ray.h b/dep/include/g3dlite/G3D/Ray.h index 3929cf1e6ac..740f307d88c 100644 --- a/dep/include/g3dlite/G3D/Ray.h +++ b/dep/include/g3dlite/G3D/Ray.h @@ -121,7 +121,6 @@ public: const Vector3& edge01, const Vector3& edge02) const; - inline float intersectionTime( const Vector3& vert0, const Vector3& vert1, @@ -130,7 +129,6 @@ public: return intersectionTime(vert0, vert1, vert2, vert1 - vert0, vert2 - vert0); } - inline float intersectionTime( const Vector3& vert0, const Vector3& vert1, @@ -177,7 +175,6 @@ public: const Vector3& normal) const; }; - #define EPSILON 0.000001 #define CROSS(dest,v1,v2) \ dest[0]=v1[1]*v2[2]-v1[2]*v2[1]; \ @@ -236,7 +233,6 @@ inline float Ray::intersectionTime( return (float)inf(); } - // Case where we don't need correct (u, v): const float t = DOT(edge2, qvec); @@ -249,7 +245,6 @@ inline float Ray::intersectionTime( } } - inline float Ray::intersectionTime( const Vector3& vert0, const Vector3& vert1, diff --git a/dep/include/g3dlite/G3D/System.h b/dep/include/g3dlite/G3D/System.h index ab5a8d60a76..81abff3fb50 100644 --- a/dep/include/g3dlite/G3D/System.h +++ b/dep/include/g3dlite/G3D/System.h @@ -22,7 +22,6 @@ # include <CoreServices/CoreServices.h> #endif - namespace G3D { typedef double RealTime; @@ -116,7 +115,6 @@ public: }; - } // namespace #endif diff --git a/dep/include/g3dlite/G3D/Table.h b/dep/include/g3dlite/G3D/Table.h index 1d021daae2b..aded5c38555 100644 --- a/dep/include/g3dlite/G3D/Table.h +++ b/dep/include/g3dlite/G3D/Table.h @@ -28,7 +28,6 @@ # pragma warning (disable : 4786) #endif - template<typename Key> struct GHashCode{}; @@ -76,7 +75,6 @@ struct GHashCode<std::string> namespace G3D { - /** An unordered data structure mapping keys to values. @@ -103,7 +101,6 @@ namespace G3D { And rely on the default enum operator==. - Periodically check that debugGetLoad() is low (> 0.1). When it gets near 1.0 your hash function is badly designed and maps too many inputs to the same output. @@ -131,7 +128,6 @@ private: Entry entry; Node* next; - /** Provide pooled allocation for speed. */ inline void* operator new (size_t size) { return System::malloc(size); @@ -141,7 +137,6 @@ private: System::free(p); } - Node(Key key, Value value, size_t hashCode, Node* next) { this->entry.key = key; this->entry.value = value; @@ -419,7 +414,6 @@ public: } }; - /** C++ STL style iterator method. Returns the first Entry, which contains a key and value. Use preincrement (++entry) to get to @@ -448,7 +442,6 @@ public: System::memset(bucket, 0, sizeof(Node*) * numBuckets); } - /** Returns the number of keys. */ @@ -456,7 +449,6 @@ public: return _size; } - /** If you insert a pointer into the key or value of a table, you are responsible for deallocating the object eventually. Inserting @@ -546,7 +538,6 @@ public: n = n->next; } while (n != NULL); - alwaysAssertM(false, "Tried to remove a key that was not in the table."); } @@ -616,7 +607,6 @@ public: return false; } - /** Short syntax for get. */ @@ -624,7 +614,6 @@ public: return get(key); } - /** Returns an array of all of the keys in the table. You can iterate over the keys to get the values. diff --git a/dep/include/g3dlite/G3D/Vector2.h b/dep/include/g3dlite/G3D/Vector2.h index 3d66e654f93..273ab6b4d07 100644 --- a/dep/include/g3dlite/G3D/Vector2.h +++ b/dep/include/g3dlite/G3D/Vector2.h @@ -144,8 +144,6 @@ public: /** Largest representable vector */ static const Vector2& maxFinite(); - - // Deprecated. See Matrix3::identity() for details. /** @deprecated Use Vector2::zero() */ static const Vector2 ZERO; @@ -207,53 +205,42 @@ inline Vector2 operator*(int s, const Vector2& v) { return v * (float)s; } - inline unsigned int hashCode(const G3D::Vector2& v) { return v.hashCode(); } - inline Vector2::Vector2 () : x(0.0f), y(0.0f) { } - inline Vector2::Vector2(float _x, float _y) : x(_x), y(_y) { } - inline Vector2::Vector2 (float afCoordinate[2]) { x = afCoordinate[0]; y = afCoordinate[1]; } - - inline Vector2::Vector2 (double afCoordinate[2]) { x = (float)afCoordinate[0]; y = (float)afCoordinate[1]; } - inline Vector2::Vector2 (const Vector2& rkVector) { x = rkVector.x; y = rkVector.y; } - inline Vector2::Vector2 (const Vector2int16& v) : x(v.x), y(v.y) { } - inline float& Vector2::operator[] (int i) { return ((float*)this)[i]; } - inline const float& Vector2::operator[] (int i) const { return ((float*)this)[i]; } - inline Vector2::operator float* () { return (float*)this; } @@ -262,62 +249,48 @@ inline Vector2::operator const float* () const { return (float*)this; } - inline Vector2& Vector2::operator= (const Vector2& rkVector) { x = rkVector.x; y = rkVector.y; return *this; } - inline bool Vector2::operator== (const Vector2& rkVector) const { return ( x == rkVector.x && y == rkVector.y); } - inline bool Vector2::operator!= (const Vector2& rkVector) const { return ( x != rkVector.x || y != rkVector.y); } - inline Vector2 Vector2::operator+ (const Vector2& rkVector) const { return Vector2(x + rkVector.x, y + rkVector.y); } - inline Vector2 Vector2::operator- (const Vector2& rkVector) const { return Vector2(x - rkVector.x, y - rkVector.y); } - inline Vector2 Vector2::operator* (float fScalar) const { return Vector2(fScalar*x, fScalar*y); } - - inline Vector2 Vector2::operator- () const { return Vector2( -x, -y); } - - inline Vector2& Vector2::operator+= (const Vector2& rkVector) { x += rkVector.x; y += rkVector.y; return *this; } - - inline Vector2& Vector2::operator-= (const Vector2& rkVector) { x -= rkVector.x; y -= rkVector.y; return *this; } - - inline Vector2& Vector2::operator*= (float fScalar) { x *= fScalar; y *= fScalar; @@ -325,44 +298,34 @@ inline Vector2& Vector2::operator*= (float fScalar) { } - - inline Vector2& Vector2::operator*= (const Vector2& rkVector) { x *= rkVector.x; y *= rkVector.y; return *this; } - - inline Vector2& Vector2::operator/= (const Vector2& rkVector) { x /= rkVector.x; y /= rkVector.y; return *this; } - inline Vector2 Vector2::operator* (const Vector2& rkVector) const { return Vector2(x * rkVector.x, y * rkVector.y); } - - inline Vector2 Vector2::operator/ (const Vector2& rkVector) const { return Vector2(x / rkVector.x, y / rkVector.y); } - inline float Vector2::squaredLength () const { return x*x + y*y; } - inline float Vector2::length () const { return sqrtf(x*x + y*y); } - inline Vector2 Vector2::direction () const { float lenSquared = x * x + y * y; @@ -373,50 +336,34 @@ inline Vector2 Vector2::direction () const { } } - - inline float Vector2::dot (const Vector2& rkVector) const { return x*rkVector.x + y*rkVector.y; } - - inline Vector2 Vector2::min(const Vector2 &v) const { return Vector2(G3D::min(v.x, x), G3D::min(v.y, y)); } - - inline Vector2 Vector2::max(const Vector2 &v) const { return Vector2(G3D::max(v.x, x), G3D::max(v.y, y)); } - - inline bool Vector2::fuzzyEq(const Vector2& other) const { return G3D::fuzzyEq((*this - other).squaredLength(), 0); } - - inline bool Vector2::fuzzyNe(const Vector2& other) const { return G3D::fuzzyNe((*this - other).squaredLength(), 0); } - - inline bool Vector2::isFinite() const { return G3D::isFinite(x) && G3D::isFinite(y); } - - inline bool Vector2::isZero() const { return (x == 0.0f) && (y == 0.0f); } - - inline bool Vector2::isUnit() const { return squaredLength() == 1.0f; } @@ -431,9 +378,7 @@ inline G3D::Vector2 operator*(int s, const G3D::Vector2& v) { return v * (float)s; } - inline unsigned int hashCode(const G3D::Vector2& v); - #endif diff --git a/dep/include/g3dlite/G3D/Vector2.inl b/dep/include/g3dlite/G3D/Vector2.inl index 27abecf02ce..4f7c55a39cf 100644 --- a/dep/include/g3dlite/G3D/Vector2.inl +++ b/dep/include/g3dlite/G3D/Vector2.inl @@ -1,13 +1,12 @@ /** @file Vector2.inl - + @maintainer Morgan McGuire, matrix@graphics3d.com @cite Portions by Laura Wollstadt, graphics3d.com - + @cite Portions based on Dave Eberly'x Magic Software Library at http://www.magic-software.com - - + @created 2001-06-02 @edited 2006-01-14 @@ -15,6 +14,5 @@ All rights reserved. */ - } diff --git a/dep/include/g3dlite/G3D/Vector2int16.h b/dep/include/g3dlite/G3D/Vector2int16.h index 40f39bae43d..c4211b0aaab 100644 --- a/dep/include/g3dlite/G3D/Vector2int16.h +++ b/dep/include/g3dlite/G3D/Vector2int16.h @@ -52,7 +52,6 @@ public: return ((G3D::int16*)this)[i]; } - inline bool operator== (const Vector2int16& rkVector) const { return ((int32*)this)[0] == ((int32*)&rkVector)[0]; } diff --git a/dep/include/g3dlite/G3D/Vector3.h b/dep/include/g3dlite/G3D/Vector3.h index 9f46bf87233..140eb284e12 100644 --- a/dep/include/g3dlite/G3D/Vector3.h +++ b/dep/include/g3dlite/G3D/Vector3.h @@ -41,7 +41,6 @@ b = v.xz(); j = b.xx(); </PRE> - <B>Warning</B> Do not subclass-- this implementation makes assumptions about the @@ -160,7 +159,6 @@ public: */ Vector3 fastDirection() const; - /** See also G3D::Ray::reflect. The length is 1. @@ -174,7 +172,6 @@ public: */ Vector3 reflectionDirection(const Vector3& normal) const; - /** Returns Vector3::zero() if the length is nearly zero, otherwise returns a unit vector. @@ -302,7 +299,6 @@ public: */ static Vector3 cosRandom(const Vector3& normal); - /** Random vector distributed over the hemisphere about normal. */ diff --git a/dep/include/g3dlite/G3D/Vector3.inl b/dep/include/g3dlite/G3D/Vector3.inl index e2f328165bb..9211c2a70fd 100644 --- a/dep/include/g3dlite/G3D/Vector3.inl +++ b/dep/include/g3dlite/G3D/Vector3.inl @@ -1,4 +1,4 @@ -/** +/** @file Vector3.inl @maintainer Morgan McGuire, matrix@graphics3d.com @@ -66,7 +66,6 @@ inline float& Vector3::operator[] (int i) { return ((float*)this)[i]; } - //---------------------------------------------------------------------------- inline Vector3& Vector3::operator= (const Vector3& rkVector) { x = rkVector.x; diff --git a/dep/include/g3dlite/G3D/Vector4.inl b/dep/include/g3dlite/G3D/Vector4.inl index 48ebf542723..576cca83b56 100644 --- a/dep/include/g3dlite/G3D/Vector4.inl +++ b/dep/include/g3dlite/G3D/Vector4.inl @@ -1,4 +1,4 @@ -/** +/** @file Vector4.inl @maintainer Morgan McGuire, matrix@graphics3d.com @@ -131,10 +131,9 @@ inline Vector4& Vector4::operator-= (const Vector4& rkVector) { //---------------------------------------------------------------------------- inline Vector4 Vector4::lerp(const Vector4& v, float alpha) const { - return (*this) + (v - *this) * alpha; + return (*this) + (v - *this) * alpha; } - //---------------------------------------------------------------------------- inline Vector4& Vector4::operator*= (float fScalar) { x *= fScalar; @@ -144,7 +143,6 @@ inline Vector4& Vector4::operator*= (float fScalar) { return *this; } - //---------------------------------------------------------------------------- inline float Vector4::dot(const Vector4& rkVector) const { return x*rkVector.x + y*rkVector.y + z*rkVector.z + w*rkVector.w; diff --git a/dep/include/g3dlite/G3D/format.h b/dep/include/g3dlite/G3D/format.h index fd129381791..b2948bfcd25 100644 --- a/dep/include/g3dlite/G3D/format.h +++ b/dep/include/g3dlite/G3D/format.h @@ -51,7 +51,6 @@ std::string vformat( const char* fmt, va_list argPtr) G3D_CHECK_VPRINTF_ARGS; - }; // namespace #endif diff --git a/dep/include/g3dlite/G3D/g3dmath.h b/dep/include/g3dlite/G3D/g3dmath.h index 38ee23fc3c1..ecf355157c1 100644 --- a/dep/include/g3dlite/G3D/g3dmath.h +++ b/dep/include/g3dlite/G3D/g3dmath.h @@ -100,12 +100,10 @@ __inline long int lrintf(float flt) { return (long int)floorf(flt+0.5f); } - #endif #endif - const double fuzzyEpsilon = 0.00001; /** Returns a reference to a static double. @@ -225,7 +223,6 @@ inline int iSign(float f) { return iSign((double)f); } - /** Fast round to integer using the lrint routine. Typically 6x faster than casting to integer. @@ -459,7 +456,6 @@ inline float dot(float a, float b) { return a * b; } - /** a * b (for DirectX/Cg support) */ @@ -478,7 +474,6 @@ inline double rsqrt(double x) { return 1.0 / sqrt(x); } - /** sin(x)/x */ @@ -512,7 +507,6 @@ inline double wrap(double t, double hi) { return wrap(t, 0, hi); } - } // namespace #ifdef _MSC_VER diff --git a/dep/include/g3dlite/G3D/g3dmath.inl b/dep/include/g3dlite/G3D/g3dmath.inl index ad685bc5ce4..9bf661a7ebc 100644 --- a/dep/include/g3dlite/G3D/g3dmath.inl +++ b/dep/include/g3dlite/G3D/g3dmath.inl @@ -1,8 +1,8 @@ /** @file g3dmath.inl - + @maintainer Morgan McGuire, matrix@graphics3d.com - + @created 2001-06-02 @edited 2006-01-14 */ @@ -159,7 +159,6 @@ inline float uniformRandom(float low, float hi) { return (hi - low) * float(::rand()) / float(RAND_MAX) + low; } - //---------------------------------------------------------------------------- inline double G3D_DEPRECATED symmetricRandom () { return 2.0 * double(::rand()) / double(RAND_MAX) - 1.0; diff --git a/dep/include/g3dlite/G3D/platform.h b/dep/include/g3dlite/G3D/platform.h index 16f9b208d18..136413d1d9d 100644 --- a/dep/include/g3dlite/G3D/platform.h +++ b/dep/include/g3dlite/G3D/platform.h @@ -49,7 +49,6 @@ #error Unknown platform #endif - // Default to compiling with SSE, but if you want to compile // without installing SP5.0 and the Processor Pack on Windows, compile with NO_SSE // defined (can be passed to the compiler command line with /D "NO_SSE") @@ -73,7 +72,6 @@ # endif #endif - // Verify that the supported compilers are being used and that this is a known // processor. @@ -102,7 +100,6 @@ # define G3D_CHECK_VPRINTF_ARGS __attribute__((__format__(__printf__, 1, 0))) #endif - #ifdef G3D_OSX #ifndef __GNUC__ #error G3D only supports the gcc compiler on OS X. @@ -132,7 +129,6 @@ # define G3D_CHECK_VPRINTF_ARGS __attribute__((__format__(__printf__, 1, 0))) #endif - #ifdef G3D_WIN32 // Microsoft Visual C++ 7.1 _MSC_VER = 1310 // Microsoft Visual C++ 7.0 _MSC_VER = 1300 @@ -234,7 +230,6 @@ # define WIN32_LEAN_AND_MEAN 1 # endif - # define NOMINMAX 1 # include <windows.h> # undef WIN32_LEAN_AND_MEAN diff --git a/dep/include/mersennetwister/MersenneTwister.h b/dep/include/mersennetwister/MersenneTwister.h index 0fbd9242e45..a4a3bbdd415 100644 --- a/dep/include/mersennetwister/MersenneTwister.h +++ b/dep/include/mersennetwister/MersenneTwister.h @@ -80,7 +80,6 @@ protected: uint32 *pNext; // next value to get from state int left; // number of values left before reload needed - //Methods public: MTRand( const uint32& oneSeed ); // initialize with a simple uint32 @@ -218,7 +217,6 @@ inline MTRand::uint32 MTRand::randInt( const uint32& n ) return i; } - inline void MTRand::seed( const uint32 oneSeed ) { // Seed the generator with a simple uint32 @@ -226,7 +224,6 @@ inline void MTRand::seed( const uint32 oneSeed ) reload(); } - inline void MTRand::seed( uint32 *const bigSeed, const uint32 seedLength ) { // Seed the generator with an array of uint32's @@ -239,7 +236,7 @@ inline void MTRand::seed( uint32 *const bigSeed, const uint32 seedLength ) register int i = 1; register uint32 j = 0; register int k = ( N > int(seedLength) ? N : int(seedLength) ); - for( ; k; --k ) + for (; k; --k ) { state[i] = state[i] ^ ( (state[i-1] ^ (state[i-1] >> 30)) * 1664525UL ); @@ -249,7 +246,7 @@ inline void MTRand::seed( uint32 *const bigSeed, const uint32 seedLength ) if( i >= N ) { state[0] = state[N-1]; i = 1; } if( j >= seedLength ) j = 0; } - for( k = N - 1; k; --k ) + for (k = N - 1; k; --k ) { state[i] = state[i] ^ ( (state[i-1] ^ (state[i-1] >> 30)) * 1566083941UL ); @@ -262,14 +259,12 @@ inline void MTRand::seed( uint32 *const bigSeed, const uint32 seedLength ) reload(); } - inline void MTRand::seed() { // Seed the generator with hash of time() and clock() values seed( hash( time(NULL), clock() ) ); } - inline void MTRand::initialize( const uint32 seed ) { // Initialize generator state with seed @@ -280,30 +275,28 @@ inline void MTRand::initialize( const uint32 seed ) register uint32 *r = state; register int i = 1; *s++ = seed & 0xffffffffUL; - for( ; i < N; ++i ) + for (; i < N; ++i ) { *s++ = ( 1812433253UL * ( *r ^ (*r >> 30) ) + i ) & 0xffffffffUL; r++; } } - inline void MTRand::reload() { // Generate N new values in state // Made clearer and faster by Matthew Bellew (matthew.bellew@home.com) register uint32 *p = state; register int i; - for( i = N - M; i--; ++p ) + for (i = N - M; i--; ++p ) *p = twist( p[M], p[0], p[1] ); - for( i = M; --i; ++p ) + for (i = M; --i; ++p ) *p = twist( p[M-N], p[0], p[1] ); *p = twist( p[M-N], p[0], state[0] ); left = N, pNext = state; } - inline MTRand::uint32 MTRand::hash( time_t t, clock_t c ) { // Get a uint32 from t and c @@ -314,14 +307,14 @@ inline MTRand::uint32 MTRand::hash( time_t t, clock_t c ) uint32 h1 = 0; unsigned char *p = (unsigned char *) &t; - for( size_t i = 0; i < sizeof(t); ++i ) + for (size_t i = 0; i < sizeof(t); ++i ) { h1 *= UCHAR_MAX + 2U; h1 += p[i]; } uint32 h2 = 0; p = (unsigned char *) &c; - for( size_t j = 0; j < sizeof(c); ++j ) + for (size_t j = 0; j < sizeof(c); ++j ) { h2 *= UCHAR_MAX + 2U; h2 += p[j]; @@ -329,23 +322,21 @@ inline MTRand::uint32 MTRand::hash( time_t t, clock_t c ) return ( h1 + differ++ ) ^ h2; } - inline void MTRand::save( uint32* saveArray ) const { register uint32 *sa = saveArray; register const uint32 *s = state; register int i = N; - for( ; i--; *sa++ = *s++ ) {} + for (; i--; *sa++ = *s++ ) {} *sa = left; } - inline void MTRand::load( uint32 *const loadArray ) { register uint32 *s = state; register uint32 *la = loadArray; register int i = N; - for( ; i--; *s++ = *la++ ) {} + for (; i--; *s++ = *la++ ) {} left = *la; pNext = &state[N-left]; } @@ -355,16 +346,15 @@ inline std::ostream& operator<<( std::ostream& os, const MTRand& mtrand ) { register const MTRand::uint32 *s = mtrand.state; register int i = mtrand.N; - for( ; i--; os << *s++ << "\t" ) {} + for (; i--; os << *s++ << "\t" ) {} return os << mtrand.left; } - inline std::istream& operator>>( std::istream& is, MTRand& mtrand ) { register MTRand::uint32 *s = mtrand.state; register int i = mtrand.N; - for( ; i--; is >> *s++ ) {} + for (; i--; is >> *s++ ) {} is >> mtrand.left; mtrand.pNext = &mtrand.state[mtrand.N-mtrand.left]; return is; diff --git a/dep/include/sockets/Base64.h b/dep/include/sockets/Base64.h index b1fd5364fc2..d4323aaa019 100644 --- a/dep/include/sockets/Base64.h +++ b/dep/include/sockets/Base64.h @@ -68,7 +68,6 @@ static const char *bstr; static const char rstr[128]; }; - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/include/sockets/Exception.h b/dep/include/sockets/Exception.h index ae48ab765ba..bb881b2d74f 100644 --- a/dep/include/sockets/Exception.h +++ b/dep/include/sockets/Exception.h @@ -29,8 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. namespace SOCKETS_NAMESPACE { #endif - - class Exception { public: @@ -48,8 +46,6 @@ private: }; - - #ifdef SOCKETS_NAMESPACE } // namespace SOCKETS_NAMESPACE { #endif diff --git a/dep/include/sockets/File.h b/dep/include/sockets/File.h index e1d00ec38c7..ed322efa2d8 100644 --- a/dep/include/sockets/File.h +++ b/dep/include/sockets/File.h @@ -38,7 +38,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. namespace SOCKETS_NAMESPACE { #endif - /** IFile implementation of a disk file. \ingroup file */ class File : public IFile @@ -74,8 +73,6 @@ private: }; - - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/include/sockets/IFile.h b/dep/include/sockets/IFile.h index e1e39727b52..657c8a4b1d9 100644 --- a/dep/include/sockets/IFile.h +++ b/dep/include/sockets/IFile.h @@ -62,7 +62,6 @@ public: }; - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/include/sockets/ISocketHandler.h b/dep/include/sockets/ISocketHandler.h index bb1aa42bafc..940783c104b 100644 --- a/dep/include/sockets/ISocketHandler.h +++ b/dep/include/sockets/ISocketHandler.h @@ -54,7 +54,6 @@ typedef enum { class SocketAddress; class Mutex; - /** Socket container class, event generator. \ingroup basic */ class ISocketHandler @@ -223,7 +222,6 @@ public: }; - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/include/sockets/Ipv4Address.h b/dep/include/sockets/Ipv4Address.h index ba2292425a0..71d925254e9 100644 --- a/dep/include/sockets/Ipv4Address.h +++ b/dep/include/sockets/Ipv4Address.h @@ -26,12 +26,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "sockets-config.h" #include "SocketAddress.h" - #ifdef SOCKETS_NAMESPACE namespace SOCKETS_NAMESPACE { #endif - /* Ipv4 address implementation. \ingroup basic */ class Ipv4Address : public SocketAddress @@ -89,8 +87,6 @@ private: }; - - #ifdef SOCKETS_NAMESPACE } // namespace SOCKETS_NAMESPACE { #endif diff --git a/dep/include/sockets/Ipv6Address.h b/dep/include/sockets/Ipv6Address.h index 9bd651786bc..20c68d8c92d 100644 --- a/dep/include/sockets/Ipv6Address.h +++ b/dep/include/sockets/Ipv6Address.h @@ -35,7 +35,6 @@ typedef unsigned __int32 uint32_t; namespace SOCKETS_NAMESPACE { #endif - /** Ipv6 address implementation. \ingroup basic */ class Ipv6Address : public SocketAddress @@ -96,8 +95,6 @@ private: }; - - #ifdef SOCKETS_NAMESPACE } // namespace SOCKETS_NAMESPACE { #endif diff --git a/dep/include/sockets/ListenSocket.h b/dep/include/sockets/ListenSocket.h index 80aa48f20b4..8934a809d0e 100644 --- a/dep/include/sockets/ListenSocket.h +++ b/dep/include/sockets/ListenSocket.h @@ -51,7 +51,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. namespace SOCKETS_NAMESPACE { #endif - /** Binds incoming port number to new Socket class X. \ingroup basic */ template <class X> @@ -410,8 +409,6 @@ private: bool m_bHasCreate; }; - - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/include/sockets/Lock.h b/dep/include/sockets/Lock.h index e819537ef26..f3bb9273920 100644 --- a/dep/include/sockets/Lock.h +++ b/dep/include/sockets/Lock.h @@ -50,8 +50,6 @@ private: }; - - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/include/sockets/Mutex.h b/dep/include/sockets/Mutex.h index 8fce2ce08ba..e42a57c3262 100644 --- a/dep/include/sockets/Mutex.h +++ b/dep/include/sockets/Mutex.h @@ -60,7 +60,6 @@ private: #endif }; - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/include/sockets/Parse.h b/dep/include/sockets/Parse.h index 4b42ea768b2..52bd9327e28 100644 --- a/dep/include/sockets/Parse.h +++ b/dep/include/sockets/Parse.h @@ -43,7 +43,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. namespace SOCKETS_NAMESPACE { #endif - /***************************************************/ /* interface of class Parse */ @@ -92,7 +91,6 @@ private: bool pa_quote; }; - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/include/sockets/ResolvServer.h b/dep/include/sockets/ResolvServer.h index b713a8ad382..409c9b7a619 100644 --- a/dep/include/sockets/ResolvServer.h +++ b/dep/include/sockets/ResolvServer.h @@ -62,8 +62,6 @@ private: }; - - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/include/sockets/ResolvSocket.h b/dep/include/sockets/ResolvSocket.h index 38ff3335c28..60743736e08 100644 --- a/dep/include/sockets/ResolvSocket.h +++ b/dep/include/sockets/ResolvSocket.h @@ -95,8 +95,6 @@ private: }; - - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/include/sockets/SctpSocket.h b/dep/include/sockets/SctpSocket.h index 50757fc4b13..ed507fb1880 100644 --- a/dep/include/sockets/SctpSocket.h +++ b/dep/include/sockets/SctpSocket.h @@ -36,7 +36,6 @@ namespace SOCKETS_NAMESPACE { class SocketAddress; - class SctpSocket : public StreamSocket { public: @@ -99,7 +98,6 @@ private: char *m_buf; ///< Temporary receive buffer }; - #ifdef SOCKETS_NAMESPACE } // namespace SOCKETS_NAMESPACE #endif diff --git a/dep/include/sockets/Socket.h b/dep/include/sockets/Socket.h index 8a7fdc9d2fd..23a806b5ea1 100644 --- a/dep/include/sockets/Socket.h +++ b/dep/include/sockets/Socket.h @@ -43,17 +43,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "SocketAddress.h" #include "Thread.h" - #ifdef SOCKETS_NAMESPACE namespace SOCKETS_NAMESPACE { #endif - class ISocketHandler; class SocketAddress; class IFile; - /** \defgroup basic Basic sockets */ /** Socket base class. \ingroup basic */ @@ -471,7 +468,6 @@ public: // TCP options in TcpSocket.h/TcpSocket.cpp - #ifdef HAVE_OPENSSL /** @name SSL Support */ //@{ @@ -734,7 +730,6 @@ static WSAInitializer m_winsock_init; ///< Winsock initialization singleton cla } #endif - #endif // _SOCKETS_Socket_H diff --git a/dep/include/sockets/SocketAddress.h b/dep/include/sockets/SocketAddress.h index 496600b112c..abdbbfd2cf6 100644 --- a/dep/include/sockets/SocketAddress.h +++ b/dep/include/sockets/SocketAddress.h @@ -32,7 +32,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. namespace SOCKETS_NAMESPACE { #endif - /** This class and its subclasses is intended to be used as replacement for the internal data type 'ipaddr_t' and various implementations of @@ -86,8 +85,6 @@ public: }; - - #ifdef SOCKETS_NAMESPACE } // namespace SOCKETS_NAMESPACE { #endif diff --git a/dep/include/sockets/SocketHandler.h b/dep/include/sockets/SocketHandler.h index 1812c9c386f..5598ec4249b 100644 --- a/dep/include/sockets/SocketHandler.h +++ b/dep/include/sockets/SocketHandler.h @@ -41,7 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. namespace SOCKETS_NAMESPACE { #endif - class Socket; #ifdef ENABLE_RESOLVER class ResolvServer; @@ -257,7 +256,6 @@ private: #endif }; - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/include/sockets/StdLog.h b/dep/include/sockets/StdLog.h index 8266479f21c..3ff68d6e9ea 100644 --- a/dep/include/sockets/StdLog.h +++ b/dep/include/sockets/StdLog.h @@ -46,7 +46,6 @@ typedef enum LOG_LEVEL_INFO } loglevel_t; - class ISocketHandler; class Socket; @@ -65,7 +64,6 @@ public: loglevel_t = LOG_LEVEL_WARNING) = 0; }; - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/include/sockets/StdoutLog.h b/dep/include/sockets/StdoutLog.h index aee865be6af..aeb25b3e6e6 100644 --- a/dep/include/sockets/StdoutLog.h +++ b/dep/include/sockets/StdoutLog.h @@ -37,7 +37,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. namespace SOCKETS_NAMESPACE { #endif - /** StdLog implementation, logs to stdout. \ingroup logging */ class StdoutLog : public StdLog @@ -47,8 +46,6 @@ public: }; - - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/include/sockets/StreamSocket.h b/dep/include/sockets/StreamSocket.h index e839040e2b0..bcce10ffbc5 100644 --- a/dep/include/sockets/StreamSocket.h +++ b/dep/include/sockets/StreamSocket.h @@ -3,12 +3,10 @@ #include "Socket.h" - #ifdef SOCKETS_NAMESPACE namespace SOCKETS_NAMESPACE { #endif - /** SOCK_STREAM Socket base class. \ingroup basic */ class StreamSocket : public Socket @@ -117,12 +115,10 @@ private: int m_shutdown; ///< Shutdown status }; - #ifdef SOCKETS_NAMESPACE } // namespace SOCKETS_NAMESPACE { #endif - #endif // _StreamSocket_H diff --git a/dep/include/sockets/TcpSocket.h b/dep/include/sockets/TcpSocket.h index 4caeb548aaa..de1be8bd8b9 100644 --- a/dep/include/sockets/TcpSocket.h +++ b/dep/include/sockets/TcpSocket.h @@ -41,14 +41,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define TCP_BUFSIZE_READ 16400 #define TCP_OUTPUT_CAPACITY 1024000 - #ifdef SOCKETS_NAMESPACE namespace SOCKETS_NAMESPACE { #endif class SocketAddress; - /** Socket implementation for TCP. \ingroup basic */ class TcpSocket : public StreamSocket @@ -349,7 +347,6 @@ static SSLInitializer m_ssl_init; }; - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/include/sockets/Thread.h b/dep/include/sockets/Thread.h index e065a257a85..efb766e9ee6 100644 --- a/dep/include/sockets/Thread.h +++ b/dep/include/sockets/Thread.h @@ -91,7 +91,6 @@ private: bool m_b_destructor; }; - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/include/sockets/UdpSocket.h b/dep/include/sockets/UdpSocket.h index fd9965e96e8..3b06c6955bd 100644 --- a/dep/include/sockets/UdpSocket.h +++ b/dep/include/sockets/UdpSocket.h @@ -206,7 +206,6 @@ private: bool m_b_read_ts; }; - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/include/sockets/Utility.h b/dep/include/sockets/Utility.h index be0f6a05498..724a94e4b32 100644 --- a/dep/include/sockets/Utility.h +++ b/dep/include/sockets/Utility.h @@ -177,7 +177,6 @@ private: static bool m_local_resolved; ///< ResolveLocal has been called if true }; - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/include/sockets/socket_include.h b/dep/include/sockets/socket_include.h index dcfd4acfbd6..89855a54108 100644 --- a/dep/include/sockets/socket_include.h +++ b/dep/include/sockets/socket_include.h @@ -41,7 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. in read operations - helps on ECOS */ #define SOCKETS_DYNAMIC_TEMP - // platform specific stuff #if (defined(__unix__) || defined(unix)) && !defined(USG) #include <sys/param.h> @@ -81,7 +80,6 @@ typedef int SOCKET; namespace SOCKETS_NAMESPACE { #endif - // WIN32 adapt #define closesocket close #define INVALID_SOCKET -1 @@ -97,14 +95,12 @@ namespace SOCKETS_NAMESPACE { #endif // !_WIN32 - // ---------------------------------------- // Generic #ifndef SOL_IP #define SOL_IP IPPROTO_IP #endif - // ---------------------------------------- // OS specific adaptions @@ -151,13 +147,13 @@ namespace SOCKETS_NAMESPACE { # endif #elif defined (__NetBSD__) || defined (__OpenBSD__) -# if !defined(MSG_NOSIGNAL) -# define MSG_NOSIGNAL 0 -# endif -# include <netinet/in.h> -typedef in_addr_t ipaddr_t; -typedef in_port_t port_t; -#elif defined MACOSX +# if !defined(MSG_NOSIGNAL) +# define MSG_NOSIGNAL 0 +# endif +# include <netinet/in.h> +typedef in_addr_t ipaddr_t; +typedef in_port_t port_t; +#elif defined MACOSX // ---------------------------------------- // Mac OS X #include <string.h> @@ -219,7 +215,6 @@ namespace SOCKETS_NAMESPACE { #endif #endif // _MSC_VER < 1200 - #define MSG_NOSIGNAL 0 //#define SHUT_RDWR 2 #define SHUT_WR 1 @@ -231,7 +226,6 @@ const char *StrError(int x); namespace SOCKETS_NAMESPACE { #endif - // class WSAInitializer is a part of the Socket class (on win32) // as a static instance - so whenever an application uses a Socket, // winsock is initialized @@ -269,7 +263,6 @@ namespace SOCKETS_NAMESPACE { } #endif - #endif #ifdef SOCKETS_NAMESPACE @@ -278,12 +271,10 @@ namespace SOCKETS_NAMESPACE { /** List type containing file descriptors. */ typedef std::list<SOCKET> socket_v; - #ifdef SOCKETS_NAMESPACE } #endif - // getaddrinfo / getnameinfo replacements #ifdef NO_GETADDRINFO #ifndef AI_NUMERICHOST @@ -294,7 +285,6 @@ namespace SOCKETS_NAMESPACE { #endif #endif - #endif // _SOCKETS_socket_include_H diff --git a/dep/include/sockets/sockets-config.h b/dep/include/sockets/sockets-config.h index 464ed34cabb..1c8dc439092 100644 --- a/dep/include/sockets/sockets-config.h +++ b/dep/include/sockets/sockets-config.h @@ -46,57 +46,45 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /* OpenSSL support. */ //#define HAVE_OPENSSL - /* Ipv6 support. */ //#define ENABLE_IPV6 - /* SCTP support. */ //#define USE_SCTP - /* Define NO_GETADDRINFO if your operating system does not support the "getaddrinfo" and "getnameinfo" function calls. */ #define NO_GETADDRINFO - /* Connection pool support. */ #define ENABLE_POOL - /* Socks4 client support. */ //#define ENABLE_SOCKS4 - /* Asynchronous resolver. */ #define ENABLE_RESOLVER - /* Enable TCP reconnect on lost connection. Socket::OnReconnect Socket::OnDisconnect */ #define ENABLE_RECONNECT - /* Enable socket thread detach functionality. */ #define ENABLE_DETACH - /* Enable socket to socket triggers. Not yet in use. */ //#define ENABLE_TRIGGERS - /* Enabled exceptions. */ //#define ENABLE_EXCEPTIONS - /* Resolver uses the detach function so either enable both or disable both. */ #ifndef ENABLE_DETACH #undef ENABLE_RESOLVER #endif - #endif // _SOCKETS_CONFIG_H diff --git a/dep/src/g3dlite/AABox.cpp b/dep/src/g3dlite/AABox.cpp index f2f2b70535c..2279e9a51f0 100644 --- a/dep/src/g3dlite/AABox.cpp +++ b/dep/src/g3dlite/AABox.cpp @@ -19,15 +19,12 @@ #include "G3D/Plane.h" #include "G3D/Sphere.h" - namespace G3D { Box AABox::toBox() const { return Box(lo, hi); } - - void AABox::split(const Vector3::Axis& axis, float location, AABox& low, AABox& high) const { // Low, medium, and high along the chosen axis float L = G3D::min(location, lo[axis]); @@ -82,7 +79,6 @@ Vector3 AABox::randomSurfacePoint() const { } } - Vector3 AABox::randomInteriorPoint() const { return Vector3( (float)random(lo.x, hi.x), @@ -91,7 +87,6 @@ Vector3 AABox::randomInteriorPoint() const { } #endif - bool AABox::intersects(const AABox& other) const { // Must be overlap along all three axes. // Try to find a separating axis. @@ -110,7 +105,6 @@ bool AABox::intersects(const AABox& other) const { return true; } - bool AABox::culledBy( const Array<Plane>& plane, int& cullingPlaneIndex, @@ -120,7 +114,6 @@ bool AABox::culledBy( return culledBy(plane.getCArray(), plane.size(), cullingPlaneIndex, inMask, outMask); } - bool AABox::culledBy( const Array<Plane>& plane, int& cullingPlaneIndex, @@ -129,10 +122,8 @@ bool AABox::culledBy( return culledBy(plane.getCArray(), plane.size(), cullingPlaneIndex, inMask); } - int AABox::dummy = 0; - bool AABox::culledBy( const class Plane* plane, int numPlanes, @@ -213,7 +204,6 @@ bool AABox::culledBy( return false; } - bool AABox::culledBy( const class Plane* plane, int numPlanes, @@ -278,7 +268,6 @@ bool AABox::culledBy( return false; } - bool AABox::intersects(const class Sphere& sphere) const { double d = 0; @@ -295,6 +284,5 @@ bool AABox::intersects(const class Sphere& sphere) const { return d <= square(sphere.radius); } - } // namespace diff --git a/dep/src/g3dlite/Box.cpp b/dep/src/g3dlite/Box.cpp index fd3067048c0..725a7e95c3a 100644 --- a/dep/src/g3dlite/Box.cpp +++ b/dep/src/g3dlite/Box.cpp @@ -27,12 +27,10 @@ namespace G3D { Box::Box() { } - Box::Box(const AABox& b) { init(b.low(), b.high()); } - Box::Box( const Vector3& min, const Vector3& max) { @@ -61,7 +59,7 @@ void Box::init( _axis[2] = Vector3::unitZ(); _volume = _extent.x * _extent.y * _extent.z; - _area = 2 * + _area = 2 * (_extent.x * _extent.y + _extent.y * _extent.z + _extent.z * _extent.x); @@ -69,17 +67,14 @@ void Box::init( _center = (max + min) / 2; } - float Box::volume() const { return _volume; } - float Box::surfaceArea() const { return _area; } - void Box::getLocalFrame(CoordinateFrame& frame) const { frame.rotation = Matrix3( @@ -90,14 +85,12 @@ void Box::getLocalFrame(CoordinateFrame& frame) const { frame.translation = _center; } - CoordinateFrame Box::localFrame() const { CoordinateFrame out; getLocalFrame(out); return out; } - void Box::getFaceCorners(int f, Vector3& v0, Vector3& v1, Vector3& v2, Vector3& v3) const { switch (f) { case 0: @@ -129,7 +122,6 @@ void Box::getFaceCorners(int f, Vector3& v0, Vector3& v1, Vector3& v2, Vector3& } } - bool Box::culledBy( const Array<Plane>& plane, int& cullingPlaneIndex, @@ -139,7 +131,6 @@ bool Box::culledBy( return culledBy(plane.getCArray(), plane.size(), cullingPlaneIndex, inMask, outMask); } - bool Box::culledBy( const Array<Plane>& plane, int& cullingPlaneIndex, @@ -148,7 +139,6 @@ bool Box::culledBy( return culledBy(plane.getCArray(), plane.size(), cullingPlaneIndex, inMask); } - int32 Box::dummy = 0; bool Box::culledBy( @@ -169,7 +159,7 @@ bool Box::culledBy( // Only test planes that are not masked if ((inMask & 1) != 0) { - + Vector3 corner; int numContained = 0; @@ -211,7 +201,6 @@ bool Box::culledBy( return false; } - bool Box::culledBy( const class Plane* plane, int numPlanes, @@ -227,7 +216,7 @@ bool Box::culledBy( // Only test planes that are not masked if ((inMask & 1) != 0) { - + bool culled = true; int v; @@ -256,7 +245,6 @@ bool Box::culledBy( return false; } - bool Box::contains( const Vector3& point) const { @@ -276,7 +264,7 @@ bool Box::contains( Vector3 osPoint = M.inverse() * (point - _corner[0]); return - (osPoint.x >= 0) && + (osPoint.x >= 0) && (osPoint.y >= 0) && (osPoint.z >= 0) && (osPoint.x <= 1) && @@ -317,7 +305,6 @@ void Box::getRandomSurfacePoint(Vector3& P, Vector3& N) const { } } - Vector3 Box::randomInteriorPoint() const { Vector3 sum = _center; @@ -329,7 +316,6 @@ Vector3 Box::randomInteriorPoint() const { } #endif - void Box::getBounds(class AABox& aabb) const { Vector3 lo = _corner[0]; @@ -344,6 +330,5 @@ void Box::getBounds(class AABox& aabb) const { aabb = AABox(lo, hi); } - } // namespace diff --git a/dep/src/g3dlite/Crypto.cpp b/dep/src/g3dlite/Crypto.cpp index bff3a5a966c..03851193e57 100644 --- a/dep/src/g3dlite/Crypto.cpp +++ b/dep/src/g3dlite/Crypto.cpp @@ -3,7 +3,6 @@ @author Morgan McGuire, matrix@graphics3d.com - @created 2006-03-28 @edited 2006-04-06 */ @@ -14,7 +13,6 @@ namespace G3D { - int Crypto::smallPrime(int n) { debugAssert(n < numSmallPrimes() && n >= 0); @@ -57,7 +55,6 @@ int Crypto::smallPrime(int n) { return table[n]; } - int Crypto::numSmallPrimes() { return 303; } diff --git a/dep/src/g3dlite/Matrix3.cpp b/dep/src/g3dlite/Matrix3.cpp index 630c1883c0b..76864e1b60c 100644 --- a/dep/src/g3dlite/Matrix3.cpp +++ b/dep/src/g3dlite/Matrix3.cpp @@ -49,7 +49,6 @@ bool Matrix3::fuzzyEq(const Matrix3& b) const { return true; } - bool Matrix3::isOrthonormal() const { Vector3 X = getColumn(0); Vector3 Y = getColumn(1); @@ -123,7 +122,6 @@ void Matrix3::set( elt[2][2] = fEntry22; } - //---------------------------------------------------------------------------- Vector3 Matrix3::getColumn (int iCol) const { assert((0 <= iCol) && (iCol < 3)); @@ -142,7 +140,6 @@ void Matrix3::setColumn(int iCol, const Vector3 &vector) { elt[2][iCol] = vector.z; } - void Matrix3::setRow(int iRow, const Vector3 &vector) { debugAssert((iRow >= 0) && (iRow < 3)); elt[iRow][0] = vector.x; @@ -150,7 +147,6 @@ void Matrix3::setRow(int iRow, const Vector3 &vector) { elt[iRow][2] = vector.z; } - //---------------------------------------------------------------------------- bool Matrix3::operator== (const Matrix3& rkMatrix) const { for (int iRow = 0; iRow < 3; iRow++) { @@ -290,7 +286,6 @@ Matrix3 operator* (float fScalar, const Matrix3& rkMatrix) { return (double)fScalar * rkMatrix; } - Matrix3 operator* (int fScalar, const Matrix3& rkMatrix) { return (double)fScalar * rkMatrix; } @@ -1680,8 +1675,6 @@ std::string Matrix3::toString() const { elt[2][0], elt[2][1], elt[2][2]); } - - } // namespace diff --git a/dep/src/g3dlite/Plane.cpp b/dep/src/g3dlite/Plane.cpp index 10ee7ff0f0c..5ae60b0f762 100644 --- a/dep/src/g3dlite/Plane.cpp +++ b/dep/src/g3dlite/Plane.cpp @@ -60,7 +60,6 @@ Plane::Plane( _distance = _normal.dot(point0.xyz()); } - Plane::Plane( const Vector3& point0, const Vector3& point1, @@ -70,7 +69,6 @@ Plane::Plane( _distance = _normal.dot(point0); } - Plane::Plane( const Vector3& __normal, const Vector3& point) { @@ -79,7 +77,6 @@ Plane::Plane( _distance = _normal.dot(point); } - Plane Plane::fromEquation(float a, float b, float c, float d) { Vector3 n(a, b, c); float magnitude = n.magnitude(); @@ -88,13 +85,11 @@ Plane Plane::fromEquation(float a, float b, float c, float d) { return Plane(n, -d); } - void Plane::flip() { _normal = -_normal; _distance = -_distance; } - void Plane::getEquation(Vector3& n, float& d) const { double _d; getEquation(n, _d); @@ -106,7 +101,6 @@ void Plane::getEquation(Vector3& n, double& d) const { d = -_distance; } - void Plane::getEquation(float& a, float& b, float& c, float& d) const { double _a, _b, _c, _d; getEquation(_a, _b, _c, _d); @@ -123,7 +117,6 @@ void Plane::getEquation(double& a, double& b, double& c, double& d) const { d = -_distance; } - std::string Plane::toString() const { return format("Plane(%g, %g, %g, %g)", _normal.x, _normal.y, _normal.z, _distance); } diff --git a/dep/src/g3dlite/System.cpp b/dep/src/g3dlite/System.cpp index 88fd39b52ca..e55be13adc5 100644 --- a/dep/src/g3dlite/System.cpp +++ b/dep/src/g3dlite/System.cpp @@ -76,7 +76,6 @@ namespace G3D { static char versionCstr[1024]; System::OutOfMemoryCallback System::outOfMemoryCallback = NULL; - void System::init() { // Cannot use most G3D data structures or utility functions in here because // they are not initialized. @@ -102,21 +101,15 @@ void System::init() { } - - void System::memcpy(void* dst, const void* src, size_t numBytes) { ::memcpy(dst, src, numBytes); } - void System::memset(void* dst, uint8 value, size_t numBytes) { ::memset(dst, value, numBytes); } - - - //////////////////////////////////////////////////////////////// class BufferPool { public: @@ -231,7 +224,6 @@ private: poolSize = 0; } - /** Allocate out of a specific pool-> Return NULL if no suitable memory was found. @@ -292,7 +284,6 @@ public: medPoolSize = 0; - // Initialize the tiny heap as a bunch of pointers into one // pre-allocated buffer. tinyHeap = ::malloc(maxTinyBuffers * tinyBufferSize); @@ -308,7 +299,6 @@ public: # endif } - ~BufferPool() { ::free(tinyHeap); # ifdef G3D_WIN32 @@ -318,7 +308,6 @@ public: # endif } - void* realloc(void* ptr, size_t bytes) { if (ptr == NULL) { return malloc(bytes); @@ -355,7 +344,6 @@ public: } } - void* malloc(size_t bytes) { lock(); ++totalMallocs; @@ -414,7 +402,6 @@ public: ptr = ::malloc(bytes + 4); } - if (ptr == NULL) { if ((System::outOfMemoryCallback != NULL) && (System::outOfMemoryCallback(bytes + 4, true) == true)) { @@ -436,7 +423,6 @@ public: return (uint8*)ptr + 4; } - void free(void* ptr) { if (ptr == NULL) { // Free does nothing on null pointers @@ -527,7 +513,6 @@ std::string System::mallocStatus() { #endif } - void System::resetMallocPerformanceCounters() { #ifndef NO_BUFFERPOOL bufferpool->totalMallocs = 0; @@ -537,7 +522,6 @@ void System::resetMallocPerformanceCounters() { #endif } - #ifndef NO_BUFFERPOOL inline void initMem() { // Putting the test here ensures that the system is always @@ -550,7 +534,6 @@ inline void initMem() { } #endif - void* System::malloc(size_t bytes) { #ifndef NO_BUFFERPOOL initMem(); @@ -570,7 +553,6 @@ void* System::calloc(size_t n, size_t x) { #endif } - void* System::realloc(void* block, size_t bytes) { #ifndef NO_BUFFERPOOL initMem(); @@ -580,7 +562,6 @@ void* System::realloc(void* block, size_t bytes) { #endif } - void System::free(void* p) { #ifndef NO_BUFFERPOOL bufferpool->free(p); @@ -589,7 +570,6 @@ void System::free(void* p) { #endif } - void* System::alignedMalloc(size_t bytes, size_t alignment) { alwaysAssertM(isPow2(alignment), "alignment must be a power of 2"); @@ -646,7 +626,6 @@ void* System::alignedMalloc(size_t bytes, size_t alignment) { return (void*)alignedPtr; } - void System::alignedFree(void* _ptr) { if (_ptr == NULL) { return; @@ -666,6 +645,5 @@ void System::alignedFree(void* _ptr) { System::free(truePtr); } - } // namespace diff --git a/dep/src/g3dlite/Triangle.cpp b/dep/src/g3dlite/Triangle.cpp index bb5b8f94635..2e221b12f1d 100644 --- a/dep/src/g3dlite/Triangle.cpp +++ b/dep/src/g3dlite/Triangle.cpp @@ -17,7 +17,6 @@ namespace G3D { - void Triangle::init(const Vector3& v0, const Vector3& v1, const Vector3& v2) { _plane = Plane(v0, v1, v2); @@ -46,36 +45,29 @@ void Triangle::init(const Vector3& v0, const Vector3& v1, const Vector3& v2) { } - Triangle::Triangle() { init(Vector3::zero(), Vector3::zero(), Vector3::zero()); } - Triangle::Triangle(const Vector3& v0, const Vector3& v1, const Vector3& v2) { init(v0, v1, v2); } - Triangle::~Triangle() { } - double Triangle::area() const { return _area; } - const Vector3& Triangle::normal() const { return _plane.normal(); } - const Plane& Triangle::plane() const { return _plane; } - Vector3 Triangle::center() const { return (_vertex[0] + _vertex[1] + _vertex[2]) / 3.0; } @@ -96,7 +88,6 @@ Vector3 Triangle::randomPoint() const { return edge01 * s + edge02 * t + _vertex[0]; } - void Triangle::getBounds(AABox& out) const { Vector3 lo = _vertex[0]; Vector3 hi = lo; diff --git a/dep/src/g3dlite/Vector3.cpp b/dep/src/g3dlite/Vector3.cpp index 09c3003888b..b0ca1990a3f 100644 --- a/dep/src/g3dlite/Vector3.cpp +++ b/dep/src/g3dlite/Vector3.cpp @@ -62,7 +62,6 @@ Vector3::Axis Vector3::primaryAxis() const { return a; } - unsigned int Vector3::hashCode() const { unsigned int xhash = (*(int*)(void*)(&x)); unsigned int yhash = (*(int*)(void*)(&y)); @@ -75,21 +74,18 @@ std::ostream& operator<<(std::ostream& os, const Vector3& v) { return os << v.toString(); } - //---------------------------------------------------------------------------- double frand() { return rand() / (double) RAND_MAX; } - Vector3::Vector3(const class Vector3int16& v) { x = v.x; y = v.y; z = v.z; } - Vector3 Vector3::random() { Vector3 result; @@ -298,7 +294,6 @@ std::string Vector3::toString() const { return G3D::format("(%g, %g, %g)", x, y, z); } - //---------------------------------------------------------------------------- Matrix3 Vector3::cross() const { @@ -307,7 +302,6 @@ Matrix3 Vector3::cross() const { -y, x, 0); } - //---------------------------------------------------------------------------- // 2-char swizzles @@ -437,8 +431,5 @@ Vector4 Vector3::zzzz() const { return Vector4 (z, z, z, z); } - - - } // namespace diff --git a/dep/src/g3dlite/Vector4.cpp b/dep/src/g3dlite/Vector4.cpp index 91f916d1040..b38e6f7cb57 100644 --- a/dep/src/g3dlite/Vector4.cpp +++ b/dep/src/g3dlite/Vector4.cpp @@ -35,7 +35,6 @@ Vector4::Vector4(const class Color4& c) { } #endif - Vector4::Vector4(const Vector2& v1, const Vector2& v2) { x = v1.x; y = v1.y; @@ -43,7 +42,6 @@ Vector4::Vector4(const Vector2& v1, const Vector2& v2) { w = v2.y; } - Vector4::Vector4(const Vector2& v1, float fz, float fw) { x = v1.x; y = v1.y; @@ -83,7 +81,6 @@ Vector4& Vector4::operator/= (float fScalar) { return *this; } - //---------------------------------------------------------------------------- std::string Vector4::toString() const { @@ -434,6 +431,5 @@ Vector4 Vector4::ywww() const { return Vector4 (y, w, w, w); } Vector4 Vector4::zwww() const { return Vector4 (z, w, w, w); } Vector4 Vector4::wwww() const { return Vector4 (w, w, w, w); } - }; // namespace diff --git a/dep/src/sockets/Base64.cpp b/dep/src/sockets/Base64.cpp index cb66b93af6f..f7f12f5edff 100644 --- a/dep/src/sockets/Base64.cpp +++ b/dep/src/sockets/Base64.cpp @@ -33,7 +33,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. namespace SOCKETS_NAMESPACE { #endif - const char *Base64::bstr = "ABCDEFGHIJKLMNOPQ" "RSTUVWXYZabcdefgh" @@ -50,12 +49,10 @@ const char Base64::rstr[] = { 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 0, 0, 0, 0, 0}; - Base64::Base64() { } - void Base64::encode(FILE *fil, std::string& output, bool add_crlf) { size_t remain; @@ -94,13 +91,11 @@ void Base64::encode(FILE *fil, std::string& output, bool add_crlf) } } - void Base64::encode(const std::string& str_in, std::string& str_out, bool add_crlf) { encode(str_in.c_str(), str_in.size(), str_out, add_crlf); } - void Base64::encode(const char* input,size_t l,std::string& output, bool add_crlf) { size_t i = 0; @@ -136,7 +131,6 @@ void Base64::encode(const char* input,size_t l,std::string& output, bool add_crl } } - void Base64::encode(const unsigned char* input,size_t l,std::string& output,bool add_crlf) { size_t i = 0; @@ -172,7 +166,6 @@ void Base64::encode(const unsigned char* input,size_t l,std::string& output,bool } } - void Base64::decode(const std::string& input,std::string& output) { size_t i = 0; @@ -205,7 +198,6 @@ void Base64::decode(const std::string& input,std::string& output) } } - void Base64::decode(const std::string& input, unsigned char *output, size_t& sz) { size_t i = 0; @@ -251,7 +243,6 @@ void Base64::decode(const std::string& input, unsigned char *output, size_t& sz) sz = j; } - size_t Base64::decode_length(const std::string& str64) { if (str64.empty() || str64.size() % 4) @@ -264,10 +255,8 @@ size_t Base64::decode_length(const std::string& str64) return l; } - #ifdef SOCKETS_NAMESPACE } #endif - diff --git a/dep/src/sockets/Exception.cpp b/dep/src/sockets/Exception.cpp index 33a7b4a133c..4d79aeef813 100644 --- a/dep/src/sockets/Exception.cpp +++ b/dep/src/sockets/Exception.cpp @@ -29,19 +29,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. namespace SOCKETS_NAMESPACE { #endif - - Exception::Exception(const std::string& description) : m_description(description) { } - const std::string Exception::ToString() const { return m_description; } - #ifdef SOCKETS_NAMESPACE } // namespace SOCKETS_NAMESPACE { #endif diff --git a/dep/src/sockets/Ipv4Address.cpp b/dep/src/sockets/Ipv4Address.cpp index b89cc2a449b..03935038951 100644 --- a/dep/src/sockets/Ipv4Address.cpp +++ b/dep/src/sockets/Ipv4Address.cpp @@ -27,13 +27,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <netdb.h> #endif - #ifdef SOCKETS_NAMESPACE namespace SOCKETS_NAMESPACE { #endif - - Ipv4Address::Ipv4Address(port_t port) : m_valid(true) { memset(&m_addr, 0, sizeof(m_addr)); @@ -41,7 +38,6 @@ Ipv4Address::Ipv4Address(port_t port) : m_valid(true) m_addr.sin_port = htons( port ); } - Ipv4Address::Ipv4Address(ipaddr_t a,port_t port) : m_valid(true) { memset(&m_addr, 0, sizeof(m_addr)); @@ -50,7 +46,6 @@ Ipv4Address::Ipv4Address(ipaddr_t a,port_t port) : m_valid(true) memcpy(&m_addr.sin_addr, &a, sizeof(struct in_addr)); } - Ipv4Address::Ipv4Address(struct in_addr& a,port_t port) : m_valid(true) { memset(&m_addr, 0, sizeof(m_addr)); @@ -59,7 +54,6 @@ Ipv4Address::Ipv4Address(struct in_addr& a,port_t port) : m_valid(true) m_addr.sin_addr = a; } - Ipv4Address::Ipv4Address(const std::string& host,port_t port) : m_valid(false) { memset(&m_addr, 0, sizeof(m_addr)); @@ -75,43 +69,36 @@ Ipv4Address::Ipv4Address(const std::string& host,port_t port) : m_valid(false) } } - Ipv4Address::Ipv4Address(struct sockaddr_in& sa) { m_addr = sa; m_valid = sa.sin_family == AF_INET; } - Ipv4Address::~Ipv4Address() { } - Ipv4Address::operator struct sockaddr *() { return (struct sockaddr *)&m_addr; } - Ipv4Address::operator socklen_t() { return sizeof(struct sockaddr_in); } - void Ipv4Address::SetPort(port_t port) { m_addr.sin_port = htons( port ); } - port_t Ipv4Address::GetPort() { return ntohs( m_addr.sin_port ); } - bool Ipv4Address::Resolve(const std::string& hostname,struct in_addr& a) { struct sockaddr_in sa; @@ -129,7 +116,6 @@ bool Ipv4Address::Resolve(const std::string& hostname,struct in_addr& a) return true; } - bool Ipv4Address::Reverse(struct in_addr& a,std::string& name) { struct sockaddr_in sa; @@ -139,7 +125,6 @@ bool Ipv4Address::Reverse(struct in_addr& a,std::string& name) return Utility::reverse((struct sockaddr *)&sa, sizeof(sa), name); } - std::string Ipv4Address::Convert(bool include_port) { if (include_port) @@ -147,7 +132,6 @@ std::string Ipv4Address::Convert(bool include_port) return Convert(m_addr.sin_addr); } - std::string Ipv4Address::Convert(struct in_addr& a) { struct sockaddr_in sa; @@ -159,25 +143,21 @@ std::string Ipv4Address::Convert(struct in_addr& a) return name; } - void Ipv4Address::SetAddress(struct sockaddr *sa) { memcpy(&m_addr, sa, sizeof(struct sockaddr_in)); } - int Ipv4Address::GetFamily() { return m_addr.sin_family; } - bool Ipv4Address::IsValid() { return m_valid; } - bool Ipv4Address::operator==(SocketAddress& a) { if (a.GetFamily() != GetFamily()) @@ -193,13 +173,11 @@ bool Ipv4Address::operator==(SocketAddress& a) return true; } - std::auto_ptr<SocketAddress> Ipv4Address::GetCopy() { return std::auto_ptr<SocketAddress>(new Ipv4Address(m_addr)); } - std::string Ipv4Address::Reverse() { std::string tmp; @@ -207,7 +185,6 @@ std::string Ipv4Address::Reverse() return tmp; } - #ifdef SOCKETS_NAMESPACE } // namespace SOCKETS_NAMESPACE { #endif diff --git a/dep/src/sockets/Ipv6Address.cpp b/dep/src/sockets/Ipv6Address.cpp index 6c92de24871..3208b5098fa 100644 --- a/dep/src/sockets/Ipv6Address.cpp +++ b/dep/src/sockets/Ipv6Address.cpp @@ -34,7 +34,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. namespace SOCKETS_NAMESPACE { #endif - Ipv6Address::Ipv6Address(port_t port) : m_valid(true) { memset(&m_addr, 0, sizeof(m_addr)); @@ -42,7 +41,6 @@ Ipv6Address::Ipv6Address(port_t port) : m_valid(true) m_addr.sin6_port = htons( port ); } - Ipv6Address::Ipv6Address(struct in6_addr& a,port_t port) : m_valid(true) { memset(&m_addr, 0, sizeof(m_addr)); @@ -51,7 +49,6 @@ Ipv6Address::Ipv6Address(struct in6_addr& a,port_t port) : m_valid(true) m_addr.sin6_addr = a; } - Ipv6Address::Ipv6Address(const std::string& host,port_t port) : m_valid(false) { memset(&m_addr, 0, sizeof(m_addr)); @@ -67,43 +64,36 @@ Ipv6Address::Ipv6Address(const std::string& host,port_t port) : m_valid(false) } } - Ipv6Address::Ipv6Address(struct sockaddr_in6& sa) { m_addr = sa; m_valid = sa.sin6_family == AF_INET6; } - Ipv6Address::~Ipv6Address() { } - Ipv6Address::operator struct sockaddr *() { return (struct sockaddr *)&m_addr; } - Ipv6Address::operator socklen_t() { return sizeof(struct sockaddr_in6); } - void Ipv6Address::SetPort(port_t port) { m_addr.sin6_port = htons( port ); } - port_t Ipv6Address::GetPort() { return ntohs( m_addr.sin6_port ); } - bool Ipv6Address::Resolve(const std::string& hostname,struct in6_addr& a) { struct sockaddr_in6 sa; @@ -121,7 +111,6 @@ bool Ipv6Address::Resolve(const std::string& hostname,struct in6_addr& a) return true; } - bool Ipv6Address::Reverse(struct in6_addr& a,std::string& name) { struct sockaddr_in6 sa; @@ -131,7 +120,6 @@ bool Ipv6Address::Reverse(struct in6_addr& a,std::string& name) return Utility::reverse((struct sockaddr *)&sa, sizeof(sa), name); } - std::string Ipv6Address::Convert(bool include_port) { if (include_port) @@ -139,7 +127,6 @@ std::string Ipv6Address::Convert(bool include_port) return Convert(m_addr.sin6_addr); } - std::string Ipv6Address::Convert(struct in6_addr& a,bool mixed) { char slask[100]; // l2ip temporary @@ -187,51 +174,43 @@ std::string Ipv6Address::Convert(struct in6_addr& a,bool mixed) return slask; } - void Ipv6Address::SetAddress(struct sockaddr *sa) { memcpy(&m_addr, sa, sizeof(struct sockaddr_in6)); } - int Ipv6Address::GetFamily() { return m_addr.sin6_family; } - void Ipv6Address::SetFlowinfo(uint32_t x) { m_addr.sin6_flowinfo = x; } - uint32_t Ipv6Address::GetFlowinfo() { return m_addr.sin6_flowinfo; } - #ifndef _WIN32 void Ipv6Address::SetScopeId(uint32_t x) { m_addr.sin6_scope_id = x; } - uint32_t Ipv6Address::GetScopeId() { return m_addr.sin6_scope_id; } #endif - bool Ipv6Address::IsValid() { return m_valid; } - bool Ipv6Address::operator==(SocketAddress& a) { if (a.GetFamily() != GetFamily()) @@ -247,13 +226,11 @@ bool Ipv6Address::operator==(SocketAddress& a) return true; } - std::auto_ptr<SocketAddress> Ipv6Address::GetCopy() { return std::auto_ptr<SocketAddress>(new Ipv6Address(m_addr)); } - std::string Ipv6Address::Reverse() { std::string tmp; @@ -261,7 +238,6 @@ std::string Ipv6Address::Reverse() return tmp; } - #ifdef SOCKETS_NAMESPACE } // namespace SOCKETS_NAMESPACE { #endif diff --git a/dep/src/sockets/Lock.cpp b/dep/src/sockets/Lock.cpp index 597ca30afc6..b75664cfbdc 100644 --- a/dep/src/sockets/Lock.cpp +++ b/dep/src/sockets/Lock.cpp @@ -34,21 +34,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. namespace SOCKETS_NAMESPACE { #endif - Lock::Lock(Mutex& m) : m_mutex(m) { m_mutex.Lock(); } - Lock::~Lock() { m_mutex.Unlock(); } - - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/src/sockets/Mutex.cpp b/dep/src/sockets/Mutex.cpp index 3bfe64d04c7..681e85cee5b 100644 --- a/dep/src/sockets/Mutex.cpp +++ b/dep/src/sockets/Mutex.cpp @@ -33,7 +33,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. namespace SOCKETS_NAMESPACE { #endif - Mutex::Mutex() { #ifdef _WIN32 @@ -43,7 +42,6 @@ Mutex::Mutex() #endif } - Mutex::~Mutex() { #ifdef _WIN32 @@ -53,7 +51,6 @@ Mutex::~Mutex() #endif } - void Mutex::Lock() { #ifdef _WIN32 @@ -64,7 +61,6 @@ void Mutex::Lock() #endif } - void Mutex::Unlock() { #ifdef _WIN32 @@ -74,7 +70,6 @@ void Mutex::Unlock() #endif } - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/src/sockets/Parse.cpp b/dep/src/sockets/Parse.cpp index ccbd553b0e6..2967859f23d 100644 --- a/dep/src/sockets/Parse.cpp +++ b/dep/src/sockets/Parse.cpp @@ -33,12 +33,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "Parse.h" - #ifdef SOCKETS_NAMESPACE namespace SOCKETS_NAMESPACE { #endif - /* implementation of class Parse */ Parse::Parse() @@ -93,7 +91,6 @@ Parse::Parse(const std::string&s,const std::string&sp,short /*nospace*/) { } - Parse::~Parse() { } @@ -319,4 +316,3 @@ void Parse::getline(std::string&s) #endif - diff --git a/dep/src/sockets/ResolvServer.cpp b/dep/src/sockets/ResolvServer.cpp index 492d6705080..3c8a7de6bc0 100644 --- a/dep/src/sockets/ResolvServer.cpp +++ b/dep/src/sockets/ResolvServer.cpp @@ -41,7 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. namespace SOCKETS_NAMESPACE { #endif - ResolvServer::ResolvServer(port_t port) :Thread() ,m_quit(false) @@ -50,12 +49,10 @@ ResolvServer::ResolvServer(port_t port) { } - ResolvServer::~ResolvServer() { } - void ResolvServer::Run() { // StdoutLog log; @@ -76,19 +73,16 @@ void ResolvServer::Run() SetRunning(false); } - void ResolvServer::Quit() { m_quit = true; } - bool ResolvServer::Ready() { return m_ready; } - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/src/sockets/ResolvSocket.cpp b/dep/src/sockets/ResolvSocket.cpp index 236e93f9704..636de276426 100644 --- a/dep/src/sockets/ResolvSocket.cpp +++ b/dep/src/sockets/ResolvSocket.cpp @@ -53,13 +53,11 @@ namespace SOCKETS_NAMESPACE { #define DEB(x) //#endif - // static ResolvSocket::cache_t ResolvSocket::m_cache; ResolvSocket::timeout_t ResolvSocket::m_cache_to; Mutex ResolvSocket::m_cache_mutex; - ResolvSocket::ResolvSocket(ISocketHandler& h) :TcpSocket(h) ,m_bServer(false) @@ -72,7 +70,6 @@ ResolvSocket::ResolvSocket(ISocketHandler& h) SetLineProtocol(); } - ResolvSocket::ResolvSocket(ISocketHandler& h, Socket *parent, const std::string& host, port_t port, bool ipv6) :TcpSocket(h) ,m_bServer(false) @@ -87,7 +84,6 @@ ResolvSocket::ResolvSocket(ISocketHandler& h, Socket *parent, const std::string& SetLineProtocol(); } - ResolvSocket::ResolvSocket(ISocketHandler& h, Socket *parent, ipaddr_t a) :TcpSocket(h) ,m_bServer(false) @@ -102,7 +98,6 @@ ResolvSocket::ResolvSocket(ISocketHandler& h, Socket *parent, ipaddr_t a) SetLineProtocol(); } - #ifdef ENABLE_IPV6 ResolvSocket::ResolvSocket(ISocketHandler& h, Socket *parent, in6_addr& a) :TcpSocket(h) @@ -117,12 +112,10 @@ ResolvSocket::ResolvSocket(ISocketHandler& h, Socket *parent, in6_addr& a) } #endif - ResolvSocket::~ResolvSocket() { } - void ResolvSocket::OnLine(const std::string& line) { Parse pa(line, ":"); @@ -268,7 +261,6 @@ DEB(fprintf(stderr, " *** Update cache for [%s][%s] = '%s'\n", m_query.c_str(), #endif } - void ResolvSocket::OnDetached() { DEB( fprintf(stderr, " *** ResolvSocket::OnDetached(); query=%s, data=%s\n", m_query.c_str(), m_data.c_str());) @@ -370,7 +362,6 @@ DEB( fprintf(stderr, " *** ResolvSocket::OnDetached(); query=%s, data=%s\n", SetCloseAndDelete(); } - void ResolvSocket::OnConnect() { if (!m_resolv_host.empty()) @@ -405,7 +396,6 @@ void ResolvSocket::OnConnect() Send( msg ); } - void ResolvSocket::OnDelete() { if (m_parent) @@ -427,7 +417,6 @@ DEB(fprintf(stderr, " *** Update cache for [%s][%s] = '%s'\n", m_query.c_str(), } } - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/src/sockets/Socket.cpp b/dep/src/sockets/Socket.cpp index bf1a73abf6e..f53cd27621e 100644 --- a/dep/src/sockets/Socket.cpp +++ b/dep/src/sockets/Socket.cpp @@ -60,13 +60,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. namespace SOCKETS_NAMESPACE { #endif - // statics #ifdef _WIN32 WSAInitializer Socket::m_winsock_init; #endif - Socket::Socket(ISocketHandler& h) //:m_flags(0) :m_handler(h) @@ -111,7 +109,6 @@ Socket::Socket(ISocketHandler& h) { } - Socket::~Socket() { Handler().Remove(this); @@ -125,22 +122,18 @@ Socket::~Socket() } } - void Socket::Init() { } - void Socket::OnRead() { } - void Socket::OnWrite() { } - void Socket::OnException() { // %! exception doesn't always mean something bad happened, this code should be reworked @@ -150,22 +143,18 @@ void Socket::OnException() SetCloseAndDelete(); } - void Socket::OnDelete() { } - void Socket::OnConnect() { } - void Socket::OnAccept() { } - int Socket::Close() { if (m_socket == INVALID_SOCKET) // this could happen @@ -191,7 +180,6 @@ int Socket::Close() return n; } - SOCKET Socket::CreateSocket(int af,int type, const std::string& protocol) { struct protoent *p = NULL; @@ -232,31 +220,26 @@ SOCKET Socket::CreateSocket(int af,int type, const std::string& protocol) return s; } - void Socket::Attach(SOCKET s) { m_socket = s; } - SOCKET Socket::GetSocket() { return m_socket; } - void Socket::SetDeleteByHandler(bool x) { m_bDel = x; } - bool Socket::DeleteByHandler() { return m_bDel; } - void Socket::SetCloseAndDelete(bool x) { if (x != m_bClose) @@ -270,25 +253,21 @@ void Socket::SetCloseAndDelete(bool x) } } - bool Socket::CloseAndDelete() { return m_bClose; } - void Socket::SetRemoteAddress(SocketAddress& ad) //struct sockaddr* sa, socklen_t l) { m_remote_address = ad.GetCopy(); } - std::auto_ptr<SocketAddress> Socket::GetRemoteSocketAddress() { return m_remote_address -> GetCopy(); } - ISocketHandler& Socket::Handler() const { #ifdef ENABLE_DETACH @@ -298,13 +277,11 @@ ISocketHandler& Socket::Handler() const return m_handler; } - ISocketHandler& Socket::MasterHandler() const { return m_handler; } - ipaddr_t Socket::GetRemoteIP4() { ipaddr_t l = 0; @@ -323,7 +300,6 @@ ipaddr_t Socket::GetRemoteIP4() return l; } - #ifdef ENABLE_IPV6 #ifdef IPPROTO_IPV6 struct in6_addr Socket::GetRemoteIP6() @@ -347,7 +323,6 @@ struct in6_addr Socket::GetRemoteIP6() #endif #endif - port_t Socket::GetRemotePort() { if (!m_remote_address.get()) @@ -357,7 +332,6 @@ port_t Socket::GetRemotePort() return m_remote_address -> GetPort(); } - std::string Socket::GetRemoteAddress() { if (!m_remote_address.get()) @@ -367,7 +341,6 @@ std::string Socket::GetRemoteAddress() return m_remote_address -> Convert(false); } - std::string Socket::GetRemoteHostname() { if (!m_remote_address.get()) @@ -377,7 +350,6 @@ std::string Socket::GetRemoteHostname() return m_remote_address -> Reverse(); } - bool Socket::SetNonblocking(bool bNb) { #ifdef _WIN32 @@ -410,7 +382,6 @@ bool Socket::SetNonblocking(bool bNb) #endif } - bool Socket::SetNonblocking(bool bNb, SOCKET s) { #ifdef _WIN32 @@ -443,13 +414,11 @@ bool Socket::SetNonblocking(bool bNb, SOCKET s) #endif } - void Socket::Set(bool bRead, bool bWrite, bool bException) { Handler().Set(m_socket, bRead, bWrite, bException); } - bool Socket::Ready() { if (m_socket != INVALID_SOCKET && !CloseAndDelete()) @@ -457,138 +426,115 @@ bool Socket::Ready() return false; } - void Socket::OnLine(const std::string& ) { } - void Socket::OnConnectFailed() { } - Socket *Socket::GetParent() { return m_parent; } - void Socket::SetParent(Socket *x) { m_parent = x; } - port_t Socket::GetPort() { Handler().LogError(this, "GetPort", 0, "GetPort only implemented for ListenSocket", LOG_LEVEL_WARNING); return 0; } - bool Socket::OnConnectRetry() { return true; } - #ifdef ENABLE_RECONNECT void Socket::OnReconnect() { } #endif - time_t Socket::Uptime() { return time(NULL) - m_tCreate; } - #ifdef ENABLE_IPV6 void Socket::SetIpv6(bool x) { m_ipv6 = x; } - bool Socket::IsIpv6() { return m_ipv6; } #endif - void Socket::DisableRead(bool x) { m_b_disable_read = x; } - bool Socket::IsDisableRead() { return m_b_disable_read; } - void Socket::SendBuf(const char *,size_t,int) { } - void Socket::Send(const std::string&,int) { } - void Socket::SetConnected(bool x) { m_connected = x; } - bool Socket::IsConnected() { return m_connected; } - void Socket::OnDisconnect() { } - void Socket::SetLost() { m_bLost = true; } - bool Socket::Lost() { return m_bLost; } - void Socket::SetErasedByHandler(bool x) { m_b_erased_by_handler = x; } - bool Socket::ErasedByHandler() { return m_b_erased_by_handler; } - time_t Socket::TimeSinceClose() { return time(NULL) - m_tClose; } - void Socket::SetClientRemoteAddress(SocketAddress& ad) { if (!ad.IsValid()) @@ -598,7 +544,6 @@ void Socket::SetClientRemoteAddress(SocketAddress& ad) m_client_remote_address = ad.GetCopy(); } - std::auto_ptr<SocketAddress> Socket::GetClientRemoteAddress() { if (!m_client_remote_address.get()) @@ -608,83 +553,69 @@ std::auto_ptr<SocketAddress> Socket::GetClientRemoteAddress() return m_client_remote_address -> GetCopy(); } - uint64_t Socket::GetBytesSent(bool) { return 0; } - uint64_t Socket::GetBytesReceived(bool) { return 0; } - #ifdef HAVE_OPENSSL void Socket::OnSSLConnect() { } - void Socket::OnSSLAccept() { } - bool Socket::SSLNegotiate() { return false; } - bool Socket::IsSSL() { return m_b_enable_ssl; } - void Socket::EnableSSL(bool x) { m_b_enable_ssl = x; } - bool Socket::IsSSLNegotiate() { return m_b_ssl; } - void Socket::SetSSLNegotiate(bool x) { m_b_ssl = x; } - bool Socket::IsSSLServer() { return m_b_ssl_server; } - void Socket::SetSSLServer(bool x) { m_b_ssl_server = x; } - void Socket::OnSSLConnectFailed() { } - void Socket::OnSSLAcceptFailed() { } #endif // HAVE_OPENSSL - #ifdef ENABLE_POOL void Socket::CopyConnection(Socket *sock) { @@ -699,127 +630,106 @@ void Socket::CopyConnection(Socket *sock) SetRemoteAddress( *sock -> GetRemoteSocketAddress() ); } - void Socket::SetIsClient() { m_bClient = true; } - void Socket::SetSocketType(int x) { m_socket_type = x; } - int Socket::GetSocketType() { return m_socket_type; } - void Socket::SetSocketProtocol(const std::string& x) { m_socket_protocol = x; } - const std::string& Socket::GetSocketProtocol() { return m_socket_protocol; } - void Socket::SetRetain() { if (m_bClient) m_bRetain = true; } - bool Socket::Retain() { return m_bRetain; } - #endif // ENABLE_POOL - #ifdef ENABLE_SOCKS4 void Socket::OnSocks4Connect() { Handler().LogError(this, "OnSocks4Connect", 0, "Use with TcpSocket only"); } - void Socket::OnSocks4ConnectFailed() { Handler().LogError(this, "OnSocks4ConnectFailed", 0, "Use with TcpSocket only"); } - bool Socket::OnSocks4Read() { Handler().LogError(this, "OnSocks4Read", 0, "Use with TcpSocket only"); return true; } - void Socket::SetSocks4Host(const std::string& host) { Utility::u2ip(host, m_socks4_host); } - bool Socket::Socks4() { return m_bSocks4; } - void Socket::SetSocks4(bool x) { m_bSocks4 = x; } - void Socket::SetSocks4Host(ipaddr_t a) { m_socks4_host = a; } - void Socket::SetSocks4Port(port_t p) { m_socks4_port = p; } - void Socket::SetSocks4Userid(const std::string& x) { m_socks4_userid = x; } - ipaddr_t Socket::GetSocks4Host() { return m_socks4_host; } - port_t Socket::GetSocks4Port() { return m_socks4_port; } - const std::string& Socket::GetSocks4Userid() { return m_socks4_userid; } #endif // ENABLE_SOCKS4 - #ifdef ENABLE_DETACH bool Socket::Detach() { @@ -833,7 +743,6 @@ bool Socket::Detach() return true; } - void Socket::DetachSocket() { SetDetached(); @@ -841,43 +750,36 @@ void Socket::DetachSocket() m_pThread -> SetRelease(true); } - void Socket::OnDetached() { } - void Socket::SetDetach(bool x) { Handler().AddList(m_socket, LIST_DETACH, x); m_detach = x; } - bool Socket::IsDetach() { return m_detach; } - void Socket::SetDetached(bool x) { m_detached = x; } - const bool Socket::IsDetached() const { return m_detached; } - void Socket::SetSlaveHandler(ISocketHandler *p) { m_slave_handler = p; } - Socket::SocketThread::SocketThread(Socket *p) :Thread(false) ,m_socket(p) @@ -885,7 +787,6 @@ Socket::SocketThread::SocketThread(Socket *p) // Creator will release } - Socket::SocketThread::~SocketThread() { if (IsRunning()) @@ -900,7 +801,6 @@ Socket::SocketThread::~SocketThread() } } - void Socket::SocketThread::Run() { SocketHandler h; @@ -919,14 +819,12 @@ void Socket::SocketThread::Run() } #endif // ENABLE_DETACH - #ifdef ENABLE_RESOLVER int Socket::Resolve(const std::string& host,port_t port) { return Handler().Resolve(this, host, port); } - #ifdef ENABLE_IPV6 int Socket::Resolve6(const std::string& host,port_t port) { @@ -934,13 +832,11 @@ int Socket::Resolve6(const std::string& host,port_t port) } #endif - int Socket::Resolve(ipaddr_t a) { return Handler().Resolve(this, a); } - #ifdef ENABLE_IPV6 int Socket::Resolve(in6_addr& a) { @@ -948,33 +844,27 @@ int Socket::Resolve(in6_addr& a) } #endif - void Socket::OnResolved(int,ipaddr_t,port_t) { } - #ifdef ENABLE_IPV6 void Socket::OnResolved(int,in6_addr&,port_t) { } #endif - void Socket::OnReverseResolved(int,const std::string&) { } - void Socket::OnResolveFailed(int) { } #endif // ENABLE_RESOLVER - /* IP options */ - bool Socket::SetIpOptions(const void *p, socklen_t len) { #ifdef IP_OPTIONS @@ -990,7 +880,6 @@ bool Socket::SetIpOptions(const void *p, socklen_t len) #endif } - #ifdef IP_PKTINFO bool Socket::SetIpPktinfo(bool x) { @@ -1004,7 +893,6 @@ bool Socket::SetIpPktinfo(bool x) } #endif - #ifdef IP_RECVTOS bool Socket::SetIpRecvTOS(bool x) { @@ -1018,7 +906,6 @@ bool Socket::SetIpRecvTOS(bool x) } #endif - #ifdef IP_RECVTTL bool Socket::SetIpRecvTTL(bool x) { @@ -1032,7 +919,6 @@ bool Socket::SetIpRecvTTL(bool x) } #endif - #ifdef IP_RECVOPTS bool Socket::SetIpRecvopts(bool x) { @@ -1046,7 +932,6 @@ bool Socket::SetIpRecvopts(bool x) } #endif - #ifdef IP_RETOPTS bool Socket::SetIpRetopts(bool x) { @@ -1060,7 +945,6 @@ bool Socket::SetIpRetopts(bool x) } #endif - bool Socket::SetIpTOS(unsigned char tos) { #ifdef IP_TOS @@ -1076,7 +960,6 @@ bool Socket::SetIpTOS(unsigned char tos) #endif } - unsigned char Socket::IpTOS() { unsigned char tos = 0; @@ -1092,7 +975,6 @@ unsigned char Socket::IpTOS() return tos; } - bool Socket::SetIpTTL(int ttl) { #ifdef IP_TTL @@ -1108,7 +990,6 @@ bool Socket::SetIpTTL(int ttl) #endif } - int Socket::IpTTL() { int ttl = 0; @@ -1124,7 +1005,6 @@ int Socket::IpTTL() return ttl; } - bool Socket::SetIpHdrincl(bool x) { #ifdef IP_HDRINCL @@ -1141,7 +1021,6 @@ bool Socket::SetIpHdrincl(bool x) #endif } - #ifdef IP_RECVERR bool Socket::SetIpRecverr(bool x) { @@ -1155,7 +1034,6 @@ bool Socket::SetIpRecverr(bool x) } #endif - #ifdef IP_MTU_DISCOVER bool Socket::SetIpMtudiscover(bool x) { @@ -1169,7 +1047,6 @@ bool Socket::SetIpMtudiscover(bool x) } #endif - #ifdef IP_MTU int Socket::IpMtu() { @@ -1183,7 +1060,6 @@ int Socket::IpMtu() } #endif - #ifdef IP_ROUTER_ALERT bool Socket::SetIpRouterAlert(bool x) { @@ -1197,7 +1073,6 @@ bool Socket::SetIpRouterAlert(bool x) } #endif - bool Socket::SetIpMulticastTTL(int ttl) { #ifdef IP_MULTICAST_TTL @@ -1213,7 +1088,6 @@ bool Socket::SetIpMulticastTTL(int ttl) #endif } - int Socket::IpMulticastTTL() { int ttl = 0; @@ -1229,7 +1103,6 @@ int Socket::IpMulticastTTL() return ttl; } - bool Socket::SetMulticastLoop(bool x) { #ifdef IP_MULTICAST_LOOP @@ -1246,7 +1119,6 @@ bool Socket::SetMulticastLoop(bool x) #endif } - #ifdef LINUX bool Socket::IpAddMembership(struct ip_mreqn& ref) { @@ -1264,7 +1136,6 @@ bool Socket::IpAddMembership(struct ip_mreqn& ref) } #endif - bool Socket::IpAddMembership(struct ip_mreq& ref) { #ifdef IP_ADD_MEMBERSHIP @@ -1280,7 +1151,6 @@ bool Socket::IpAddMembership(struct ip_mreq& ref) #endif } - #ifdef LINUX bool Socket::IpDropMembership(struct ip_mreqn& ref) { @@ -1298,7 +1168,6 @@ bool Socket::IpDropMembership(struct ip_mreqn& ref) } #endif - bool Socket::IpDropMembership(struct ip_mreq& ref) { #ifdef IP_DROP_MEMBERSHIP @@ -1314,10 +1183,8 @@ bool Socket::IpDropMembership(struct ip_mreq& ref) #endif } - /* SOCKET options */ - bool Socket::SetSoReuseaddr(bool x) { #ifdef SO_REUSEADDR @@ -1334,7 +1201,6 @@ bool Socket::SetSoReuseaddr(bool x) #endif } - bool Socket::SetSoKeepalive(bool x) { #ifdef SO_KEEPALIVE @@ -1351,7 +1217,6 @@ bool Socket::SetSoKeepalive(bool x) #endif } - #ifdef SO_NOSIGPIPE bool Socket::SetSoNosigpipe(bool x) { @@ -1365,7 +1230,6 @@ bool Socket::SetSoNosigpipe(bool x) } #endif - bool Socket::SoAcceptconn() { int value = 0; @@ -1381,7 +1245,6 @@ bool Socket::SoAcceptconn() return value ? true : false; } - #ifdef SO_BSDCOMPAT bool Socket::SetSoBsdcompat(bool x) { @@ -1395,7 +1258,6 @@ bool Socket::SetSoBsdcompat(bool x) } #endif - #ifdef SO_BINDTODEVICE bool Socket::SetSoBindtodevice(const std::string& intf) { @@ -1408,7 +1270,6 @@ bool Socket::SetSoBindtodevice(const std::string& intf) } #endif - bool Socket::SetSoBroadcast(bool x) { #ifdef SO_BROADCAST @@ -1425,7 +1286,6 @@ bool Socket::SetSoBroadcast(bool x) #endif } - bool Socket::SetSoDebug(bool x) { #ifdef SO_DEBUG @@ -1442,7 +1302,6 @@ bool Socket::SetSoDebug(bool x) #endif } - int Socket::SoError() { int value = 0; @@ -1458,7 +1317,6 @@ int Socket::SoError() return value; } - bool Socket::SetSoDontroute(bool x) { #ifdef SO_DONTROUTE @@ -1475,7 +1333,6 @@ bool Socket::SetSoDontroute(bool x) #endif } - bool Socket::SetSoLinger(int onoff, int linger) { #ifdef SO_LINGER @@ -1494,7 +1351,6 @@ bool Socket::SetSoLinger(int onoff, int linger) #endif } - bool Socket::SetSoOobinline(bool x) { #ifdef SO_OOBINLINE @@ -1511,7 +1367,6 @@ bool Socket::SetSoOobinline(bool x) #endif } - #ifdef SO_PASSCRED bool Socket::SetSoPasscred(bool x) { @@ -1525,7 +1380,6 @@ bool Socket::SetSoPasscred(bool x) } #endif - #ifdef SO_PEERCRED bool Socket::SoPeercred(struct ucred& ucr) { @@ -1538,7 +1392,6 @@ bool Socket::SoPeercred(struct ucred& ucr) } #endif - #ifdef SO_PRIORITY bool Socket::SetSoPriority(int x) { @@ -1551,7 +1404,6 @@ bool Socket::SetSoPriority(int x) } #endif - bool Socket::SetSoRcvlowat(int x) { #ifdef SO_RCVLOWAT @@ -1567,7 +1419,6 @@ bool Socket::SetSoRcvlowat(int x) #endif } - bool Socket::SetSoSndlowat(int x) { #ifdef SO_SNDLOWAT @@ -1583,7 +1434,6 @@ bool Socket::SetSoSndlowat(int x) #endif } - bool Socket::SetSoRcvtimeo(struct timeval& tv) { #ifdef SO_RCVTIMEO @@ -1599,7 +1449,6 @@ bool Socket::SetSoRcvtimeo(struct timeval& tv) #endif } - bool Socket::SetSoSndtimeo(struct timeval& tv) { #ifdef SO_SNDTIMEO @@ -1615,7 +1464,6 @@ bool Socket::SetSoSndtimeo(struct timeval& tv) #endif } - bool Socket::SetSoRcvbuf(int x) { #ifdef SO_RCVBUF @@ -1631,7 +1479,6 @@ bool Socket::SetSoRcvbuf(int x) #endif } - int Socket::SoRcvbuf() { int value = 0; @@ -1647,7 +1494,6 @@ int Socket::SoRcvbuf() return value; } - #ifdef SO_RCVBUFFORCE bool Socket::SetSoRcvbufforce(int x) { @@ -1660,7 +1506,6 @@ bool Socket::SetSoRcvbufforce(int x) } #endif - bool Socket::SetSoSndbuf(int x) { #ifdef SO_SNDBUF @@ -1676,7 +1521,6 @@ bool Socket::SetSoSndbuf(int x) #endif } - int Socket::SoSndbuf() { int value = 0; @@ -1692,7 +1536,6 @@ int Socket::SoSndbuf() return value; } - #ifdef SO_SNDBUFFORCE bool Socket::SetSoSndbufforce(int x) { @@ -1705,7 +1548,6 @@ bool Socket::SetSoSndbufforce(int x) } #endif - #ifdef SO_TIMESTAMP bool Socket::SetSoTimestamp(bool x) { @@ -1719,7 +1561,6 @@ bool Socket::SetSoTimestamp(bool x) } #endif - int Socket::SoType() { int value = 0; @@ -1735,31 +1576,26 @@ int Socket::SoType() return value; } - #ifdef ENABLE_TRIGGERS void Socket::Subscribe(int id) { Handler().Subscribe(id, this); } - void Socket::Unsubscribe(int id) { Handler().Unsubscribe(id, this); } - void Socket::OnTrigger(int, const TriggerData&) { } - void Socket::OnCancelled(int) { } #endif - void Socket::SetTimeout(time_t secs) { if (!secs) @@ -1772,17 +1608,14 @@ void Socket::SetTimeout(time_t secs) m_timeout_limit = secs; } - void Socket::OnTimeout() { } - void Socket::OnConnectTimeout() { } - bool Socket::Timeout(time_t tnow) { if (tnow - m_timeout_start > m_timeout_limit) @@ -1790,7 +1623,6 @@ bool Socket::Timeout(time_t tnow) return false; } - /** Returns local port number for bound socket file descriptor. */ port_t Socket::GetSockPort() { @@ -1813,7 +1645,6 @@ port_t Socket::GetSockPort() return ntohs(sa.sin_port); } - /** Returns local ipv4 address for bound socket file descriptor. */ ipaddr_t Socket::GetSockIP4() { @@ -1834,7 +1665,6 @@ ipaddr_t Socket::GetSockIP4() return a; } - /** Returns local ipv4 address as text for bound socket file descriptor. */ std::string Socket::GetSockAddress() { @@ -1854,7 +1684,6 @@ std::string Socket::GetSockAddress() return addr.Convert(); } - #ifdef ENABLE_IPV6 #ifdef IPPROTO_IPV6 /** Returns local ipv6 address for bound socket file descriptor. */ @@ -1873,7 +1702,6 @@ struct in6_addr Socket::GetSockIP6() return a; } - /** Returns local ipv6 address as text for bound socket file descriptor. */ std::string Socket::GetSockAddress6() { @@ -1891,7 +1719,6 @@ std::string Socket::GetSockAddress6() #endif #endif - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/src/sockets/SocketHandler.cpp b/dep/src/sockets/SocketHandler.cpp index 84d110cfe72..acf71fb2efa 100644 --- a/dep/src/sockets/SocketHandler.cpp +++ b/dep/src/sockets/SocketHandler.cpp @@ -50,14 +50,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. namespace SOCKETS_NAMESPACE { #endif - //#ifdef _DEBUG //#define DEB(x) x; fflush(stderr); //#else #define DEB(x) //#endif - SocketHandler::SocketHandler(StdLog *p) :m_stdlog(p) ,m_mutex(m_mutex) @@ -90,7 +88,6 @@ SocketHandler::SocketHandler(StdLog *p) FD_ZERO(&m_efds); } - SocketHandler::SocketHandler(Mutex& mutex,StdLog *p) :m_stdlog(p) ,m_mutex(mutex) @@ -124,7 +121,6 @@ SocketHandler::SocketHandler(Mutex& mutex,StdLog *p) FD_ZERO(&m_efds); } - SocketHandler::~SocketHandler() { #ifdef ENABLE_RESOLVER @@ -182,33 +178,28 @@ DEB( fprintf(stderr, "/Emptying sockets list in SocketHandler destructor, } } - Mutex& SocketHandler::GetMutex() const { return m_mutex; } - #ifdef ENABLE_DETACH void SocketHandler::SetSlave(bool x) { m_slave = x; } - bool SocketHandler::IsSlave() { return m_slave; } #endif - void SocketHandler::RegStdLog(StdLog *log) { m_stdlog = log; } - void SocketHandler::LogError(Socket *p,const std::string& user_text,int err,const std::string& sys_err,loglevel_t t) { if (m_stdlog) @@ -217,7 +208,6 @@ void SocketHandler::LogError(Socket *p,const std::string& user_text,int err,cons } } - void SocketHandler::Add(Socket *p) { if (p -> GetSocket() == INVALID_SOCKET) @@ -238,7 +228,6 @@ void SocketHandler::Add(Socket *p) m_add[p -> GetSocket()] = p; } - void SocketHandler::Get(SOCKET s,bool& r,bool& w,bool& e) { if (s >= 0) @@ -249,7 +238,6 @@ void SocketHandler::Get(SOCKET s,bool& r,bool& w,bool& e) } } - void SocketHandler::Set(SOCKET s,bool bRead,bool bWrite,bool bException) { DEB( fprintf(stderr, "Set(%d, %s, %s, %s)\n", s, bRead ? "true" : "false", bWrite ? "true" : "false", bException ? "true" : "false");) @@ -291,7 +279,6 @@ DEB( fprintf(stderr, "Set(%d, %s, %s, %s)\n", s, bRead ? "true" : "false", bW } } - int SocketHandler::Select(long sec,long usec) { struct timeval tv; @@ -300,7 +287,6 @@ int SocketHandler::Select(long sec,long usec) return Select(&tv); } - int SocketHandler::Select() { if (!m_fds_callonconnect.empty() || @@ -317,7 +303,6 @@ int SocketHandler::Select() return Select(NULL); } - int SocketHandler::Select(struct timeval *tsel) { size_t ignore = 0; @@ -965,7 +950,6 @@ DEB( fprintf(stderr, "Close() before OnDelete\n");) return n; } - #ifdef ENABLE_RESOLVER bool SocketHandler::Resolving(Socket *p0) { @@ -974,7 +958,6 @@ bool SocketHandler::Resolving(Socket *p0) } #endif - bool SocketHandler::Valid(Socket *p0) { for (socket_m::iterator it = m_sockets.begin(); it != m_sockets.end(); it++) @@ -986,13 +969,11 @@ bool SocketHandler::Valid(Socket *p0) return false; } - bool SocketHandler::OkToAccept(Socket *) { return true; } - size_t SocketHandler::GetCount() { /* @@ -1003,33 +984,28 @@ printf(" m_delete : %d\n", m_delete.size()); return m_sockets.size() + m_add.size() + m_delete.size(); } - #ifdef ENABLE_SOCKS4 void SocketHandler::SetSocks4Host(ipaddr_t a) { m_socks4_host = a; } - void SocketHandler::SetSocks4Host(const std::string& host) { Utility::u2ip(host, m_socks4_host); } - void SocketHandler::SetSocks4Port(port_t port) { m_socks4_port = port; } - void SocketHandler::SetSocks4Userid(const std::string& id) { m_socks4_userid = id; } #endif - #ifdef ENABLE_RESOLVER int SocketHandler::Resolve(Socket *p,const std::string& host,port_t port) { @@ -1049,7 +1025,6 @@ DEB( fprintf(stderr, " *** Resolve '%s:%d' id#%d m_resolve_q size: %d p: %p return resolv -> GetId(); } - #ifdef ENABLE_IPV6 int SocketHandler::Resolve6(Socket *p,const std::string& host,port_t port) { @@ -1069,7 +1044,6 @@ int SocketHandler::Resolve6(Socket *p,const std::string& host,port_t port) } #endif - int SocketHandler::Resolve(Socket *p,ipaddr_t a) { // check cache @@ -1087,7 +1061,6 @@ int SocketHandler::Resolve(Socket *p,ipaddr_t a) return resolv -> GetId(); } - #ifdef ENABLE_IPV6 int SocketHandler::Resolve(Socket *p,in6_addr& a) { @@ -1107,7 +1080,6 @@ int SocketHandler::Resolve(Socket *p,in6_addr& a) } #endif - void SocketHandler::EnableResolver(port_t port) { if (!m_resolver) @@ -1117,60 +1089,51 @@ void SocketHandler::EnableResolver(port_t port) } } - bool SocketHandler::ResolverReady() { return m_resolver ? m_resolver -> Ready() : false; } #endif // ENABLE_RESOLVER - #ifdef ENABLE_SOCKS4 void SocketHandler::SetSocks4TryDirect(bool x) { m_bTryDirect = x; } - ipaddr_t SocketHandler::GetSocks4Host() { return m_socks4_host; } - port_t SocketHandler::GetSocks4Port() { return m_socks4_port; } - const std::string& SocketHandler::GetSocks4Userid() { return m_socks4_userid; } - bool SocketHandler::Socks4TryDirect() { return m_bTryDirect; } #endif - #ifdef ENABLE_RESOLVER bool SocketHandler::ResolverEnabled() { return m_resolver ? true : false; } - port_t SocketHandler::GetResolverPort() { return m_resolver_port; } #endif // ENABLE_RESOLVER - #ifdef ENABLE_POOL ISocketHandler::PoolSocket *SocketHandler::FindConnection(int type,const std::string& protocol,SocketAddress& ad) { @@ -1193,20 +1156,17 @@ ISocketHandler::PoolSocket *SocketHandler::FindConnection(int type,const std::st return NULL; } - void SocketHandler::EnablePool(bool x) { m_b_enable_pool = x; } - bool SocketHandler::PoolEnabled() { return m_b_enable_pool; } #endif - void SocketHandler::Remove(Socket *p) { #ifdef ENABLE_RESOLVER @@ -1247,7 +1207,6 @@ void SocketHandler::Remove(Socket *p) } } - void SocketHandler::CheckSanity() { CheckList(m_fds, "active sockets"); // active sockets @@ -1261,7 +1220,6 @@ void SocketHandler::CheckSanity() CheckList(m_fds_close, "checklist close and delete"); } - void SocketHandler::CheckList(socket_v& ref,const std::string& listname) { for (socket_v::iterator it = ref.begin(); it != ref.end(); it++) @@ -1288,7 +1246,6 @@ void SocketHandler::CheckList(socket_v& ref,const std::string& listname) } } - void SocketHandler::AddList(SOCKET s,list_t which_one,bool add) { if (s == INVALID_SOCKET) @@ -1345,7 +1302,6 @@ DEB( fprintf(stderr, "AddList; %5d: %s: %s\n", s, (which_one == LIST_CALLONC //DEB( fprintf(stderr, "/AddList\n");) } - #ifdef ENABLE_TRIGGERS int SocketHandler::TriggerID(Socket *src) { @@ -1354,7 +1310,6 @@ int SocketHandler::TriggerID(Socket *src) return id; } - bool SocketHandler::Subscribe(int id, Socket *dst) { if (m_trigger_src.find(id) != m_trigger_src.end()) @@ -1372,7 +1327,6 @@ bool SocketHandler::Subscribe(int id, Socket *dst) return false; } - bool SocketHandler::Unsubscribe(int id, Socket *dst) { if (m_trigger_src.find(id) != m_trigger_src.end()) @@ -1390,7 +1344,6 @@ bool SocketHandler::Unsubscribe(int id, Socket *dst) return false; } - void SocketHandler::Trigger(int id, Socket::TriggerData& data, bool erase) { if (m_trigger_src.find(id) != m_trigger_src.end()) @@ -1417,7 +1370,6 @@ void SocketHandler::Trigger(int id, Socket::TriggerData& data, bool erase) } #endif // ENABLE_TRIGGERS - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/src/sockets/StdoutLog.cpp b/dep/src/sockets/StdoutLog.cpp index 998613f0fb2..e745a6d3358 100644 --- a/dep/src/sockets/StdoutLog.cpp +++ b/dep/src/sockets/StdoutLog.cpp @@ -44,8 +44,6 @@ namespace SOCKETS_NAMESPACE { #endif - - void StdoutLog::error(ISocketHandler *,Socket *sock,const std::string& call,int err,const std::string& sys_err,loglevel_t lvl) { time_t t = time(NULL); @@ -93,10 +91,8 @@ void StdoutLog::error(ISocketHandler *,Socket *sock,const std::string& call,int } } - #ifdef SOCKETS_NAMESPACE } #endif - diff --git a/dep/src/sockets/StreamSocket.cpp b/dep/src/sockets/StreamSocket.cpp index c8a3c32e496..009abadad8f 100644 --- a/dep/src/sockets/StreamSocket.cpp +++ b/dep/src/sockets/StreamSocket.cpp @@ -1,12 +1,10 @@ #include "StreamSocket.h" #include "ISocketHandler.h" - #ifdef SOCKETS_NAMESPACE namespace SOCKETS_NAMESPACE { #endif - StreamSocket::StreamSocket(ISocketHandler& h) : Socket(h) ,m_bConnecting(false) ,m_connect_timeout(5) @@ -20,12 +18,10 @@ StreamSocket::StreamSocket(ISocketHandler& h) : Socket(h) { } - StreamSocket::~StreamSocket() { } - void StreamSocket::SetConnecting(bool x) { if (x != m_bConnecting) @@ -42,13 +38,11 @@ void StreamSocket::SetConnecting(bool x) } } - bool StreamSocket::Connecting() { return m_bConnecting; } - bool StreamSocket::Ready() { if (GetSocket() != INVALID_SOCKET && !Connecting() && !CloseAndDelete()) @@ -56,113 +50,94 @@ bool StreamSocket::Ready() return false; } - void StreamSocket::SetConnectTimeout(int x) { m_connect_timeout = x; } - int StreamSocket::GetConnectTimeout() { return m_connect_timeout; } - void StreamSocket::SetFlushBeforeClose(bool x) { m_flush_before_close = x; } - bool StreamSocket::GetFlushBeforeClose() { return m_flush_before_close; } - int StreamSocket::GetConnectionRetry() { return m_connection_retry; } - void StreamSocket::SetConnectionRetry(int x) { m_connection_retry = x; } - int StreamSocket::GetConnectionRetries() { return m_retries; } - void StreamSocket::IncreaseConnectionRetries() { m_retries++; } - void StreamSocket::ResetConnectionRetries() { m_retries = 0; } - void StreamSocket::SetCallOnConnect(bool x) { Handler().AddList(GetSocket(), LIST_CALLONCONNECT, x); m_call_on_connect = x; } - bool StreamSocket::CallOnConnect() { return m_call_on_connect; } - void StreamSocket::SetRetryClientConnect(bool x) { Handler().AddList(GetSocket(), LIST_RETRY, x); m_b_retry_connect = x; } - bool StreamSocket::RetryClientConnect() { return m_b_retry_connect; } - void StreamSocket::SetLineProtocol(bool x) { m_line_protocol = x; } - bool StreamSocket::LineProtocol() { return m_line_protocol; } - void StreamSocket::SetShutdown(int x) { m_shutdown = x; } - int StreamSocket::GetShutdown() { return m_shutdown; } - - #ifdef SOCKETS_NAMESPACE } // namespace SOCKETS_NAMESPACE { #endif diff --git a/dep/src/sockets/TcpSocket.cpp b/dep/src/sockets/TcpSocket.cpp index c4efa05d5bf..5f067b53124 100644 --- a/dep/src/sockets/TcpSocket.cpp +++ b/dep/src/sockets/TcpSocket.cpp @@ -58,20 +58,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. namespace SOCKETS_NAMESPACE { #endif - //#ifdef _DEBUG //#define DEB(x) x //#else #define DEB(x) //#endif - // statics #ifdef HAVE_OPENSSL SSLInitializer TcpSocket::m_ssl_init; #endif - // thanks, q #ifdef _MSC_VER #pragma warning(disable:4355) @@ -109,7 +106,6 @@ TcpSocket::TcpSocket(ISocketHandler& h) : StreamSocket(h) #pragma warning(default:4355) #endif - #ifdef _MSC_VER #pragma warning(disable:4355) #endif @@ -146,7 +142,6 @@ TcpSocket::TcpSocket(ISocketHandler& h,size_t isize,size_t osize) : StreamSocket #pragma warning(default:4355) #endif - TcpSocket::~TcpSocket() { #ifdef SOCKETS_DYNAMIC_TEMP @@ -168,7 +163,6 @@ TcpSocket::~TcpSocket() #endif } - bool TcpSocket::Open(ipaddr_t ip,port_t port,bool skip_socks) { Ipv4Address ad(ip, port); @@ -176,7 +170,6 @@ bool TcpSocket::Open(ipaddr_t ip,port_t port,bool skip_socks) return Open(ad, local, skip_socks); } - #ifdef ENABLE_IPV6 #ifdef IPPROTO_IPV6 bool TcpSocket::Open(in6_addr ip,port_t port,bool skip_socks) @@ -187,14 +180,12 @@ bool TcpSocket::Open(in6_addr ip,port_t port,bool skip_socks) #endif #endif - bool TcpSocket::Open(SocketAddress& ad,bool skip_socks) { Ipv4Address bind_ad("0.0.0.0", 0); return Open(ad, bind_ad, skip_socks); } - bool TcpSocket::Open(SocketAddress& ad,SocketAddress& bind_ad,bool skip_socks) { if (!ad.IsValid()) @@ -320,7 +311,6 @@ bool TcpSocket::Open(SocketAddress& ad,SocketAddress& bind_ad,bool skip_socks) return true; //!Connecting(); } - bool TcpSocket::Open(const std::string &host,port_t port) { #ifdef ENABLE_IPV6 @@ -369,7 +359,6 @@ bool TcpSocket::Open(const std::string &host,port_t port) #endif } - #ifdef ENABLE_RESOLVER void TcpSocket::OnResolved(int id,ipaddr_t a,port_t port) { @@ -401,7 +390,6 @@ DEB( fprintf(stderr, "TcpSocket::OnResolved id %d addr %x port %d\n", id, a, } } - #ifdef ENABLE_IPV6 void TcpSocket::OnResolved(int id,in6_addr& a,port_t port) { @@ -429,7 +417,6 @@ void TcpSocket::OnResolved(int id,in6_addr& a,port_t port) #endif #endif - void TcpSocket::OnRead() { int n = 0; @@ -542,7 +529,6 @@ DEB( fprintf(stderr, "SSL read problem, errcode = %d\n",n);) OnRead( buf, n ); } - void TcpSocket::OnRead( char *buf, size_t n ) { // unbuffered @@ -620,12 +606,10 @@ void TcpSocket::OnRead( char *buf, size_t n ) #endif } - void TcpSocket::OnWriteComplete() { } - void TcpSocket::OnWrite() { if (Connecting()) @@ -718,7 +702,6 @@ void TcpSocket::OnWrite() } } - int TcpSocket::TryWrite(const char *buf, size_t len) { int n = 0; @@ -787,7 +770,6 @@ DEB( int errnr = SSL_get_error(m_ssl, n); return n; } - void TcpSocket::Buffer(const char *buf, size_t len) { size_t ptr = 0; @@ -819,13 +801,11 @@ void TcpSocket::Buffer(const char *buf, size_t len) } } - void TcpSocket::Send(const std::string &str,int i) { SendBuf(str.c_str(),str.size(),i); } - void TcpSocket::SendBuf(const char *buf,size_t len,int) { if (!Ready() && !Connecting()) @@ -876,12 +856,10 @@ void TcpSocket::SendBuf(const char *buf,size_t len,int) } } - void TcpSocket::OnLine(const std::string& ) { } - #ifdef _MSC_VER #pragma warning(disable:4355) #endif @@ -894,7 +872,6 @@ TcpSocket::TcpSocket(const TcpSocket& s) #pragma warning(default:4355) #endif - #ifdef ENABLE_SOCKS4 void TcpSocket::OnSocks4Connect() { @@ -929,7 +906,6 @@ void TcpSocket::OnSocks4Connect() m_socks4_state = 0; } - void TcpSocket::OnSocks4ConnectFailed() { Handler().LogError(this,"OnSocks4ConnectFailed",0,"connection to socks4 server failed, trying direct connection",LOG_LEVEL_WARNING); @@ -945,7 +921,6 @@ void TcpSocket::OnSocks4ConnectFailed() } } - bool TcpSocket::OnSocks4Read() { switch (m_socks4_state) @@ -1005,7 +980,6 @@ bool TcpSocket::OnSocks4Read() } #endif - void TcpSocket::Sendf(const char *format, ...) { va_list ap; @@ -1020,7 +994,6 @@ void TcpSocket::Sendf(const char *format, ...) Send( slask ); } - #ifdef HAVE_OPENSSL void TcpSocket::OnSSLConnect() { @@ -1064,7 +1037,6 @@ DEB( fprintf(stderr, " m_sbio is NULL\n");) } } - void TcpSocket::OnSSLAccept() { SetNonblocking(true); @@ -1103,7 +1075,6 @@ DEB( fprintf(stderr, " m_sbio is NULL\n");) } } - bool TcpSocket::SSLNegotiate() { if (!IsSSLServer()) // client @@ -1200,20 +1171,17 @@ DEB( fprintf(stderr, "SSL_accept() failed - closing socket, retur return false; } - void TcpSocket::InitSSLClient() { InitializeContext("", SSLv23_method()); } - void TcpSocket::InitSSLServer() { Handler().LogError(this, "InitSSLServer", 0, "You MUST implement your own InitSSLServer method", LOG_LEVEL_FATAL); SetCloseAndDelete(); } - void TcpSocket::InitializeContext(const std::string& context, SSL_METHOD *meth_in) { /* Create our context*/ @@ -1230,7 +1198,6 @@ void TcpSocket::InitializeContext(const std::string& context, SSL_METHOD *meth_i } } - void TcpSocket::InitializeContext(const std::string& context,const std::string& keyfile,const std::string& password,SSL_METHOD *meth_in) { /* Create our context*/ @@ -1266,7 +1233,6 @@ void TcpSocket::InitializeContext(const std::string& context,const std::string& } } - void TcpSocket::InitializeContext(const std::string& context,const std::string& certfile,const std::string& keyfile,const std::string& password,SSL_METHOD *meth_in) { /* Create our context*/ @@ -1302,7 +1268,6 @@ void TcpSocket::InitializeContext(const std::string& context,const std::string& } } - int TcpSocket::SSL_password_cb(char *buf,int num,int rwflag,void *userdata) { Socket *p0 = static_cast<Socket *>(userdata); @@ -1317,7 +1282,6 @@ int TcpSocket::SSL_password_cb(char *buf,int num,int rwflag,void *userdata) } #endif // HAVE_OPENSSL - int TcpSocket::Close() { if (GetSocket() == INVALID_SOCKET) // this could happen @@ -1356,7 +1320,6 @@ int TcpSocket::Close() return Socket::Close(); } - #ifdef HAVE_OPENSSL SSL_CTX *TcpSocket::GetSslContext() { @@ -1373,7 +1336,6 @@ SSL *TcpSocket::GetSsl() } #endif - #ifdef ENABLE_RECONNECT void TcpSocket::SetReconnect(bool x) { @@ -1381,24 +1343,20 @@ void TcpSocket::SetReconnect(bool x) } #endif - void TcpSocket::OnRawData(const char *buf_in,size_t len) { } - size_t TcpSocket::GetInputLength() { return ibuf.GetLength(); } - size_t TcpSocket::GetOutputLength() { return m_output_length; } - uint64_t TcpSocket::GetBytesReceived(bool clear) { uint64_t z = m_bytes_received; @@ -1407,7 +1365,6 @@ uint64_t TcpSocket::GetBytesReceived(bool clear) return z; } - uint64_t TcpSocket::GetBytesSent(bool clear) { uint64_t z = m_bytes_sent; @@ -1416,27 +1373,23 @@ uint64_t TcpSocket::GetBytesSent(bool clear) return z; } - #ifdef ENABLE_RECONNECT bool TcpSocket::Reconnect() { return m_b_reconnect; } - void TcpSocket::SetIsReconnect(bool x) { m_b_is_reconnect = x; } - bool TcpSocket::IsReconnect() { return m_b_is_reconnect; } #endif - #ifdef HAVE_OPENSSL const std::string& TcpSocket::GetPassword() { @@ -1444,13 +1397,11 @@ const std::string& TcpSocket::GetPassword() } #endif - void TcpSocket::DisableInputBuffer(bool x) { m_b_input_buffer_disabled = x; } - void TcpSocket::OnOptions(int family,int type,int protocol,SOCKET s) { DEB( fprintf(stderr, "Socket::OnOptions()\n");) @@ -1461,14 +1412,12 @@ DEB( fprintf(stderr, "Socket::OnOptions()\n");) SetSoKeepalive(true); } - void TcpSocket::SetLineProtocol(bool x) { StreamSocket::SetLineProtocol(x); DisableInputBuffer(x); } - bool TcpSocket::SetTcpNodelay(bool x) { #ifdef TCP_NODELAY @@ -1485,7 +1434,6 @@ bool TcpSocket::SetTcpNodelay(bool x) #endif } - TcpSocket::CircularBuffer::CircularBuffer(size_t size) :buf(new char[2 * size]) ,m_max(size) @@ -1496,13 +1444,11 @@ TcpSocket::CircularBuffer::CircularBuffer(size_t size) { } - TcpSocket::CircularBuffer::~CircularBuffer() { delete[] buf; } - bool TcpSocket::CircularBuffer::Write(const char *s,size_t l) { if (m_q + l > m_max) @@ -1532,7 +1478,6 @@ bool TcpSocket::CircularBuffer::Write(const char *s,size_t l) return true; } - bool TcpSocket::CircularBuffer::Read(char *s,size_t l) { if (l > m_q) @@ -1598,31 +1543,26 @@ bool TcpSocket::CircularBuffer::Remove(size_t l) return Read(NULL, l); } - size_t TcpSocket::CircularBuffer::GetLength() { return m_q; } - const char *TcpSocket::CircularBuffer::GetStart() { return buf + m_b; } - size_t TcpSocket::CircularBuffer::GetL() { return (m_b + m_q > m_max) ? m_max - m_b : m_q; } - size_t TcpSocket::CircularBuffer::Space() { return m_max - m_q; } - unsigned long TcpSocket::CircularBuffer::ByteCounter(bool clear) { if (clear) @@ -1634,7 +1574,6 @@ unsigned long TcpSocket::CircularBuffer::ByteCounter(bool clear) return m_count; } - std::string TcpSocket::CircularBuffer::ReadString(size_t l) { char *sz = new char[l + 1]; @@ -1649,7 +1588,6 @@ std::string TcpSocket::CircularBuffer::ReadString(size_t l) return tmp; } - void TcpSocket::OnConnectTimeout() { Handler().LogError(this, "connect", -1, "connect timeout", LOG_LEVEL_FATAL); @@ -1687,7 +1625,6 @@ void TcpSocket::OnConnectTimeout() SetConnecting(false); } - #ifdef _WIN32 void TcpSocket::OnException() { @@ -1723,24 +1660,20 @@ void TcpSocket::OnException() } #endif // _WIN32 - int TcpSocket::Protocol() { return IPPROTO_TCP; } - void TcpSocket::SetTransferLimit(size_t sz) { m_transfer_limit = sz; } - void TcpSocket::OnTransferLimit() { } - #ifdef SOCKETS_NAMESPACE } #endif diff --git a/dep/src/sockets/Thread.cpp b/dep/src/sockets/Thread.cpp index a387a7e3824..773e9f214fa 100644 --- a/dep/src/sockets/Thread.cpp +++ b/dep/src/sockets/Thread.cpp @@ -37,12 +37,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "Thread.h" - #ifdef SOCKETS_NAMESPACE namespace SOCKETS_NAMESPACE { #endif - Thread::Thread(bool release) :m_thread(0) ,m_running(true) @@ -68,7 +66,6 @@ Thread::Thread(bool release) m_release = release; } - Thread::~Thread() { m_b_destructor = true; @@ -88,7 +85,6 @@ Thread::~Thread() #endif } - threadfunc_t STDPREFIX Thread::StartThread(threadparam_t zz) { Thread *p = (Thread *)zz; @@ -116,52 +112,43 @@ threadfunc_t STDPREFIX Thread::StartThread(threadparam_t zz) return (threadfunc_t)NULL; } - bool Thread::IsRunning() { return m_running; } - void Thread::SetRunning(bool x) { m_running = x; } - bool Thread::IsReleased() { return m_release; } - void Thread::SetRelease(bool x) { m_release = x; } - bool Thread::DeleteOnExit() { return m_b_delete_on_exit; } - void Thread::SetDeleteOnExit(bool x) { m_b_delete_on_exit = x; } - bool Thread::IsDestructor() { return m_b_destructor; } - #ifdef SOCKETS_NAMESPACE } #endif - diff --git a/dep/src/sockets/UdpSocket.cpp b/dep/src/sockets/UdpSocket.cpp index f4c3d2f9657..a3d393c00e2 100644 --- a/dep/src/sockets/UdpSocket.cpp +++ b/dep/src/sockets/UdpSocket.cpp @@ -47,12 +47,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // include this to see strange sights //#include <linux/in6.h> - #ifdef SOCKETS_NAMESPACE namespace SOCKETS_NAMESPACE { #endif - UdpSocket::UdpSocket(ISocketHandler& h, int ibufsz, bool ipv6, int retries) : Socket(h) , m_ibuf(new char[ibufsz]) , m_ibufsz(ibufsz) @@ -69,14 +67,12 @@ UdpSocket::UdpSocket(ISocketHandler& h, int ibufsz, bool ipv6, int retries) : So #endif } - UdpSocket::~UdpSocket() { Close(); delete[] m_ibuf; } - int UdpSocket::Bind(port_t &port, int range) { #ifdef ENABLE_IPV6 @@ -92,7 +88,6 @@ int UdpSocket::Bind(port_t &port, int range) return Bind(ad, range); } - int UdpSocket::Bind(const std::string& intf, port_t &port, int range) { #ifdef ENABLE_IPV6 @@ -118,14 +113,12 @@ int UdpSocket::Bind(const std::string& intf, port_t &port, int range) return -1; } - int UdpSocket::Bind(ipaddr_t a, port_t &port, int range) { Ipv4Address ad(a, port); return Bind(ad, range); } - #ifdef ENABLE_IPV6 #ifdef IPPROTO_IPV6 int UdpSocket::Bind(in6_addr a, port_t &port, int range) @@ -136,7 +129,6 @@ int UdpSocket::Bind(in6_addr a, port_t &port, int range) #endif #endif - int UdpSocket::Bind(SocketAddress& ad, int range) { if (GetSocket() == INVALID_SOCKET) @@ -169,7 +161,6 @@ int UdpSocket::Bind(SocketAddress& ad, int range) return -1; } - /** if you wish to use Send, first Open a connection */ bool UdpSocket::Open(ipaddr_t l, port_t port) { @@ -177,7 +168,6 @@ bool UdpSocket::Open(ipaddr_t l, port_t port) return Open(ad); } - bool UdpSocket::Open(const std::string& host, port_t port) { #ifdef ENABLE_IPV6 @@ -201,7 +191,6 @@ bool UdpSocket::Open(const std::string& host, port_t port) return false; } - #ifdef ENABLE_IPV6 #ifdef IPPROTO_IPV6 bool UdpSocket::Open(struct in6_addr& a, port_t port) @@ -212,7 +201,6 @@ bool UdpSocket::Open(struct in6_addr& a, port_t port) #endif #endif - bool UdpSocket::Open(SocketAddress& ad) { if (GetSocket() == INVALID_SOCKET) @@ -234,7 +222,6 @@ bool UdpSocket::Open(SocketAddress& ad) return false; } - void UdpSocket::CreateConnection() { #ifdef ENABLE_IPV6 @@ -267,7 +254,6 @@ void UdpSocket::CreateConnection() } } - /** send to specified address */ void UdpSocket::SendToBuf(const std::string& h, port_t p, const char *data, int len, int flags) { @@ -291,7 +277,6 @@ void UdpSocket::SendToBuf(const std::string& h, port_t p, const char *data, int } } - /** send to specified address */ void UdpSocket::SendToBuf(ipaddr_t a, port_t p, const char *data, int len, int flags) { @@ -299,7 +284,6 @@ void UdpSocket::SendToBuf(ipaddr_t a, port_t p, const char *data, int len, int f SendToBuf(ad, data, len, flags); } - #ifdef ENABLE_IPV6 #ifdef IPPROTO_IPV6 void UdpSocket::SendToBuf(in6_addr a, port_t p, const char *data, int len, int flags) @@ -310,7 +294,6 @@ void UdpSocket::SendToBuf(in6_addr a, port_t p, const char *data, int len, int f #endif #endif - void UdpSocket::SendToBuf(SocketAddress& ad, const char *data, int len, int flags) { if (GetSocket() == INVALID_SOCKET) @@ -327,19 +310,16 @@ void UdpSocket::SendToBuf(SocketAddress& ad, const char *data, int len, int flag } } - void UdpSocket::SendTo(const std::string& a, port_t p, const std::string& str, int flags) { SendToBuf(a, p, str.c_str(), (int)str.size(), flags); } - void UdpSocket::SendTo(ipaddr_t a, port_t p, const std::string& str, int flags) { SendToBuf(a, p, str.c_str(), (int)str.size(), flags); } - #ifdef ENABLE_IPV6 #ifdef IPPROTO_IPV6 void UdpSocket::SendTo(in6_addr a, port_t p, const std::string& str, int flags) @@ -349,13 +329,11 @@ void UdpSocket::SendTo(in6_addr a, port_t p, const std::string& str, int flags) #endif #endif - void UdpSocket::SendTo(SocketAddress& ad, const std::string& str, int flags) { SendToBuf(ad, str.c_str(), (int)str.size(), flags); } - /** send to connected address */ void UdpSocket::SendBuf(const char *data, size_t len, int flags) { @@ -370,13 +348,11 @@ void UdpSocket::SendBuf(const char *data, size_t len, int flags) } } - void UdpSocket::Send(const std::string& str, int flags) { SendBuf(str.c_str(), (int)str.size(), flags); } - #if defined(LINUX) || defined(MACOSX) int UdpSocket::ReadTS(char *ioBuf, int inBufSize, struct sockaddr *from, socklen_t fromlen, struct timeval *ts) { @@ -442,7 +418,6 @@ int UdpSocket::ReadTS(char *ioBuf, int inBufSize, struct sockaddr *from, socklen } #endif - void UdpSocket::OnRead() { #ifdef ENABLE_IPV6 @@ -555,7 +530,6 @@ void UdpSocket::OnRead() } } - void UdpSocket::SetBroadcast(bool b) { int one = 1; @@ -581,7 +555,6 @@ void UdpSocket::SetBroadcast(bool b) } } - bool UdpSocket::IsBroadcast() { int is_broadcast = 0; @@ -598,7 +571,6 @@ bool UdpSocket::IsBroadcast() return is_broadcast != 0; } - void UdpSocket::SetMulticastTTL(int ttl) { if (GetSocket() == INVALID_SOCKET) @@ -611,7 +583,6 @@ void UdpSocket::SetMulticastTTL(int ttl) } } - int UdpSocket::GetMulticastTTL() { int ttl = 0; @@ -628,7 +599,6 @@ int UdpSocket::GetMulticastTTL() return ttl; } - void UdpSocket::SetMulticastLoop(bool x) { if (GetSocket() == INVALID_SOCKET) @@ -655,7 +625,6 @@ void UdpSocket::SetMulticastLoop(bool x) } } - bool UdpSocket::IsMulticastLoop() { if (GetSocket() == INVALID_SOCKET) @@ -685,7 +654,6 @@ bool UdpSocket::IsMulticastLoop() return is_loop ? true : false; } - void UdpSocket::AddMulticastMembership(const std::string& group, const std::string& local_if, int if_index) { if (GetSocket() == INVALID_SOCKET) @@ -726,7 +694,6 @@ void UdpSocket::AddMulticastMembership(const std::string& group, const std::stri } } - void UdpSocket::DropMulticastMembership(const std::string& group, const std::string& local_if, int if_index) { if (GetSocket() == INVALID_SOCKET) @@ -767,7 +734,6 @@ void UdpSocket::DropMulticastMembership(const std::string& group, const std::str } } - #ifdef ENABLE_IPV6 #ifdef IPPROTO_IPV6 void UdpSocket::SetMulticastHops(int hops) @@ -787,7 +753,6 @@ void UdpSocket::SetMulticastHops(int hops) } } - int UdpSocket::GetMulticastHops() { if (GetSocket() == INVALID_SOCKET) @@ -810,44 +775,36 @@ int UdpSocket::GetMulticastHops() #endif // IPPROTO_IPV6 #endif - bool UdpSocket::IsBound() { return m_bind_ok; } - void UdpSocket::OnRawData(const char *buf, size_t len, struct sockaddr *sa, socklen_t sa_len) { } - void UdpSocket::OnRawData(const char *buf, size_t len, struct sockaddr *sa, socklen_t sa_len, struct timeval *ts) { } - port_t UdpSocket::GetPort() { return m_port; } - int UdpSocket::GetLastSizeWritten() { return m_last_size_written; } - void UdpSocket::SetTimestamp(bool x) { m_b_read_ts = x; } - #ifdef SOCKETS_NAMESPACE } #endif - diff --git a/dep/src/sockets/Utility.cpp b/dep/src/sockets/Utility.cpp index 6473f0a2564..7c093fc0832 100644 --- a/dep/src/sockets/Utility.cpp +++ b/dep/src/sockets/Utility.cpp @@ -45,7 +45,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. namespace SOCKETS_NAMESPACE { #endif - // defines for the random number generator #define TWIST_IA 397 #define TWIST_IB (TWIST_LEN - TWIST_IA) @@ -55,7 +54,6 @@ namespace SOCKETS_NAMESPACE { #define TWIST(b,i,j) ((b)[i] & UMASK) | ((b)[j] & LMASK) #define MAGIC_TWIST(s) (((s) & 1) * MATRIX_A) - // statics std::string Utility::m_host; bool Utility::m_local_resolved = false; @@ -68,7 +66,6 @@ std::string Utility::m_local_addr6; #endif #endif - std::string Utility::base64(const std::string& str_in) { std::string str; @@ -77,7 +74,6 @@ std::string Utility::base64(const std::string& str_in) return str; } - std::string Utility::base64d(const std::string& str_in) { std::string str; @@ -86,7 +82,6 @@ std::string Utility::base64d(const std::string& str_in) return str; } - std::string Utility::l2string(long l) { std::string str; @@ -96,7 +91,6 @@ std::string Utility::l2string(long l) return str; } - std::string Utility::bigint2string(uint64_t l) { std::string str; @@ -114,7 +108,6 @@ std::string Utility::bigint2string(uint64_t l) return str; } - uint64_t Utility::atoi64(const std::string& str) { uint64_t l = 0; @@ -125,7 +118,6 @@ uint64_t Utility::atoi64(const std::string& str) return l; } - unsigned int Utility::hex2unsigned(const std::string& str) { unsigned int r = 0; @@ -136,7 +128,6 @@ unsigned int Utility::hex2unsigned(const std::string& str) return r; } - /* * Encode string per RFC1738 URL encoding rules * tnx rstaveley @@ -167,7 +158,6 @@ static char hex[] = "0123456789ABCDEF"; return dst; } // rfc1738_encode - /* * Decode string per RFC1738 URL encoding rules * tnx rstaveley @@ -198,7 +188,6 @@ std::string Utility::rfc1738_decode(const std::string& src) return dst; } // rfc1738_decode - bool Utility::isipv4(const std::string& str) { int dots = 0; @@ -216,7 +205,6 @@ bool Utility::isipv4(const std::string& str) return true; } - bool Utility::isipv6(const std::string& str) { size_t qc = 0; @@ -256,7 +244,6 @@ bool Utility::isipv6(const std::string& str) return true; } - bool Utility::u2ip(const std::string& str, ipaddr_t& l) { struct sockaddr_in sa; @@ -265,7 +252,6 @@ bool Utility::u2ip(const std::string& str, ipaddr_t& l) return r; } - #ifdef ENABLE_IPV6 #ifdef IPPROTO_IPV6 bool Utility::u2ip(const std::string& str, struct in6_addr& l) @@ -278,7 +264,6 @@ bool Utility::u2ip(const std::string& str, struct in6_addr& l) #endif #endif - void Utility::l2ip(const ipaddr_t ip, std::string& str) { struct sockaddr_in sa; @@ -288,7 +273,6 @@ void Utility::l2ip(const ipaddr_t ip, std::string& str) Utility::reverse( (struct sockaddr *)&sa, sizeof(sa), str, NI_NUMERICHOST); } - void Utility::l2ip(const in_addr& ip, std::string& str) { struct sockaddr_in sa; @@ -298,7 +282,6 @@ void Utility::l2ip(const in_addr& ip, std::string& str) Utility::reverse( (struct sockaddr *)&sa, sizeof(sa), str, NI_NUMERICHOST); } - #ifdef ENABLE_IPV6 #ifdef IPPROTO_IPV6 void Utility::l2ip(const struct in6_addr& ip, std::string& str,bool mixed) @@ -347,7 +330,6 @@ void Utility::l2ip(const struct in6_addr& ip, std::string& str,bool mixed) str = slask; } - int Utility::in6_addr_compare(in6_addr a,in6_addr b) { for (size_t i = 0; i < 16; i++) @@ -362,7 +344,6 @@ int Utility::in6_addr_compare(in6_addr a,in6_addr b) #endif #endif - void Utility::ResolveLocal() { char h[256]; @@ -391,7 +372,6 @@ void Utility::ResolveLocal() m_local_resolved = true; } - const std::string& Utility::GetLocalHostname() { if (!m_local_resolved) @@ -401,7 +381,6 @@ const std::string& Utility::GetLocalHostname() return m_host; } - ipaddr_t Utility::GetLocalIP() { if (!m_local_resolved) @@ -411,7 +390,6 @@ ipaddr_t Utility::GetLocalIP() return m_ip; } - const std::string& Utility::GetLocalAddress() { if (!m_local_resolved) @@ -421,7 +399,6 @@ const std::string& Utility::GetLocalAddress() return m_addr; } - #ifdef ENABLE_IPV6 #ifdef IPPROTO_IPV6 const struct in6_addr& Utility::GetLocalIP6() @@ -433,7 +410,6 @@ const struct in6_addr& Utility::GetLocalIP6() return m_local_ip6; } - const std::string& Utility::GetLocalAddress6() { if (!m_local_resolved) @@ -445,7 +421,6 @@ const std::string& Utility::GetLocalAddress6() #endif #endif - void Utility::SetEnv(const std::string& var,const std::string& value) { #if (defined(SOLARIS8) || defined(SOLARIS)) @@ -469,7 +444,6 @@ void Utility::SetEnv(const std::string& var,const std::string& value) #endif } - std::string Utility::Sa2String(struct sockaddr *sa) { #ifdef ENABLE_IPV6 @@ -495,7 +469,6 @@ std::string Utility::Sa2String(struct sockaddr *sa) return ""; } - void Utility::GetTime(struct timeval *p) { #ifdef _WIN32 @@ -511,7 +484,6 @@ void Utility::GetTime(struct timeval *p) #endif } - std::auto_ptr<SocketAddress> Utility::CreateAddress(struct sockaddr *sa,socklen_t sa_len) { switch (sa -> sa_family) @@ -538,7 +510,6 @@ std::auto_ptr<SocketAddress> Utility::CreateAddress(struct sockaddr *sa,socklen_ return std::auto_ptr<SocketAddress>(NULL); } - bool Utility::u2ip(const std::string& host, struct sockaddr_in& sa, int ai_flags) { memset(&sa, 0, sizeof(sa)); @@ -631,7 +602,6 @@ bool Utility::u2ip(const std::string& host, struct sockaddr_in& sa, int ai_flags #endif // NO_GETADDRINFO } - #ifdef ENABLE_IPV6 #ifdef IPPROTO_IPV6 bool Utility::u2ip(const std::string& host, struct sockaddr_in6& sa, int ai_flags) @@ -747,14 +717,12 @@ bool Utility::u2ip(const std::string& host, struct sockaddr_in6& sa, int ai_flag #endif // IPPROTO_IPV6 #endif // ENABLE_IPV6 - bool Utility::reverse(struct sockaddr *sa, socklen_t sa_len, std::string& hostname, int flags) { std::string service; return Utility::reverse(sa, sa_len, hostname, service, flags); } - bool Utility::reverse(struct sockaddr *sa, socklen_t sa_len, std::string& hostname, std::string& service, int flags) { hostname = ""; @@ -870,7 +838,6 @@ bool Utility::reverse(struct sockaddr *sa, socklen_t sa_len, std::string& hostna #endif // NO_GETADDRINFO } - bool Utility::u2service(const std::string& name, int& service, int ai_flags) { #ifdef NO_GETADDRINFO @@ -903,7 +870,6 @@ bool Utility::u2service(const std::string& name, int& service, int ai_flags) #endif // NO_GETADDRINFO } - unsigned long Utility::ThreadID() { #ifdef _WIN32 @@ -913,7 +879,6 @@ unsigned long Utility::ThreadID() #endif } - std::string Utility::ToLower(const std::string& str) { std::string r; @@ -927,7 +892,6 @@ std::string Utility::ToLower(const std::string& str) return r; } - std::string Utility::ToUpper(const std::string& str) { std::string r; @@ -941,7 +905,6 @@ std::string Utility::ToUpper(const std::string& str) return r; } - std::string Utility::ToString(double d) { char tmp[100]; @@ -949,14 +912,12 @@ std::string Utility::ToString(double d) return tmp; } - unsigned long Utility::Rnd() { static Utility::Rng generator( (unsigned long)time(NULL) ); return generator.Get(); } - Utility::Rng::Rng(unsigned long seed) : m_value( 0 ) { m_tmp[0]= seed & 0xffffffffUL; @@ -966,7 +927,6 @@ Utility::Rng::Rng(unsigned long seed) : m_value( 0 ) } } - unsigned long Utility::Rng::Get() { unsigned long val = m_tmp[m_value]; diff --git a/dep/src/sockets/socket_include.cpp b/dep/src/sockets/socket_include.cpp index 133ff745d91..290602c1b52 100644 --- a/dep/src/sockets/socket_include.cpp +++ b/dep/src/sockets/socket_include.cpp @@ -87,5 +87,3 @@ static char tmp[100]; } - - diff --git a/dep/src/zlib/deflate.c b/dep/src/zlib/deflate.c index 29ce1f64a57..2ed78a7d2a1 100644 --- a/dep/src/zlib/deflate.c +++ b/dep/src/zlib/deflate.c @@ -169,7 +169,6 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */ */ #define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask) - /* =========================================================================== * Insert string str in the dictionary and set match_head to the previous head * of the hash chain (the most recent string with same hash key). Return @@ -902,7 +901,6 @@ int ZEXPORT deflateCopy (dest, source) deflate_state *ss; ushf *overlay; - if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) { return Z_STREAM_ERROR; } @@ -1402,7 +1400,7 @@ local block_state deflate_stored(s, flush) } /* Copy as much as possible from input to output: */ - for (;;) { + for (; ; ) { /* Fill the window as much as possible: */ if (s->lookahead <= 1) { @@ -1452,7 +1450,7 @@ local block_state deflate_fast(s, flush) IPos hash_head = NIL; /* head of the hash chain */ int bflush; /* set if current block must be flushed */ - for (;;) { + for (; ; ) { /* Make sure that we always have enough lookahead, except * at the end of the input file. We need MAX_MATCH bytes * for the next match, plus MIN_MATCH bytes to insert the @@ -1559,7 +1557,7 @@ local block_state deflate_slow(s, flush) int bflush; /* set if current block must be flushed */ /* Process the input block. */ - for (;;) { + for (; ; ) { /* Make sure that we always have enough lookahead, except * at the end of the input file. We need MAX_MATCH bytes * for the next match, plus MIN_MATCH bytes to insert the @@ -1690,7 +1688,7 @@ local block_state deflate_rle(s, flush) uInt prev; /* byte at distance one to match */ Bytef *scan; /* scan for end of run */ - for (;;) { + for (; ; ) { /* Make sure that we always have enough lookahead, except * at the end of the input file. We need MAX_MATCH bytes * for the longest encodable run. diff --git a/dep/src/zlib/deflate.h b/dep/src/zlib/deflate.h index d56e97db4cb..ad1f46a8dae 100644 --- a/dep/src/zlib/deflate.h +++ b/dep/src/zlib/deflate.h @@ -57,7 +57,6 @@ #define FINISH_STATE 666 /* Stream status */ - /* Data structure describing a single value and its code string. */ typedef struct ct_data_s { union { @@ -267,7 +266,6 @@ typedef struct internal_state { */ #define put_byte(s, c) {s->pending_buf[s->pending++] = (c);} - #define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1) /* Minimum amount of lookahead, except at the end of the input file. * See deflate.c for comments about the MIN_MATCH+1. diff --git a/dep/src/zlib/example.c b/dep/src/zlib/example.c index 6c8a0ee7633..73799eac8cc 100644 --- a/dep/src/zlib/example.c +++ b/dep/src/zlib/example.c @@ -190,7 +190,7 @@ void test_deflate(compr, comprLen) CHECK_ERR(err, "deflate"); } /* Finish the stream, still forcing small buffers: */ - for (;;) { + for (; ; ) { c_stream.avail_out = 1; err = deflate(&c_stream, Z_FINISH); if (err == Z_STREAM_END) break; @@ -319,7 +319,7 @@ void test_large_inflate(compr, comprLen, uncompr, uncomprLen) err = inflateInit(&d_stream); CHECK_ERR(err, "inflateInit"); - for (;;) { + for (; ; ) { d_stream.next_out = uncompr; /* discard the output */ d_stream.avail_out = (uInt)uncomprLen; err = inflate(&d_stream, Z_NO_FLUSH); @@ -482,7 +482,7 @@ void test_dict_inflate(compr, comprLen, uncompr, uncomprLen) d_stream.next_out = uncompr; d_stream.avail_out = (uInt)uncomprLen; - for (;;) { + for (; ; ) { err = inflate(&d_stream, Z_NO_FLUSH); if (err == Z_STREAM_END) break; if (err == Z_NEED_DICT) { diff --git a/dep/src/zlib/gzio.c b/dep/src/zlib/gzio.c index 7e90f4928fc..64dcae88107 100644 --- a/dep/src/zlib/gzio.c +++ b/dep/src/zlib/gzio.c @@ -72,7 +72,6 @@ typedef struct gz_stream { int last; /* true if push-back is last character */ } gz_stream; - local gzFile gz_open OF((const char *path, const char *mode, int fd)); local int do_flush OF((gzFile file, int flush)); local int get_byte OF((gz_stream *s)); @@ -495,7 +494,6 @@ int ZEXPORT gzread (file, buf, len) return (int)(len - s->stream.avail_out); } - /* =========================================================================== Reads one byte from the compressed file. gzgetc returns this byte or -1 in case of end of file or error. @@ -508,7 +506,6 @@ int ZEXPORT gzgetc(file) return gzread(file, &c, 1) == 1 ? c : -1; } - /* =========================================================================== Push one byte back onto the stream. */ @@ -527,7 +524,6 @@ int ZEXPORT gzungetc(c, file) return c; } - /* =========================================================================== Reads bytes from the compressed file until len-1 characters are read, or a newline character is read and transferred to buf, or an @@ -550,7 +546,6 @@ char * ZEXPORT gzgets(file, buf, len) return b == buf && len > 0 ? Z_NULL : b; } - #ifndef NO_GZCOMPRESS /* =========================================================================== Writes the given number of uncompressed bytes into the compressed file. @@ -591,7 +586,6 @@ int ZEXPORT gzwrite (file, buf, len) return (int)(len - s->stream.avail_in); } - /* =========================================================================== Converts, formats, and writes the args to the compressed file under control of the format string, as in fprintf. gzprintf returns the number of @@ -684,7 +678,6 @@ int ZEXPORT gzputc(file, c) return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1; } - /* =========================================================================== Writes the given null-terminated string to the compressed file, excluding the terminating null character. @@ -697,7 +690,6 @@ int ZEXPORT gzputs(file, s) return gzwrite(file, (char*)s, (unsigned)strlen(s)); } - /* =========================================================================== Flushes all pending output into the compressed file. The parameter flush is as in the deflate() function. @@ -714,7 +706,7 @@ local int do_flush (file, flush) s->stream.avail_in = 0; /* should be zero already anyway */ - for (;;) { + for (; ; ) { len = Z_BUFSIZE - s->stream.avail_out; if (len != 0) { diff --git a/dep/src/zlib/infback.c b/dep/src/zlib/infback.c index 455dbc9ee84..781be49c171 100644 --- a/dep/src/zlib/infback.c +++ b/dep/src/zlib/infback.c @@ -278,7 +278,7 @@ void FAR *out_desc; left = state->wsize; /* Inflate until end of block marked as last */ - for (;;) + for (; ; ) switch (state->mode) { case TYPE: /* determine and dispatch block type */ @@ -388,7 +388,7 @@ void FAR *out_desc; /* get length and distance code code lengths */ state->have = 0; while (state->have < state->nlen + state->ndist) { - for (;;) { + for (; ; ) { this = state->lencode[BITS(state->lenbits)]; if ((unsigned)(this.bits) <= bits) break; PULLBYTE(); @@ -473,14 +473,14 @@ void FAR *out_desc; } /* get a literal, length, or end-of-block code */ - for (;;) { + for (; ; ) { this = state->lencode[BITS(state->lenbits)]; if ((unsigned)(this.bits) <= bits) break; PULLBYTE(); } if (this.op && (this.op & 0xf0) == 0) { last = this; - for (;;) { + for (; ; ) { this = state->lencode[last.val + (BITS(last.bits + last.op) >> last.bits)]; if ((unsigned)(last.bits + this.bits) <= bits) break; @@ -527,14 +527,14 @@ void FAR *out_desc; Tracevv((stderr, "inflate: length %u\n", state->length)); /* get distance code */ - for (;;) { + for (; ; ) { this = state->distcode[BITS(state->distbits)]; if ((unsigned)(this.bits) <= bits) break; PULLBYTE(); } if ((this.op & 0xf0) == 0) { last = this; - for (;;) { + for (; ; ) { this = state->distcode[last.val + (BITS(last.bits + last.op) >> last.bits)]; if ((unsigned)(last.bits + this.bits) <= bits) break; diff --git a/dep/src/zlib/inflate.c b/dep/src/zlib/inflate.c index 792fdee8e9c..6b7a57e747c 100644 --- a/dep/src/zlib/inflate.c +++ b/dep/src/zlib/inflate.c @@ -62,7 +62,7 @@ * 1.2.beta6 4 Jan 2003 * - Added comments in inffast.c on effectiveness of POSTINC * - Typecasting all around to reduce compiler warnings - * - Changed loops from while (1) or do {} while (1) to for (;;), again to + * - Changed loops from while (1) or do {} while (1) to for (; ; ), again to * make compilers happy * - Changed type of window in inflateBackInit() to unsigned char * * @@ -284,7 +284,7 @@ void makefixed() size = 1U << 9; printf(" static const code lenfix[%u] = {", size); low = 0; - for (;;) { + for (; ; ) { if ((low % 7) == 0) printf("\n "); printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits, state.lencode[low].val); @@ -295,7 +295,7 @@ void makefixed() size = 1U << 5; printf("\n static const code distfix[%u] = {", size); low = 0; - for (;;) { + for (; ; ) { if ((low % 6) == 0) printf("\n "); printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits, state.distcode[low].val); @@ -474,7 +474,7 @@ unsigned out; much output data as possible before returning. The state machine is structured roughly as follows: - for (;;) switch (state) { + for (; ; ) switch (state) { ... case STATEn: if (not enough input data or output space to make progress) @@ -584,7 +584,7 @@ int flush; in = have; out = left; ret = Z_OK; - for (;;) + for (; ; ) switch (state->mode) { case HEAD: if (state->wrap == 0) { @@ -875,7 +875,7 @@ int flush; state->mode = CODELENS; case CODELENS: while (state->have < state->nlen + state->ndist) { - for (;;) { + for (; ; ) { this = state->lencode[BITS(state->lenbits)]; if ((unsigned)(this.bits) <= bits) break; PULLBYTE(); @@ -954,14 +954,14 @@ int flush; LOAD(); break; } - for (;;) { + for (; ; ) { this = state->lencode[BITS(state->lenbits)]; if ((unsigned)(this.bits) <= bits) break; PULLBYTE(); } if (this.op && (this.op & 0xf0) == 0) { last = this; - for (;;) { + for (; ; ) { this = state->lencode[last.val + (BITS(last.bits + last.op) >> last.bits)]; if ((unsigned)(last.bits + this.bits) <= bits) break; @@ -999,14 +999,14 @@ int flush; Tracevv((stderr, "inflate: length %u\n", state->length)); state->mode = DIST; case DIST: - for (;;) { + for (; ; ) { this = state->distcode[BITS(state->distbits)]; if ((unsigned)(this.bits) <= bits) break; PULLBYTE(); } if ((this.op & 0xf0) == 0) { last = this; - for (;;) { + for (; ; ) { this = state->distcode[last.val + (BITS(last.bits + last.op) >> last.bits)]; if ((unsigned)(last.bits + this.bits) <= bits) break; diff --git a/dep/src/zlib/inftrees.c b/dep/src/zlib/inftrees.c index 8a9c13ff03d..3a3fabc4bea 100644 --- a/dep/src/zlib/inftrees.c +++ b/dep/src/zlib/inftrees.c @@ -213,7 +213,7 @@ unsigned short FAR *work; return 1; /* process all codes and make table entries */ - for (;;) { + for (; ; ) { /* create table entry */ this.bits = (unsigned char)(len - drop); if ((int)(work[sym]) < end) { diff --git a/dep/src/zlib/trees.c b/dep/src/zlib/trees.c index 395e4e16814..bf8720a8b32 100644 --- a/dep/src/zlib/trees.c +++ b/dep/src/zlib/trees.c @@ -229,7 +229,6 @@ local void send_bits(s, value, length) } #endif /* DEBUG */ - /* the arguments must not have side effects */ /* =========================================================================== @@ -281,7 +280,7 @@ local void tr_static_init() } Assert (dist == 256, "tr_static_init: dist != 256"); dist >>= 7; /* from now on, all distances are divided by 128 */ - for ( ; code < D_CODES; code++) { + for (; code < D_CODES; code++) { base_dist[code] = dist << 7; for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) { _dist_code[256 + dist++] = (uch)code; @@ -414,8 +413,8 @@ local void init_block(s) int n; /* iterates over tree elements */ /* Initialize the trees. */ - for (n = 0; n < L_CODES; n++) s->dyn_ltree[n].Freq = 0; - for (n = 0; n < D_CODES; n++) s->dyn_dtree[n].Freq = 0; + for (n = 0; n < L_CODES; n++) s->dyn_ltree[n].Freq = 0; + for (n = 0; n < D_CODES; n++) s->dyn_dtree[n].Freq = 0; for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0; s->dyn_ltree[END_BLOCK].Freq = 1; @@ -426,7 +425,6 @@ local void init_block(s) #define SMALLEST 1 /* Index within the heap array of least frequent node in the Huffman tree */ - /* =========================================================================== * Remove the smallest element from the heap and recreate the heap with * one less element. Updates heap and heap_len. @@ -597,7 +595,7 @@ local void gen_codes (tree, max_code, bl_count) "inconsistent bit counts"); Tracev((stderr,"\ngen_codes: max_code %d ", max_code)); - for (n = 0; n <= max_code; n++) { + for (n = 0; n <= max_code; n++) { int len = tree[n].Len; if (len == 0) continue; /* Now reverse the bits */ diff --git a/dep/src/zlib/zlib.h b/dep/src/zlib/zlib.h index 2ad74617098..3898076f565 100644 --- a/dep/src/zlib/zlib.h +++ b/dep/src/zlib/zlib.h @@ -22,7 +22,6 @@ Jean-loup Gailly Mark Adler jloup@gzip.org madler@alumni.caltech.edu - The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). @@ -238,7 +237,6 @@ ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); perform any compression: this will be done by deflate(). */ - ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); /* deflate compresses as much data as possible, and stops when the input @@ -324,7 +322,6 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); space to continue compressing. */ - ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); /* All dynamically allocated data structures for this stream are freed. @@ -338,7 +335,6 @@ ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); deallocated). */ - /* ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); @@ -359,7 +355,6 @@ ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); avail_in may be modified, but next_out and avail_out are unchanged.) */ - ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); /* inflate decompresses as much data as possible, and stops when the input @@ -458,7 +453,6 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); of the data is desired. */ - ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); /* All dynamically allocated data structures for this stream are freed. @@ -995,7 +989,6 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); 27-31: 0 (reserved) */ - /* utility functions */ /* @@ -1062,7 +1055,6 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete. */ - typedef voidp gzFile; ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); @@ -1308,7 +1300,6 @@ ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2)); len2. */ - /* various hacks, don't look :) */ /* deflateInit and inflateInit are macros to allow checking the zlib version @@ -1341,7 +1332,6 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, inflateBackInit_((strm), (windowBits), (window), \ ZLIB_VERSION, sizeof(z_stream)) - #if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) struct internal_state {int dummy;}; /* hack for buggy compilers */ #endif diff --git a/dep/src/zlib/zutil.c b/dep/src/zlib/zutil.c index d55f5948a37..9116a331be4 100644 --- a/dep/src/zlib/zutil.c +++ b/dep/src/zlib/zutil.c @@ -23,7 +23,6 @@ const char * const z_errmsg[10] = { "incompatible version",/* Z_VERSION_ERROR (-6) */ ""}; - const char * ZEXPORT zlibVersion() { return ZLIB_VERSION; @@ -181,7 +180,6 @@ void zmemzero(dest, len) } #endif - #ifdef SYS16BIT #ifdef __TURBOC__ @@ -261,7 +259,6 @@ void zcfree (voidpf opaque, voidpf ptr) #endif /* __TURBOC__ */ - #ifdef M_I86 /* Microsoft C in 16-bit mode */ @@ -288,7 +285,6 @@ void zcfree (voidpf opaque, voidpf ptr) #endif /* SYS16BIT */ - #ifndef MY_ZCALLOC /* Any system without a special alloc function */ #ifndef STDC diff --git a/dep/src/zlib/zutil.h b/dep/src/zlib/zutil.h index b8a722d904d..7f40ca4d975 100644 --- a/dep/src/zlib/zutil.h +++ b/dep/src/zlib/zutil.h @@ -257,7 +257,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # define Tracecv(c,x) #endif - voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size)); void zcfree OF((voidpf opaque, voidpf ptr)); |