diff options
292 files changed, 1483 insertions, 2477 deletions
diff --git a/.clang-format b/.clang-format new file mode 100644 index 00000000000..76061fee905 --- /dev/null +++ b/.clang-format @@ -0,0 +1,49 @@ +--- +# This configuration requires clang-format version v12.0 or newer. +BasedOnStyle: Mozilla +# +AlignConsecutiveDeclarations: None +AlignEscapedNewlines: Left +AlignOperands: false +AllowAllParametersOfDeclarationOnNextLine: false +AllowShortBlocksOnASingleLine: true +AllowShortFunctionsOnASingleLine: InlineOnly +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +# AlwaysBreakAfterDefinitionReturnType: TopLevel +# AlwaysBreakAfterReturnType: TopLevelDefinitions +BinPackArguments: false +BinPackParameters: false +# parameters will either all be on the same line or will have one line each. +BreakBeforeBraces: Custom +BraceWrapping: + AfterCaseLabel: true + AfterClass: true + AfterControlStatement: Always + AfterEnum: true + AfterFunction: true + AfterNamespace: true + AfterObjCDeclaration: true + AfterStruct: true + AfterUnion: true + AfterExternBlock: true + BeforeCatch: true + BeforeElse: true + BeforeLambdaBody: false + BeforeWhile: true + IndentBraces: false + SplitEmptyFunction: false + SplitEmptyRecord: true + SplitEmptyNamespace: true +# based on BreakBeforeBraces: GNU +ColumnLimit: 123 # MAYBE up to 160 +# +# XXX v13.0 only IndentAccessModifiers: true +# +IndentPPDirectives: AfterHash +SortUsingDeclarations: false +SpaceAfterTemplateKeyword: true +SpaceAfterLogicalNot: false +SpaceBeforeParens: Always +SpaceInEmptyBlock: false +... diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 76e4bd1f572..68febf80098 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -20,7 +20,7 @@ jobs: CXX: g++-4.8 PackageDeps: g++-4.8 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU - os: ubuntu-16.04 + os: ubuntu-18.04 - CC: gcc-6 CXX: g++-6 PackageDeps: g++-6 diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html index 771e9a73c7d..277d398efe7 100644 --- a/ACE/ACE-INSTALL.html +++ b/ACE/ACE-INSTALL.html @@ -252,7 +252,7 @@ supported by the DOC group, Riverace, OCI or Remedy IT. </p><p> </p><p></p><hr><p> </p><h2><a name="installpre">Installation prerequisites</a></h2> -<p> ACE (as well as TAO and CIAO) use <A +<p> ACE (as well as TAO) use <A HREF="http://htmlpreview.github.io/?https://github.com/DOCGroup/MPC/blob/master/docs/html/MakeProjectCreator.html">MPC</A> (MakeProjectCreator) to generate files used by all supported build tools (such as GNUmakefiles for UNIX based platforms, sln and vcproj @@ -3090,8 +3090,8 @@ show_uninit Lists all uninitialized in object files built for If users are building from our <a href="https://github.com/DOCGroup/ACE_TAO">Git repository</a> the GNUmakefiles, and project files for building on various platforms will not be available. Git users are expected to <a href="#generate_using_mpc">generate them</a> -using <a href="https://raw.githubusercontent.com/DOCGroup/MPC/master/docs/README">MPC</a> before building ACE, TAO or -CIAO. We point out some suggestions below to get bootstrapped +using <a href="https://raw.githubusercontent.com/DOCGroup/MPC/master/docs/README">MPC</a> before building ACE or TAO. +We point out some suggestions below to get bootstrapped quickly. <ul> diff --git a/ACE/ACEXML/common/ZipCharStream.cpp b/ACE/ACEXML/common/ZipCharStream.cpp index 968ce4150bd..c4399ae72d2 100644 --- a/ACE/ACEXML/common/ZipCharStream.cpp +++ b/ACE/ACEXML/common/ZipCharStream.cpp @@ -248,9 +248,4 @@ ACEXML_ZipCharStream::peek_i (void) } #endif /* ACE_USES_WCHAR */ -#else -#if defined (__HP_aCC) -static int shut_up_aCC = 0; -#endif /* __HP_aCC */ - #endif /* USE_ZZIP */ @@ -1,6 +1,9 @@ USER VISIBLE CHANGES BETWEEN ACE-7.0.2 and ACE-7.0.3 ==================================================== +. The macro ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS has been renamed + to ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS, update your code accordingly + USER VISIBLE CHANGES BETWEEN ACE-7.0.1 and ACE-7.0.2 ==================================================== diff --git a/ACE/ace/Auto_Ptr.h b/ACE/ace/Auto_Ptr.h index 21365a540d8..9c10c1fde61 100644 --- a/ACE/ace/Auto_Ptr.h +++ b/ACE/ace/Auto_Ptr.h @@ -68,15 +68,10 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -#if !defined (ACE_LACKS_AUTO_PTR) && \ - defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \ - (ACE_HAS_STANDARD_CPP_LIBRARY != 0) +#if !defined (ACE_LACKS_AUTO_PTR) #include <memory> -#if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \ - (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0) using std::auto_ptr; -#endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ -#else /* ACE_HAS_STANDARD_CPP_LIBRARY */ +#else /* !ACE_LACKS_AUTO_PTR */ /** * @class auto_ptr @@ -95,7 +90,7 @@ public: X *operator-> () const; }; -#endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ +#endif /* !ACE_LACKS_AUTO_PTR */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -184,17 +179,7 @@ inline void ACE_auto_ptr_reset (AUTO_PTR_TYPE & ap, PTR_TYPE * p) { -#if defined (ACE_AUTO_PTR_LACKS_RESET) - // Allow compiler to adjust pointer to potential base class pointer - // of element type found in auto_ptr. - typename AUTO_PTR_TYPE::element_type * const tp = p; - if (tp != ap.get ()) - { - ap = AUTO_PTR_TYPE (tp); - } -#else ap.reset (p); -#endif /* ACE_AUTO_PTR_LACKS_RESET */ } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Auto_Ptr.inl b/ACE/ace/Auto_Ptr.inl index 06b035f7f98..e349e3202f7 100644 --- a/ACE/ace/Auto_Ptr.inl +++ b/ACE/ace/Auto_Ptr.inl @@ -80,18 +80,14 @@ ACE_Auto_Basic_Ptr<X>::operator *() const return *this->get (); } -#if defined (ACE_LACKS_AUTO_PTR) || \ - !defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \ - (ACE_HAS_STANDARD_CPP_LIBRARY == 0) - +#if defined (ACE_LACKS_AUTO_PTR) template<class X> ACE_INLINE X * auto_ptr<X>::operator-> () const { ACE_TRACE ("auto_ptr<X>::operator->"); return this->get (); } - -#endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ +#endif /* ACE_LACKS_AUTO_PTR */ template<class X> ACE_INLINE X * ACE_Auto_Ptr<X>::operator-> () const diff --git a/ACE/ace/Base_Thread_Adapter.cpp b/ACE/ace/Base_Thread_Adapter.cpp index b3a1f7bcd76..78731564b29 100644 --- a/ACE/ace/Base_Thread_Adapter.cpp +++ b/ACE/ace/Base_Thread_Adapter.cpp @@ -23,10 +23,10 @@ ACE_Base_Thread_Adapter::ACE_Base_Thread_Adapter ( void *arg, ACE_THR_C_FUNC entry_point, ACE_OS_Thread_Descriptor *td -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) , ACE_SEH_EXCEPT_HANDLER selector , ACE_SEH_EXCEPT_HANDLER handler -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ , long cancel_flags ) : user_func_ (user_func) @@ -41,10 +41,10 @@ ACE_Base_Thread_Adapter::ACE_Base_Thread_Adapter ( if (ACE_Base_Thread_Adapter::init_log_msg_hook_ != 0) (*ACE_Base_Thread_Adapter::init_log_msg_hook_) ( this->log_msg_attributes_ -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +# if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) , selector , handler -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +# endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ ); #ifdef ACE_USES_GPROF getitimer (ITIMER_PROF, &itimer_); diff --git a/ACE/ace/Base_Thread_Adapter.h b/ACE/ace/Base_Thread_Adapter.h index 5680ec8d86c..9f4056afb30 100644 --- a/ACE/ace/Base_Thread_Adapter.h +++ b/ACE/ace/Base_Thread_Adapter.h @@ -117,10 +117,10 @@ protected: void *arg, ACE_THR_C_FUNC entry_point = (ACE_THR_C_FUNC) ACE_THREAD_ADAPTER_NAME, ACE_OS_Thread_Descriptor *td = 0 -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +# if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) , ACE_SEH_EXCEPT_HANDLER selector = 0 , ACE_SEH_EXCEPT_HANDLER handler = 0 -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +# endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ , long cancel_flags = 0 ); /// Inherit the logging features if the parent thread has an diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp index f669788370f..1691daec283 100644 --- a/ACE/ace/CDR_Stream.cpp +++ b/ACE/ace/CDR_Stream.cpp @@ -1624,7 +1624,7 @@ ACE_InputCDR::read_wstring (ACE_CDR::WChar*& x) false); #endif /* ACE_HAS_ALLOC_HOOKS */ - ACE_auto_ptr_reset (safe_data, x); + safe_data.reset (x); if (this->read_wchar_array (x, len)) { @@ -1651,7 +1651,7 @@ ACE_InputCDR::read_wstring (ACE_CDR::WChar*& x) false); #endif /* ACE_HAS_ALLOC_HOOKS */ - ACE_auto_ptr_reset (safe_data, x); + safe_data.reset (x); if (this->read_wchar_array (x, len)) { diff --git a/ACE/ace/DLL_Manager.cpp b/ACE/ace/DLL_Manager.cpp index d3cbb6e7321..7eddc0484fe 100644 --- a/ACE/ace/DLL_Manager.cpp +++ b/ACE/ace/DLL_Manager.cpp @@ -307,11 +307,11 @@ ACE_DLL_Handle::symbol (const ACE_TCHAR *sym_name, bool ignore_errors, ACE_TStri auto_name.get (), error.c_str ())); - return 0; + return nullptr; } return sym; } - return 0; + return nullptr; } ACE_SHLIB_HANDLE diff --git a/ACE/ace/ETCL/ETCL_Constraint.h b/ACE/ace/ETCL/ETCL_Constraint.h index 96dc8e1909b..ec2e367c702 100644 --- a/ACE/ace/ETCL/ETCL_Constraint.h +++ b/ACE/ace/ETCL/ETCL_Constraint.h @@ -162,7 +162,7 @@ public: const char *value () const; // = The Constraint methods. - int accept (ETCL_Constraint_Visitor *visitor); + int accept (ETCL_Constraint_Visitor *visitor) override; private: /// The value @@ -183,7 +183,7 @@ public: ETCL_Literal_Constraint *integer () const; ETCL_Literal_Constraint *string () const; - virtual int accept (ETCL_Constraint_Visitor *visitor); + int accept (ETCL_Constraint_Visitor *visitor) override; private: int sign_; @@ -201,7 +201,7 @@ public: ETCL_Union_Value *union_value () const; ETCL_Constraint *component () const; - virtual int accept (ETCL_Constraint_Visitor *visitor); + int accept (ETCL_Constraint_Visitor *visitor) override; private: ETCL_Union_Value *union_value_; @@ -218,7 +218,7 @@ public: ETCL_Literal_Constraint *integer () const; ETCL_Constraint *component () const; - virtual int accept (ETCL_Constraint_Visitor *visitor); + int accept (ETCL_Constraint_Visitor *visitor) override; private: ETCL_Literal_Constraint *integer_; @@ -235,7 +235,7 @@ public: ETCL_Identifier *identifier () const; ETCL_Constraint *component () const; - virtual int accept (ETCL_Constraint_Visitor *visitor); + int accept (ETCL_Constraint_Visitor *visitor) override; private: ETCL_Identifier *identifier_; @@ -252,7 +252,7 @@ public: ETCL_Literal_Constraint *integer () const; ETCL_Constraint *component () const; - virtual int accept (ETCL_Constraint_Visitor *visitor); + int accept (ETCL_Constraint_Visitor *visitor) override; private: ETCL_Literal_Constraint *integer_; @@ -268,7 +268,7 @@ public: int type () const; - virtual int accept (ETCL_Constraint_Visitor *visitor); + int accept (ETCL_Constraint_Visitor *visitor) override; private: int type_ {}; @@ -284,7 +284,7 @@ public: ETCL_Identifier *identifier () const; ETCL_Constraint *component () const; - virtual int accept (ETCL_Constraint_Visitor *visitor); + int accept (ETCL_Constraint_Visitor *visitor) override; private: ETCL_Identifier *identifier_; @@ -299,7 +299,7 @@ public: ETCL_Constraint *component () const; - virtual int accept (ETCL_Constraint_Visitor *visitor); + int accept (ETCL_Constraint_Visitor *visitor) override; private: ETCL_Constraint *component_; @@ -313,7 +313,7 @@ public: ETCL_Constraint *component () const; - virtual int accept (ETCL_Constraint_Visitor *visitor); + int accept (ETCL_Constraint_Visitor *visitor) override; private: ETCL_Constraint *component_; @@ -327,7 +327,7 @@ public: ETCL_Constraint *component () const; - virtual int accept (ETCL_Constraint_Visitor *visitor); + int accept (ETCL_Constraint_Visitor *visitor) override; private: ETCL_Constraint *component_; @@ -341,7 +341,7 @@ public: ETCL_Constraint *component () const; - virtual int accept (ETCL_Constraint_Visitor *visitor); + int accept (ETCL_Constraint_Visitor *visitor) override; private: ETCL_Constraint *component_; @@ -357,7 +357,7 @@ public: int type () const; ETCL_Constraint *subexpr () const; - int accept (ETCL_Constraint_Visitor *visitor); + int accept (ETCL_Constraint_Visitor *visitor) override; private: int type_; @@ -376,7 +376,7 @@ public: ETCL_Constraint *rhs () const; ETCL_Constraint *lhs () const; - int accept (ETCL_Constraint_Visitor *visitor); + int accept (ETCL_Constraint_Visitor *visitor) override; private: int type_; @@ -395,7 +395,7 @@ public: int type () const; ETCL_Constraint *subexpr () const; - virtual int accept (ETCL_Constraint_Visitor *visitor); + int accept (ETCL_Constraint_Visitor *visitor) override; private: int type_ {}; diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index 1897a01f673..e8e64b20a6c 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -806,24 +806,20 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC // This is being placed here temporarily to help stabilize the builds, but will // be moved out along with the above macros as part of the subsetting. dhinton #if !defined (ACE_LACKS_NEW_H) -# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -# include /**/ <new> -# else -# include /**/ <new.h> -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ +# include /**/ <new> #endif /* ! ACE_LACKS_NEW_H */ # define ACE_NOOP(x) -#if defined (ACE_WIN32) && defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) # define ACE_SEH_TRY __try # define ACE_SEH_EXCEPT(X) __except(X) # define ACE_SEH_FINALLY __finally -#else /* !ACE_WIN32 */ +#else /* !ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ # define ACE_SEH_TRY if (1) # define ACE_SEH_EXCEPT(X) while (0) # define ACE_SEH_FINALLY if (1) -#endif /* ACE_WIN32 */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ // Handle ACE_Message_Queue. # define ACE_SYNCH_DECL typename _ACE_SYNCH diff --git a/ACE/ace/IOStream.h b/ACE/ace/IOStream.h index 8802c862a5f..51f94101ae0 100644 --- a/ACE/ace/IOStream.h +++ b/ACE/ace/IOStream.h @@ -28,32 +28,17 @@ // or, if it does, the platform is explicitly set to use old iostreams // by its config.h file. // This restriction is recorded in Bugzilla entry 857. -#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY == 1) -# if !defined (ACE_USES_OLD_IOSTREAMS) && !defined (ACE_LACKS_ACE_IOSTREAM) -# define ACE_LACKS_ACE_IOSTREAM -# endif /* !ACE_USES_OLD_IOSTREAMS && !ACE_LACKS_ACE_IOSTREAM */ -#endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ +#if !defined (ACE_USES_OLD_IOSTREAMS) && !defined (ACE_LACKS_ACE_IOSTREAM) +# define ACE_LACKS_ACE_IOSTREAM +#endif /* !ACE_USES_OLD_IOSTREAMS && !ACE_LACKS_ACE_IOSTREAM */ #if !defined (ACE_LACKS_ACE_IOSTREAM) -# if defined (ACE_HAS_STRING_CLASS) -# if defined (ACE_WIN32) && defined (_MSC_VER) -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -typedef CString ACE_IOStream_String; -ACE_END_VERSIONED_NAMESPACE_DECL -# else -# include /**/ <string> +# include /**/ <string> -# if defined(ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef std::string ACE_IOStream_String; ACE_END_VERSIONED_NAMESPACE_DECL -# else -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -typedef string ACE_IOStream_String; -ACE_END_VERSIONED_NAMESPACE_DECL -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ -# endif /* ACE_WIN32 && defined (_MSC_VER) */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -83,10 +68,8 @@ public: ACE_END_VERSIONED_NAMESPACE_DECL -# endif /* ACE_HAS_STRING_CLASS */ - -# include "ace/Time_Value.h" -# include "ace/os_include/sys/os_types.h" +# include "ace/Time_Value.h" +# include "ace/os_include/sys/os_types.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -310,7 +293,7 @@ protected: virtual ACE_HANDLE get_handle (void); -# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) && !defined (ACE_USES_OLD_IOSTREAMS) +# if !defined (ACE_USES_OLD_IOSTREAMS) char *base () const { return cur_mode_ == get_mode_ ? eback_saved_ @@ -336,7 +319,7 @@ protected: { return pptr () - pbase (); } -# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ +# endif /* !ACE_USES_OLD_IOSTREAMS */ }; ACE_END_VERSIONED_NAMESPACE_DECL @@ -410,7 +393,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/ACE/ace/IOStream_T.cpp b/ACE/ace/IOStream_T.cpp index 21b8e66263d..f0d10ad35a9 100644 --- a/ACE/ace/IOStream_T.cpp +++ b/ACE/ace/IOStream_T.cpp @@ -146,12 +146,9 @@ ACE_IOStream<STREAM>::operator>> (ACE_Time_Value *&tv) return *this; } -#if defined (ACE_HAS_STRING_CLASS) - -// A simple string operator. The base iostream has 'em for char* but -// that isn't always the best thing for a String. If we don't provide -// our own here, we may not get what we want. - +/// A simple string operator. The base iostream has 'em for char* but +/// that isn't always the best thing for a String. If we don't provide +/// our own here, we may not get what we want. template <class STREAM> ACE_IOStream<STREAM> & ACE_IOStream<STREAM>::operator>> (ACE_IOStream_String &v) { @@ -240,6 +237,5 @@ operator<< (STREAM &stream, ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_HAS_STRING_CLASS */ #endif /* ACE_LACKS_ACE_IOSTREAM */ #endif /* ACE_IOSTREAM_T_CPP */ diff --git a/ACE/ace/IOStream_T.h b/ACE/ace/IOStream_T.h index d834c525470..49ddbf0ad09 100644 --- a/ACE/ace/IOStream_T.h +++ b/ACE/ace/IOStream_T.h @@ -34,10 +34,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -# if defined (ACE_HAS_STRING_CLASS) template <class STREAM> STREAM & operator>> (STREAM &stream, ACE_Quoted_String &str); template <class STREAM> STREAM & operator<< (STREAM &stream, ACE_Quoted_String &str); -# endif /* defined (ACE_HAS_STRING_CLASS) */ template <class STREAM> class ACE_Streambuf_T : public ACE_Streambuf @@ -137,7 +135,6 @@ public: */ int eof () const; -# if defined (ACE_HAS_STRING_CLASS) /** * A simple string operator. The base <iostream> has them for char* * but that isn't always the best thing for a <String>. If we don't @@ -148,7 +145,6 @@ public: /// The converse of the <String::put> operator. virtual ACE_IOStream<STREAM> &operator<< (ACE_IOStream_String &v); -# endif /* ACE_HAS_STRING_CLASS */ // = Using the macros to provide get/set operators. GETPUT_FUNC_SET (ACE_IOStream<STREAM>) @@ -170,14 +166,12 @@ public: if (good ()) return 1; } -# if !defined (ACE_WIN32) - // MS VC++ 5.0 doesn't declare setstate. setstate (failbit); -# endif /* !ACE_WIN32 */ return (0); } - virtual int ipfx0 (void) { return ipfx (0); } // Optimized ipfx(0) - virtual int ipfx1 (void) // Optimized ipfx(1) + virtual int ipfx0 (void) // Optimized ipfx(0) + { return ipfx (0); } + virtual int ipfx1 (void) // Optimized ipfx(1) { if (good ()) { @@ -186,13 +180,10 @@ public: if (good ()) return 1; } -# if !defined (ACE_WIN32) - // MS VC++ 5.0 doesn't declare setstate. setstate (failbit); -# endif /* !ACE_WIN32 */ return (0); } - virtual void isfx (void) { return; } + virtual void isfx (void) { return; } virtual int opfx (void) { if (good () && tie () != 0) diff --git a/ACE/ace/LSOCK_Acceptor.cpp b/ACE/ace/LSOCK_Acceptor.cpp index 1dc0cf8f998..4b99a906454 100644 --- a/ACE/ace/LSOCK_Acceptor.cpp +++ b/ACE/ace/LSOCK_Acceptor.cpp @@ -9,14 +9,11 @@ # include "ace/Malloc_Base.h" #endif /* ACE_HAS_ALLOC_HOOKS */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Acceptor) // Return the local endpoint address. - int ACE_LSOCK_Acceptor::get_local_addr (ACE_Addr &a) const { diff --git a/ACE/ace/Lib_Find.cpp b/ACE/ace/Lib_Find.cpp index ea7814a7e4f..650412aafad 100644 --- a/ACE/ace/Lib_Find.cpp +++ b/ACE/ace/Lib_Find.cpp @@ -587,8 +587,10 @@ ACE::ldsymbol (ACE_SHLIB_HANDLE sh, const ACE_TCHAR *entry_point) { void* symaddr = ACE_OS::dlsym (sh, entry_point); // if not found through dlsym() try registry - if (symaddr == 0) - symaddr = ACE_LD_SYMBOL_REGISTRY::instance ()->find_symbol (entry_point); + if (!symaddr) + { + symaddr = ACE_LD_SYMBOL_REGISTRY::instance ()->find_symbol (entry_point); + } return symaddr; } diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index 9012294efdd..b7b4aad6065 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -3208,16 +3208,16 @@ ACE_Log_Msg::log_priority_enabled (ACE_Log_Priority log_priority, void ACE_Log_Msg::init_hook (ACE_OS_Log_Msg_Attributes &attributes -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +# if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) , ACE_SEH_EXCEPT_HANDLER selector , ACE_SEH_EXCEPT_HANDLER handler -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +# endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ ) { -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +# if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) attributes.seh_except_selector_ = selector; attributes.seh_except_handler_ = handler; -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +# endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ if (ACE_Log_Msg::exists ()) { ACE_Log_Msg *inherit_log = ACE_LOG_MSG; diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h index a40750264a4..e3d1e462bce 100644 --- a/ACE/ace/Log_Msg.h +++ b/ACE/ace/Log_Msg.h @@ -611,10 +611,10 @@ public: * @a attributes argument */ static void init_hook (ACE_OS_Log_Msg_Attributes &attributes -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +# if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) , ACE_SEH_EXCEPT_HANDLER selector = 0 , ACE_SEH_EXCEPT_HANDLER handler = 0 -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +# endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ ); /** diff --git a/ACE/ace/MEM_IO.cpp b/ACE/ace/MEM_IO.cpp index 46750e0d864..c114d4f08cc 100644 --- a/ACE/ace/MEM_IO.cpp +++ b/ACE/ace/MEM_IO.cpp @@ -130,7 +130,7 @@ ACE_MT_MEM_IO::Simple_Queue::read () { retv = this->mq_->head_; // Here, we assume we already have acquired the lock necessary - // and there are soemthing in the queue. + // and there are something in the queue. if (this->mq_->head_ == this->mq_->tail_) { // Last message in the queue. diff --git a/ACE/ace/MEM_IO.inl b/ACE/ace/MEM_IO.inl index 0599660bc78..6806a858c5b 100644 --- a/ACE/ace/MEM_IO.inl +++ b/ACE/ace/MEM_IO.inl @@ -49,9 +49,9 @@ ACE_MT_MEM_IO::Simple_Queue::init (MQ_Struct *mq, ACE_INLINE ssize_t ACE_Reactive_MEM_IO::get_buf_len (const ACE_OFF_T off, ACE_MEM_SAP_Node *&buf) { -#if !defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if !defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) ACE_TRACE ("ACE_Reactive_MEM_IO::get_buf_len"); -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ if (this->shm_malloc_ == 0) { diff --git a/ACE/ace/Malloc_T.cpp b/ACE/ace/Malloc_T.cpp index fbe0ec735e7..ff8d6563db0 100644 --- a/ACE/ace/Malloc_T.cpp +++ b/ACE/ace/Malloc_T.cpp @@ -621,9 +621,9 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::remove () template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> void * ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_malloc (size_t nbytes) { -#if !defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if !defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_malloc"); -#endif /* !ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* !ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ if (this->cb_ptr_ == 0) return 0; @@ -643,12 +643,12 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_malloc (size_t nbytes) prevp = this->cb_ptr_->freep_; currp = prevp->next_block_; } -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) ACE_SEH_EXCEPT (this->memory_pool_.seh_selector (GetExceptionInformation ())) { currp = prevp->next_block_; } -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ // Search the freelist to locate a block of the appropriate size. @@ -779,9 +779,9 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::calloc (size_t n_elem, template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> void ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_free (void *ap) { -#if !defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if !defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_free"); -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ if (ap == 0 || this->cb_ptr_ == 0) return; @@ -840,9 +840,9 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_free (void *ap) template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> void* ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_find (const char *name) { -#if !defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if !defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_find"); -#endif /* !ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* !ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ if (this->cb_ptr_ == 0) return 0; diff --git a/ACE/ace/Mem_Map.cpp b/ACE/ace/Mem_Map.cpp index 93a5b52b880..47fa9b2b3d2 100644 --- a/ACE/ace/Mem_Map.cpp +++ b/ACE/ace/Mem_Map.cpp @@ -189,7 +189,7 @@ ACE_Mem_Map::open (const ACE_TCHAR *file_name, #if defined (INTEGRITY) || defined (__QNXNTO__) || defined (ACE_VXWORKS) this->handle_ = ACE_OS::shm_open (file_name, flags, perms, sa); #elif defined (ACE_OPENVMS) - ACE_OSCALL (::open (file_name, flags, perms, "shr=get,put,upd"), ACE_HANDLE, -1, this->handle_); + ACE_OSCALL (::open (file_name, flags, perms, "shr=get,put,upd"), ACE_HANDLE, this->handle_); #else this->handle_ = ACE_OS::open (file_name, flags, perms, sa); #endif /* INTEGRITY */ diff --git a/ACE/ace/OS_Log_Msg_Attributes.h b/ACE/ace/OS_Log_Msg_Attributes.h index 9a51851a9cf..ac61487c6ea 100644 --- a/ACE/ace/OS_Log_Msg_Attributes.h +++ b/ACE/ace/OS_Log_Msg_Attributes.h @@ -64,11 +64,11 @@ protected: /// Depth of the nesting for printing traces. int trace_depth_; -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) /// Structured exception handling Callbacks, only used under Win32 ACE_SEH_EXCEPT_HANDLER seh_except_selector_; ACE_SEH_EXCEPT_HANDLER seh_except_handler_; -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ private: void operator= (const ACE_OS_Log_Msg_Attributes &) = delete; diff --git a/ACE/ace/OS_Log_Msg_Attributes.inl b/ACE/ace/OS_Log_Msg_Attributes.inl index 744ac94870f..ad56f72a515 100644 --- a/ACE/ace/OS_Log_Msg_Attributes.inl +++ b/ACE/ace/OS_Log_Msg_Attributes.inl @@ -9,10 +9,10 @@ ACE_OS_Log_Msg_Attributes::ACE_OS_Log_Msg_Attributes () : tracing_enabled_ (0), restart_ (true), trace_depth_ (0) -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) , seh_except_selector_ (0), seh_except_handler_ (0) -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ { } diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index 2cd16d29e7a..8ef256aa9c3 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -1621,7 +1621,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, ACE_OSCALL (ACE_ADAPT_RETVAL (::SleepConditionVariableCS (cv, external_mutex, msec_timeout), result), - int, -1, result); + int, result); return result; #else // Prevent race conditions on the <waiters_> count. @@ -1728,8 +1728,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv, # if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::SleepConditionVariableCS (cv, external_mutex, INFINITE), result), - int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::SleepConditionVariableCS (cv, external_mutex, INFINITE), result), int); #else if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) return -1; @@ -1911,11 +1910,9 @@ ACE_OS::mutex_init (ACE_mutex_t *m, ACE_UNUSED_ARG (sa); ACE_UNUSED_ARG (lock_type); int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_init (m, - lock_scope, - attributes), + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_init (m, lock_scope, attributes), result), - int, -1); + int); # elif defined (ACE_HAS_WTHREADS) m->type_ = lock_scope; @@ -1987,12 +1984,11 @@ ACE_OS::mutex_destroy (ACE_mutex_t *m) ACE_NOTSUP_RETURN (-1); # else int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_mutex_destroy (m), - result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_mutex_destroy (m), result), int); # endif /* ACE_LACKS_PTHREAD_MUTEX_DESTROY */ # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_destroy (m), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_destroy (m), result), int); # elif defined (ACE_HAS_WTHREADS) switch (m->type_) { @@ -2073,11 +2069,10 @@ ACE_OS::mutex_lock (ACE_mutex_t *m) # if defined (ACE_HAS_PTHREADS) // Note, don't use "::" here since the following call is often a macro. int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_lock (m), result), - int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_lock (m), result), int); # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_lock (m), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_lock (m), result), int); # elif defined (ACE_HAS_WTHREADS) switch (m->type_) { @@ -2168,7 +2163,7 @@ ACE_OS::mutex_lock (ACE_mutex_t *m, // Note that the mutex should not be a recursive one, i.e., it // should only be a standard mutex or an error checking mutex. - ACE_OSCALL (ACE_ADAPT_RETVAL (::pthread_mutex_timedlock (m, &ts), result), int, -1, result); + ACE_OSCALL (ACE_ADAPT_RETVAL (::pthread_mutex_timedlock (m, &ts), result), int, result); // We need to adjust this to make the errno values consistent. if (result == -1 && errno == ETIMEDOUT) @@ -2248,11 +2243,10 @@ ACE_OS::mutex_trylock (ACE_mutex_t *m) # if defined (ACE_HAS_PTHREADS) // Note, don't use "::" here since the following call is often a macro. int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_trylock (m), result), - int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_trylock (m), result), int); # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_trylock (m), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_trylock (m), result), int); # elif defined (ACE_HAS_WTHREADS) switch (m->type_) { @@ -2350,11 +2344,10 @@ ACE_OS::mutex_unlock (ACE_mutex_t *m) # if defined (ACE_HAS_PTHREADS) // Note, don't use "::" here since the following call is often a macro. int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_unlock (m), result), - int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_unlock (m), result), int); # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_unlock (m), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_unlock (m), result), int); # elif defined (ACE_HAS_WTHREADS) switch (m->type_) { @@ -3299,7 +3292,7 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, sched_params.policy (), ¶m), result), - int, -1); + int); } # if defined (sun) // We need to be able to set LWP priorities on Suns, even without @@ -3580,7 +3573,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, ACE_Base_Thread_Adapter *thread_args = 0; if (thread_adapter == 0) -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) ACE_NEW_RETURN (thread_args, ACE_OS_Thread_Adapter (func, args, (ACE_THR_C_FUNC) ACE_THREAD_ADAPTER_NAME, @@ -3595,15 +3588,14 @@ ACE_OS::thr_create (ACE_THR_FUNC func, flags), -1); -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ else thread_args = thread_adapter; std::unique_ptr <ACE_Base_Thread_Adapter> auto_thread_args; if (thread_adapter == 0) - ACE_auto_ptr_reset (auto_thread_args, - thread_args); + auto_thread_args.reset (thread_args); #if defined (ACE_HAS_THREADS) @@ -3933,7 +3925,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, thread_args->entry_point (), thread_args), result), - int, -1, result); + int, result); ::pthread_attr_destroy (&attr); // This is a SunOS or POSIX implementation of pthreads, where we @@ -3967,7 +3959,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, &policy, &sparam), result), int, - -1, result); + result); // The only policy supported by by SunOS, thru version 5.6, // is SCHED_OTHER, so that's hard-coded here. @@ -3983,7 +3975,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, policy, &sparam), result), - int, -1); + int); } } @@ -4026,7 +4018,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, thread_args->entry_point (), thread_args, flags, thr_id), result), - int, -1, result); + int, result); if (result != -1) { @@ -4515,12 +4507,12 @@ ACE_OS::thr_keycreate_native (ACE_OS_thread_key_t *key, int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_key_create (key, dest), result), - int, -1); + int); # elif defined (ACE_HAS_STHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_keycreate (key, dest), result), - int, -1); + int); # elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (dest); *key = ::TlsAlloc (); @@ -4723,10 +4715,10 @@ ACE_OS::thr_setspecific_native (ACE_OS_thread_key_t key, void *data) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setspecific (key, data), result), - int, -1); + int); # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setspecific (key, data), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setspecific (key, data), result), int); # elif defined (ACE_HAS_WTHREADS) ::TlsSetValue (key, data); return 0; diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index 8d3c29a913a..cd5dda324c5 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -223,7 +223,7 @@ ACE_OS::condattr_setclock (ACE_condattr_t &attributes, clockid_t clock_id) int result = -1; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_condattr_setclock (&attributes, clock_id), result), - int, -1); + int); return result; #else ACE_UNUSED_ARG (clock_id); @@ -247,12 +247,12 @@ ACE_OS::cond_broadcast (ACE_cond_t *cv) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_broadcast (cv), result), - int, -1); + int); # elif defined (ACE_HAS_STHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_broadcast (cv), result), - int, -1); + int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) ::WakeAllConditionVariable (cv); return 0; @@ -270,10 +270,10 @@ ACE_OS::cond_destroy (ACE_cond_t *cv) # if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_destroy (cv), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_destroy (cv), result), int); # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_destroy (cv), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_destroy (cv), result), int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) // Windows doesn't have a destroy return 0; @@ -319,7 +319,7 @@ ACE_OS::cond_init (ACE_cond_t *cv, attributes.type, arg), result), - int, -1); + int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) ::InitializeConditionVariable (cv); return 0; @@ -360,10 +360,10 @@ ACE_OS::cond_signal (ACE_cond_t *cv) # if defined (ACE_HAS_PTHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_signal (cv), result), - int, -1); + int); # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_signal (cv), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_signal (cv), result), int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) ::WakeConditionVariable (cv); return 0; @@ -383,15 +383,15 @@ ACE_OS::cond_wait (ACE_cond_t *cv, # if defined (ACE_HAS_PTHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_wait (cv, external_mutex), result), - int, -1); + int); # elif defined (ACE_HAS_STHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_wait (cv, external_mutex), result), - int, -1); + int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::SleepConditionVariableCS (cv, &external_mutex->thr_mutex_, INFINITE), result), - int, -1); + int); # endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (cv); @@ -420,7 +420,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, : pthread_cond_timedwait (cv, external_mutex, (ACE_TIMESPEC_PTR) &ts), result), - int, -1, result); + int, result); // We need to adjust this to make the POSIX and Solaris return // values consistent. EAGAIN is from Pthreads DRAFT4 (HP-UX 10.20 and down) if (result == -1 && @@ -434,7 +434,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, external_mutex, (timestruc_t*)&ts), result), - int, -1, result); + int, result); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) int msec_timeout = 0; if (timeout != 0) @@ -448,7 +448,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, ACE_OSCALL (ACE_ADAPT_RETVAL (::SleepConditionVariableCS (cv, &external_mutex->thr_mutex_, msec_timeout), result), - int, -1, result); + int, result); return result; # endif /* ACE_HAS_STHREADS */ @@ -573,8 +573,7 @@ ACE_OS::priority_control (ACE_idtype_t idtype, ACE_id_t identifier, int cmd, voi { ACE_OS_TRACE ("ACE_OS::priority_control"); #if defined (ACE_HAS_PRIOCNTL) - ACE_OSCALL_RETURN (priocntl (idtype, identifier, cmd, static_cast<caddr_t> (arg)), - long, -1); + return priocntl (idtype, identifier, cmd, static_cast<caddr_t> (arg)); #else /* ! ACE_HAS_PRIOCNTL*/ ACE_UNUSED_ARG (idtype); ACE_UNUSED_ARG (identifier); @@ -1029,10 +1028,10 @@ ACE_OS::rw_rdlock (ACE_rwlock_t *rw) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_rdlock (rw), result), - int, -1); + int); # else /* Solaris */ int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_rdlock (rw), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_rdlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # else /* NT, POSIX, and VxWorks don't support this natively. */ # if defined (ACE_HAS_PTHREADS) @@ -1080,10 +1079,10 @@ ACE_OS::rw_tryrdlock (ACE_rwlock_t *rw) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_tryrdlock (rw), result), - int, -1); + int); # else /* Solaris */ int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_tryrdlock (rw), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_tryrdlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # else /* NT, POSIX, and VxWorks don't support this natively. */ int result = -1; @@ -1123,10 +1122,10 @@ ACE_OS::rw_trywrlock (ACE_rwlock_t *rw) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_trywrlock (rw), result), - int, -1); + int); # else /* Solaris */ int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_trywrlock (rw), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_trywrlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # else /* NT, POSIX, and VxWorks don't support this natively. */ int result = -1; @@ -1171,7 +1170,7 @@ ACE_OS::rw_trywrlock_upgrade (ACE_rwlock_t *rw) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_trywrlock (rw), result), - int, -1); + int); # elif !defined (ACE_LACKS_RWLOCK_T) // Some native rwlocks, such as those on Solaris, don't // support the upgrade feature . . . @@ -1244,10 +1243,10 @@ ACE_OS::rw_unlock (ACE_rwlock_t *rw) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_unlock (rw), result), - int, -1); + int); # else /* Solaris */ int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_unlock (rw), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_unlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # else /* NT, POSIX, and VxWorks don't support this natively. */ if (ACE_OS::mutex_lock (&rw->lock_) == -1) @@ -1303,10 +1302,10 @@ ACE_OS::rw_wrlock (ACE_rwlock_t *rw) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_wrlock (rw), result), - int, -1); + int); # else /* Solaris */ int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_wrlock (rw), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_wrlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # else /* NT, POSIX, and VxWorks don't support this natively. */ # if defined (ACE_HAS_PTHREADS) @@ -1356,10 +1355,10 @@ ACE_OS::rwlock_destroy (ACE_rwlock_t *rw) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_destroy (rw), result), - int, -1); + int); # else /* Solaris */ int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rwlock_destroy (rw), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rwlock_destroy (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # else /* NT, POSIX, and VxWorks don't support this natively. */ ACE_OS::mutex_destroy (&rw->lock_); @@ -1404,7 +1403,7 @@ ACE_OS::rwlock_init (ACE_rwlock_t *rw, type = type; name = name; int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rwlock_init (rw, type, arg), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rwlock_init (rw, type, arg), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ } #endif /* ACE_HAS_THREADS && !defined (ACE_LACKS_RWLOCK_T) */ @@ -1425,7 +1424,7 @@ ACE_OS::sema_destroy (ACE_sema_t *s) // Only destroy the semaphore if we're the ones who // initialized it. # if !defined (ACE_LACKS_SEM_DESTROY) - ACE_OSCALL (::sem_destroy (s->sema_),int, -1, result); + ACE_OSCALL (::sem_destroy (s->sema_),int, result); # endif /* ACE_LACKS_SEM_DESTROY */ ACE_OS::shm_unlink (s->name_); delete s->name_; @@ -1441,13 +1440,13 @@ ACE_OS::sema_destroy (ACE_sema_t *s) #else ACE_OS::free ((void *) s->name_); #endif /* ACE_HAS_ALLOC_HOOKS */ - ACE_OSCALL_RETURN (::sem_close (s->sema_), int, -1); + return ::sem_close (s->sema_); } # endif /* ACE_LACKS_NAMED_POSIX_SEM */ else { # if !defined (ACE_LACKS_UNNAMED_SEMAPHORE) && !defined (ACE_LACKS_SEM_DESTROY) - ACE_OSCALL (::sem_destroy (s->sema_), int, -1, result); + ACE_OSCALL (::sem_destroy (s->sema_), int, result); # endif /* !ACE_LACKS_UNNAMED_SEMAPHORE && !ACE_LACKS_SEM_DESTROY */ # if defined (ACE_LACKS_NAMED_POSIX_SEM) if (s->new_sema_) @@ -1478,7 +1477,7 @@ ACE_OS::sema_destroy (ACE_sema_t *s) #elif defined (ACE_HAS_THREADS) # if defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_destroy (s), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_destroy (s), result), int); # elif defined (ACE_HAS_PTHREADS) int r1 = ACE_OS::mutex_destroy (&s->lock_); int r2 = ACE_OS::cond_destroy (&s->count_nonzero_); @@ -1494,7 +1493,7 @@ ACE_OS::sema_destroy (ACE_sema_t *s) # endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) int result; - ACE_OSCALL (::semDelete (s->sema_), int, -1, result); + ACE_OSCALL (::semDelete (s->sema_), int, result); s->sema_ = 0; return result; # endif /* ACE_HAS_STHREADS */ @@ -1667,9 +1666,7 @@ ACE_OS::sema_init (ACE_sema_t *s, s->new_sema_ = true; # endif /* ACE_LACKS_NAMED_POSIX_SEM */ ACE_OS::memset(s->sema_, 0, sizeof(*s->sema_)); - ACE_OSCALL_RETURN (::sem_init (s->sema_, - type != USYNC_THREAD, - count), int, -1); + return ::sem_init (s->sema_, type != USYNC_THREAD, count); # endif /* ACE_LACKS_UNNAMED_SEMAPHORE */ } @@ -1766,7 +1763,7 @@ ACE_OS::sema_init (ACE_sema_t *s, ACE_UNUSED_ARG (attributes); int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_init (s, count, type, arg), result), - int, -1); + int); # elif defined (ACE_HAS_PTHREADS) ACE_UNUSED_ARG (max); ACE_UNUSED_ARG (sa); @@ -1977,7 +1974,7 @@ ACE_INLINE int ACE_OS::sema_unlink (const char *name) { #if defined (ACE_HAS_POSIX_SEM) && !defined (ACE_LACKS_SEM_UNLINK) - ACE_OSCALL_RETURN (::sem_unlink (name), int, -1); + return ::sem_unlink (name); #else ACE_UNUSED_ARG (name); ACE_NOTSUP_RETURN (-1); @@ -1990,7 +1987,7 @@ ACE_OS::sema_post (ACE_sema_t *s) ACE_OS_TRACE ("ACE_OS::sema_post"); # if defined (ACE_HAS_POSIX_SEM) # if defined (ACE_HAS_POSIX_SEM_TIMEOUT) || defined (ACE_DISABLE_POSIX_SEM_TIMEOUT_EMULATION) - ACE_OSCALL_RETURN (::sem_post (s->sema_), int, -1); + return ::sem_post (s->sema_); # else int result = -1; @@ -2011,7 +2008,7 @@ ACE_OS::sema_post (ACE_sema_t *s) # elif defined (ACE_HAS_THREADS) # if defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_post (s), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_post (s), result), int); # elif defined (ACE_HAS_PTHREADS) int result = -1; @@ -2052,7 +2049,7 @@ ACE_OS::sema_post (ACE_sema_t *s) return result; # endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) - ACE_OSCALL_RETURN (::semGive (s->sema_), int, -1); + return ::semGive (s->sema_); # endif /* ACE_HAS_STHREADS */ # else ACE_UNUSED_ARG (s); @@ -2089,7 +2086,7 @@ ACE_OS::sema_trywait (ACE_sema_t *s) ACE_OS_TRACE ("ACE_OS::sema_trywait"); # if defined (ACE_HAS_POSIX_SEM) // POSIX semaphores set errno to EAGAIN if trywait fails - ACE_OSCALL_RETURN (::sem_trywait (s->sema_), int, -1); + return ::sem_trywait (s->sema_); # elif defined (ACE_USES_FIFO_SEM) char c; int rc, flags; @@ -2118,7 +2115,7 @@ ACE_OS::sema_trywait (ACE_sema_t *s) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_trywait (s), result), - int, -1); + int); # elif defined (ACE_HAS_PTHREADS) int result = -1; @@ -2212,7 +2209,7 @@ ACE_OS::sema_wait (ACE_sema_t *s) { ACE_OS_TRACE ("ACE_OS::sema_wait"); # if defined (ACE_HAS_POSIX_SEM) - ACE_OSCALL_RETURN (::sem_wait (s->sema_), int, -1); + return ::sem_wait (s->sema_); # elif defined (ACE_USES_FIFO_SEM) char c; if (ACE_OS::read (s->fd_[0], &c, sizeof (char)) == 1) @@ -2221,7 +2218,7 @@ ACE_OS::sema_wait (ACE_sema_t *s) # elif defined (ACE_HAS_THREADS) # if defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_wait (s), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_wait (s), result), int); # elif defined (ACE_HAS_PTHREADS) int result = 0; @@ -2308,7 +2305,7 @@ ACE_OS::sema_wait (ACE_sema_t *s) /* NOTREACHED */ # endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) - ACE_OSCALL_RETURN (::semTake (s->sema_, WAIT_FOREVER), int, -1); + return ::semTake (s->sema_, WAIT_FOREVER); # endif /* ACE_HAS_STHREADS */ # else ACE_UNUSED_ARG (s); @@ -2325,7 +2322,7 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) int rc; timespec_t ts; ts = tv; // Calls ACE_Time_Value::operator timespec_t(). - ACE_OSCALL (::sem_timedwait (s->sema_, &ts), int, -1, rc); + ACE_OSCALL (::sem_timedwait (s->sema_, &ts), int, rc); if (rc == -1 && errno == ETIMEDOUT) errno = ETIME; /* POSIX returns ETIMEDOUT but we need ETIME */ return rc; @@ -2609,7 +2606,7 @@ ACE_OS::semctl (int int_id, int semnum, int cmd, semun value) { ACE_OS_TRACE ("ACE_OS::semctl"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::semctl (int_id, semnum, cmd, value), int, -1); + return ::semctl (int_id, semnum, cmd, value); #else ACE_UNUSED_ARG (int_id); ACE_UNUSED_ARG (semnum); @@ -2625,7 +2622,7 @@ ACE_OS::semget (key_t key, int nsems, int flags) { ACE_OS_TRACE ("ACE_OS::semget"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::semget (key, nsems, flags), int, -1); + return ::semget (key, nsems, flags); #else ACE_UNUSED_ARG (key); ACE_UNUSED_ARG (nsems); @@ -2640,7 +2637,7 @@ ACE_OS::semop (int int_id, struct sembuf *sops, size_t nsops) { ACE_OS_TRACE ("ACE_OS::semop"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::semop (int_id, sops, nsops), int, -1); + return ::semop (int_id, sops, nsops); #else ACE_UNUSED_ARG (int_id); ACE_UNUSED_ARG (sops); @@ -2666,8 +2663,7 @@ ACE_OS::sigtimedwait (const sigset_t *sset, tsp = &ts; } - ACE_OSCALL_RETURN (::sigtimedwait (sset, info, tsp), - int, -1); + return ::sigtimedwait (sset, info, tsp); #else ACE_UNUSED_ARG (sset); ACE_UNUSED_ARG (info); @@ -2730,7 +2726,7 @@ ACE_OS::sigwaitinfo (const sigset_t *sset, // If this isn't true somewhere, let me know and I'll fix this. // -Steve Huston <shuston@riverace.com>. #if defined (ACE_HAS_SIGTIMEDWAIT) - ACE_OSCALL_RETURN (::sigwaitinfo (sset, info), int, -1); + return ::sigwaitinfo (sset, info); #else ACE_UNUSED_ARG (sset); ACE_UNUSED_ARG (info); @@ -2747,9 +2743,9 @@ ACE_OS::thr_cancel (ACE_thread_t thr_id) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cancel (thr_id), result), - int, -1); + int); # elif defined (ACE_HAS_VXTHREADS) - ACE_OSCALL_RETURN (::taskDelete (thr_id), int, -1); + return ::taskDelete (thr_id); # else /* Could be ACE_HAS_PTHREADS && ACE_LACKS_PTHREAD_CANCEL */ ACE_UNUSED_ARG (thr_id); ACE_NOTSUP_RETURN (-1); @@ -2784,23 +2780,23 @@ ACE_OS::thr_continue (ACE_hthread_t target_thread) #if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_continue (target_thread), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_continue (target_thread), result), int); # elif defined (ACE_HAS_PTHREADS) # if defined (ACE_HAS_PTHREAD_CONTINUE) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_continue (target_thread), result), - int, -1); + int); # elif defined (ACE_HAS_PTHREAD_CONTINUE_NP) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_continue_np (target_thread), result), - int, -1); + int); # elif defined (ACE_HAS_PTHREAD_RESUME_NP) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_resume_np (target_thread), result), - int, -1); + int); # else ACE_UNUSED_ARG (target_thread); ACE_NOTSUP_RETURN (-1); @@ -2812,7 +2808,7 @@ ACE_OS::thr_continue (ACE_hthread_t target_thread) else return 0; # elif defined (ACE_HAS_VXTHREADS) - ACE_OSCALL_RETURN (::taskResume (target_thread), int, -1); + return ::taskResume (target_thread); # endif /* ACE_HAS_STHREADS */ #else ACE_UNUSED_ARG (target_thread); @@ -2851,12 +2847,12 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy) ACE_OSCALL (ACE_ADAPT_RETVAL (pthread_getschedparam (ht_id, &policy, ¶m), result), int, - -1, result); + result); priority = param.sched_priority; return result; # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getprio (ht_id, &priority), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getprio (ht_id, &priority), result), int); # elif defined (ACE_HAS_WTHREADS) ACE_Errno_Guard error (errno); @@ -2885,7 +2881,7 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy) return 0; # elif defined (ACE_HAS_VXTHREADS) - ACE_OSCALL_RETURN (::taskPriorityGet (ht_id, &priority), int, -1); + return ::taskPriorityGet (ht_id, &priority); # else ACE_UNUSED_ARG (ht_id); ACE_UNUSED_ARG (priority); @@ -2916,7 +2912,7 @@ ACE_OS::thr_getspecific_native (ACE_OS_thread_key_t key, void **data) return 0; # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getspecific (key, data), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getspecific (key, data), result), int); # elif defined (ACE_HAS_WTHREADS) *data = ::TlsGetValue (key); if (*data == 0 && ::GetLastError () != NO_ERROR) @@ -2975,7 +2971,7 @@ ACE_OS::thr_join (ACE_hthread_t thr_handle, # if defined (ACE_HAS_STHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_join (thr_handle, 0, status), result), - int, -1); + int); # elif defined (ACE_HAS_PTHREADS) # if defined (ACE_LACKS_PTHREAD_JOIN) ACE_UNUSED_ARG (thr_handle); @@ -2984,7 +2980,7 @@ ACE_OS::thr_join (ACE_hthread_t thr_handle, # else int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_join (thr_handle, status), result), - int, -1); + int); # endif /* ACE_LACKS_PTHREAD_JOIN */ # elif defined (ACE_HAS_WTHREADS) // Waiting on the calling thread will deadlock, so try to avoid that. The @@ -3039,7 +3035,7 @@ ACE_OS::thr_join (ACE_thread_t waiter_id, # if defined (ACE_HAS_STHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_join (waiter_id, thr_id, status), result), - int, -1); + int); # elif defined (ACE_HAS_PTHREADS) # if defined (ACE_LACKS_PTHREAD_JOIN) ACE_UNUSED_ARG (waiter_id); @@ -3050,7 +3046,7 @@ ACE_OS::thr_join (ACE_thread_t waiter_id, ACE_UNUSED_ARG (thr_id); int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_join (waiter_id, status), result), - int, -1); + int); # endif /* ACE_LACKS_PTHREAD_JOIN */ # elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (waiter_id); @@ -3084,16 +3080,16 @@ ACE_OS::thr_kill (ACE_thread_t thr_id, int signum) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_kill (thr_id, signum), result), - int, -1); + int); # endif /* ACE_LACKS_PTHREAD_KILL */ # elif defined (ACE_HAS_STHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_kill (thr_id, signum), result), - int, -1); + int); # elif defined (ACE_HAS_VXTHREADS) //FUZZ: disable check_for_lack_ACE_OS - ACE_OSCALL_RETURN (::kill (thr_id, signum), int, -1); + return ::kill (thr_id, signum); //FUZZ: enable check_for_lack_ACE_OS # else ACE_UNUSED_ARG (thr_id); @@ -3137,7 +3133,7 @@ ACE_OS::thr_min_stack () ACE_OSCALL (ACE_ADAPT_RETVAL (::taskInfoGet (tid, &taskDesc), status), - STATUS, -1, status); + STATUS, status); return status == OK ? taskDesc.td_stackSize : 0; # else /* Should not happen... */ ACE_NOTSUP_RETURN (0); @@ -3198,7 +3194,7 @@ ACE_OS::thr_self () // Note, don't use "::" here since the following call is often a macro. return pthread_self (); # elif defined (ACE_HAS_STHREADS) - ACE_OSCALL_RETURN (::thr_self (), int, -1); + return ::thr_self (); # elif defined (ACE_HAS_WTHREADS) return ::GetCurrentThreadId (); # elif defined (ACE_HAS_VXTHREADS) @@ -3268,7 +3264,7 @@ ACE_OS::thr_setcancelstate (int new_state, int *old_state) ACE_OSCALL (ACE_ADAPT_RETVAL (pthread_setcancelstate (local_new, &local_old), result), - int, -1, result); + int, result); if (result == -1) return -1; switch (local_old) @@ -3324,7 +3320,7 @@ ACE_OS::thr_setcanceltype (int new_type, int *old_type) ACE_OSCALL (ACE_ADAPT_RETVAL (pthread_setcanceltype (local_new, &local_old), result), - int, -1, result); + int, result); if (result == -1) return -1; switch (local_old) @@ -3358,12 +3354,10 @@ ACE_OS::thr_setconcurrency (int hint) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setconcurrency (hint), result), - int, -1); + int); # elif defined (ACE_HAS_PTHREADS) && defined (ACE_HAS_PTHREAD_SETCONCURRENCY) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setconcurrency (hint), - result), - int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setconcurrency (hint), result), int); # else ACE_UNUSED_ARG (hint); ACE_NOTSUP_RETURN (-1); @@ -3392,9 +3386,7 @@ ACE_OS::thr_setprio (ACE_hthread_t ht_id, int priority, int policy) // pthread_getschedparam(). if (policy == -1) { - ACE_OSCALL (ACE_ADAPT_RETVAL (pthread_getschedparam (ht_id, &policy, ¶m), - result), - int, -1, result); + ACE_OSCALL (ACE_ADAPT_RETVAL (pthread_getschedparam (ht_id, &policy, ¶m), result), int, result); if (result == -1) return result; } @@ -3405,12 +3397,10 @@ ACE_OS::thr_setprio (ACE_hthread_t ht_id, int priority, int policy) policy, ¶m), result), - int, -1); + int); # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setprio (ht_id, priority), - result), - int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setprio (ht_id, priority), result), int); # elif defined (ACE_HAS_WTHREADS) # if defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY) @@ -3424,7 +3414,7 @@ ACE_OS::thr_setprio (ACE_hthread_t ht_id, int priority, int policy) # endif /* defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY) */ # elif defined (ACE_HAS_VXTHREADS) - ACE_OSCALL_RETURN (::taskPrioritySet (ht_id, priority), int, -1); + ACE_OSCALL_RETURN (::taskPrioritySet (ht_id, priority), int); # else // For example, platforms that support Pthreads but LACK_SETSCHED. ACE_UNUSED_ARG (ht_id); @@ -3454,28 +3444,19 @@ ACE_OS::thr_sigsetmask (int how, ACE_NOTSUP_RETURN (-1); # elif defined (ACE_HAS_SIGTHREADMASK) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sigthreadmask (how, nsm, osm), - result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sigthreadmask (how, nsm, osm), result), int); # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_sigsetmask (how, nsm, osm), - result), - int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_sigsetmask (how, nsm, osm), result), int); # elif defined (ACE_HAS_PTHREADS) # if !defined (ACE_LACKS_PTHREAD_SIGMASK) int result; //FUZZ: disable check_for_lack_ACE_OS # if defined (ACE_HAS_NONCONST_PTHREAD_SIGMASK) sigset_t *ncnsm = const_cast<sigset_t *>(nsm); - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, ncnsm, osm), - result), - int, - -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, ncnsm, osm), result), int); # else - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, nsm, osm), - result), - int, - -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, nsm, osm), result), int); # endif /* ACE_HAS_NONCONST__PTHREAD_SIGMASK */ //FUZZ: enable check_for_lack_ACE_OS # endif /* !ACE_LACKS_PTHREAD_SIGMASK */ @@ -3537,14 +3518,10 @@ ACE_OS::thr_suspend (ACE_hthread_t target_thread) # elif defined (ACE_HAS_PTHREADS) # if defined (ACE_HAS_PTHREAD_SUSPEND) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_suspend (target_thread), - result), - int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_suspend (target_thread), result), int); # elif defined (ACE_HAS_PTHREAD_SUSPEND_NP) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_suspend_np (target_thread), - result), - int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_suspend_np (target_thread), result), int); # else ACE_UNUSED_ARG (target_thread); ACE_NOTSUP_RETURN (-1); @@ -3556,7 +3533,7 @@ ACE_OS::thr_suspend (ACE_hthread_t target_thread) ACE_FAIL_RETURN (-1); /* NOTREACHED */ # elif defined (ACE_HAS_VXTHREADS) - ACE_OSCALL_RETURN (::taskSuspend (target_thread), int, -1); + return ::taskSuspend (target_thread); # endif /* ACE_HAS_STHREADS */ #else ACE_UNUSED_ARG (target_thread); diff --git a/ACE/ace/OS_NS_arpa_inet.cpp b/ACE/ace/OS_NS_arpa_inet.cpp index 0cc14c302b8..b0f7125ca2f 100644 --- a/ACE/ace/OS_NS_arpa_inet.cpp +++ b/ACE/ace/OS_NS_arpa_inet.cpp @@ -90,12 +90,12 @@ ACE_OS::inet_aton (const char *host_name, struct in_addr *addr) // Must reset errno first. Refer to WindRiver SPR# 34949, SPR# 36026 ::errnoSet(0); int result = ERROR; - ACE_OSCALL (::inet_aton (const_cast <char*>(host_name), addr), int, ERROR, result); + ACE_OSCALL (::inet_aton (const_cast <char*>(host_name), addr), int, result); return (result == ERROR) ? 0 : 1; #else // inet_aton() returns 0 upon failure, not -1 since -1 is a valid // address (255.255.255.255). - ACE_OSCALL_RETURN (::inet_aton (host_name, addr), int, 0); + return ::inet_aton (host_name, addr); #endif /* ACE_LACKS_INET_ATON */ } diff --git a/ACE/ace/OS_NS_arpa_inet.inl b/ACE/ace/OS_NS_arpa_inet.inl index 3860140cbbb..49343444e98 100644 --- a/ACE/ace/OS_NS_arpa_inet.inl +++ b/ACE/ace/OS_NS_arpa_inet.inl @@ -27,7 +27,7 @@ ACE_OS::inet_ntoa (const struct in_addr addr) ACE_UNUSED_ARG (addr); ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (::inet_ntoa (addr), char *, 0); + return ::inet_ntoa (addr); #endif } @@ -38,9 +38,9 @@ ACE_OS::inet_ntop (int family, const void *addrptr, char *strptr, size_t len) #if defined ACE_HAS_IPV6 && !defined ACE_LACKS_INET_NTOP # if defined (ACE_HAS_NONCONST_INET_NTOP) - ACE_OSCALL_RETURN (::inet_ntop (family, const_cast<void *> (addrptr), strptr, len), const char *, 0); + return ::inet_ntop (family, const_cast<void *> (addrptr), strptr, len); # else - ACE_OSCALL_RETURN (::inet_ntop (family, addrptr, strptr, len), const char *, 0); + return ::inet_ntop (family, addrptr, strptr, len); # endif #else @@ -67,7 +67,7 @@ ACE_OS::inet_pton (int family, const char *strptr, void *addrptr) ACE_OS_TRACE ("ACE_OS::inet_pton"); #if defined ACE_HAS_IPV6 && !defined ACE_LACKS_INET_PTON - ACE_OSCALL_RETURN (::inet_pton (family, strptr, addrptr), int, -1); + return ::inet_pton (family, strptr, addrptr); #else if (family == AF_INET) diff --git a/ACE/ace/OS_NS_devctl.inl b/ACE/ace/OS_NS_devctl.inl index d151005c006..619722e1746 100644 --- a/ACE/ace/OS_NS_devctl.inl +++ b/ACE/ace/OS_NS_devctl.inl @@ -16,7 +16,7 @@ ACE_OS::posix_devctl (int filedes, int dcmd, ACE_UNUSED_ARG (nbyte); ACE_UNUSED_ARG (dev_info_ptr); # if defined ACE_EMULATE_POSIX_DEVCTL && ACE_EMULATE_POSIX_DEVCTL - ACE_OSCALL_RETURN (::ioctl (filedes, dcmd, dev_data_ptr), int, -1); + return ::ioctl (filedes, dcmd, dev_data_ptr); # else ACE_UNUSED_ARG (filedes); ACE_UNUSED_ARG (dcmd); @@ -24,8 +24,7 @@ ACE_OS::posix_devctl (int filedes, int dcmd, ACE_NOTSUP_RETURN (-1); # endif #else - ACE_OSCALL_RETURN (::posix_devctl (filedes, dcmd, dev_data_ptr, nbyte, - dev_info_ptr), int, -1); + return ::posix_devctl (filedes, dcmd, dev_data_ptr, nbyte, dev_info_ptr); #endif } diff --git a/ACE/ace/OS_NS_dlfcn.inl b/ACE/ace/OS_NS_dlfcn.inl index 6f804c67679..840ef48e1bb 100644 --- a/ACE/ace/OS_NS_dlfcn.inl +++ b/ACE/ace/OS_NS_dlfcn.inl @@ -32,12 +32,12 @@ ACE_OS::dlclose (ACE_SHLIB_HANDLE handle) // SunOS4 does not automatically call _fini()! void *ptr; - ACE_OSCALL (::dlsym (handle, ACE_TEXT ("_fini")), void *, 0, ptr); + ACE_OSCALL (::dlsym (handle, ACE_TEXT ("_fini")), void *, ptr); if (ptr != 0) (*((int (*)(void)) ptr)) (); // Call _fini hook explicitly. # endif /* ACE_HAS_AUTOMATIC_INIT_FINI */ - ACE_OSCALL_RETURN (::dlclose (handle), int, -1); + return ::dlclose (handle); #elif defined (ACE_WIN32) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::FreeLibrary (handle), ace_result_), int, -1); #elif defined (__hpux) @@ -55,7 +55,7 @@ ACE_OS::dlclose (ACE_SHLIB_HANDLE handle) return -1; if (desc.ref_count > 1) return 0; - ACE_OSCALL_RETURN (::shl_unload (handle), int, -1); + return ::shl_unload (handle); #else ACE_UNUSED_ARG (handle); ACE_NOTSUP_RETURN (-1); @@ -68,7 +68,7 @@ ACE_OS::dlerror () ACE_OS_TRACE ("ACE_OS::dlerror"); # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) const char *err = 0; - ACE_OSCALL (::dlerror (), const char *, 0, err); + ACE_OSCALL (::dlerror (), const char *, err); if (err == 0) return 0; # if defined (ACE_USES_WCHAR) @@ -81,7 +81,7 @@ ACE_OS::dlerror () # endif /* ACE_USES_WCHAR */ # elif defined (__hpux) || defined (ACE_VXWORKS) //FUZZ: disable check_for_lack_ACE_OS - ACE_OSCALL_RETURN (::strerror(errno), char *, 0); + return ::strerror(errno); //FUZZ: enable check_for_lack_ACE_OS # elif defined (ACE_WIN32) static ACE_TCHAR buf[128]; @@ -110,7 +110,7 @@ ACE_OS::dlopen (const ACE_TCHAR *fname, # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) void *handle; - ACE_OSCALL (::dlopen (ACE_TEXT_ALWAYS_CHAR (fname), mode), void *, 0, handle); + ACE_OSCALL (::dlopen (ACE_TEXT_ALWAYS_CHAR (fname), mode), void *, handle); # if !defined (ACE_HAS_AUTOMATIC_INIT_FINI) if (handle != 0) { @@ -118,7 +118,7 @@ ACE_OS::dlopen (const ACE_TCHAR *fname, // Some systems (e.g., SunOS4) do not automatically call _init(), so // we'll have to call it manually. - ACE_OSCALL (::dlsym (handle, ACE_TEXT ("_init")), void *, 0, ptr); + ACE_OSCALL (::dlsym (handle, ACE_TEXT ("_init")), void *, ptr); if (ptr != 0 && (*((int (*)(void)) ptr)) () == -1) // Call _init hook explicitly. { @@ -134,7 +134,7 @@ ACE_OS::dlopen (const ACE_TCHAR *fname, ACE_WIN32CALL_RETURN (ACE_TEXT_LoadLibrary (fname), ACE_SHLIB_HANDLE, 0); # elif defined (__hpux) - ACE_OSCALL_RETURN (::shl_load(fname, mode, 0L), ACE_SHLIB_HANDLE, 0); + return ::shl_load(fname, mode, 0L); # elif defined (ACE_VXWORKS) && !defined (__RTP__) ACE_UNUSED_ARG (mode); MODULE* handle = 0; @@ -146,7 +146,7 @@ ACE_OS::dlopen (const ACE_TCHAR *fname, if (filehandle != ACE_INVALID_HANDLE) { ACE_OS::last_error(0); - ACE_OSCALL ( ::loadModule (filehandle, LOAD_GLOBAL_SYMBOLS|LOAD_COMMON_MATCH_ALL ), MODULE *, 0, handle); + ACE_OSCALL ( ::loadModule (filehandle, LOAD_GLOBAL_SYMBOLS|LOAD_COMMON_MATCH_ALL ), MODULE *, handle); int loaderror = ACE_OS::last_error(); ACE_OS::close (filehandle); @@ -177,11 +177,9 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, { ACE_OS_TRACE ("ACE_OS::dlsym"); -#if defined (ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE) // Check if the handle is valid before making any calls using it. if (handle == ACE_SHLIB_INVALID_HANDLE) - return 0; -#endif /* ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE */ + return nullptr; // Get the correct OS type. #if defined (ACE_HAS_WINCE) @@ -207,17 +205,17 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) # if defined (ACE_USES_ASM_SYMBOL_IN_DLSYM) - int l = ACE_OS::strlen (symbolname) + 2; - char *asm_symbolname = 0; + int const l = ACE_OS::strlen (symbolname) + 2; + char *asm_symbolname {}; ACE_NEW_RETURN (asm_symbolname, char[l], 0); ACE_OS::strcpy (asm_symbolname, "_") ; ACE_OS::strcpy (asm_symbolname + 1, symbolname) ; void *ace_result; - ACE_OSCALL (::dlsym (handle, asm_symbolname), void *, 0, ace_result); + ACE_OSCALL (::dlsym (handle, asm_symbolname), void *, ace_result); delete [] asm_symbolname; return ace_result; # else - ACE_OSCALL_RETURN (::dlsym (handle, symbolname), void *, 0); + return ::dlsym (handle, symbolname); # endif /* ACE_USES_ASM_SYMBOL_IN_DLSYM */ # elif defined (ACE_WIN32) @@ -226,11 +224,11 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, # elif defined (__hpux) - void *value = 0; - int status; + void *value {}; + int status = 0; shl_t _handle = handle; - ACE_OSCALL (::shl_findsym(&_handle, symbolname, TYPE_UNDEFINED, &value), int, -1, status); - return status == 0 ? value : 0; + ACE_OSCALL (::shl_findsym(&_handle, symbolname, TYPE_UNDEFINED, &value), int, status); + return status == 0 ? value : nullptr; # elif defined (ACE_VXWORKS) && !defined (__RTP__) @@ -242,9 +240,9 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, SYM_TYPE symtype; char *value = 0; STATUS status; - ACE_OSCALL (::symFindByName(sysSymTbl, symbolname, &value, &symtype), int, -1, status); + ACE_OSCALL (::symFindByName(sysSymTbl, symbolname, &value, &symtype), int, status); - return status == OK ? reinterpret_cast <void*>(value) : 0; + return status == OK ? reinterpret_cast <void*>(value) : nullptr; #else STATUS status; @@ -253,17 +251,15 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, symbolDesc.mask = SYM_FIND_BY_NAME; symbolDesc.name = symbolname; - ACE_OSCALL (::symFind(sysSymTbl, &symbolDesc), int, -1, status); + ACE_OSCALL (::symFind(sysSymTbl, &symbolDesc), int, status); - return status == OK ? reinterpret_cast <void*>(symbolDesc.value) : 0; + return status == OK ? reinterpret_cast <void*>(symbolDesc.value) : nullptr; #endif /* (ACE_VXWORKS < 0x690) */ # else - ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (symbolname); - ACE_NOTSUP_RETURN (0); - + ACE_NOTSUP_RETURN (nullptr); # endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */ } diff --git a/ACE/ace/OS_NS_fcntl.cpp b/ACE/ace/OS_NS_fcntl.cpp index d530a27ecc8..f462b0d75dd 100644 --- a/ACE/ace/OS_NS_fcntl.cpp +++ b/ACE/ace/OS_NS_fcntl.cpp @@ -120,10 +120,10 @@ ACE_OS::open (const char *filename, #elif defined (INTEGRITY) ACE_UNUSED_ARG (sa); if(!strcmp(filename,ACE_DEV_NULL)) { - ACE_OSCALL_RETURN (::AllocateNullConsoleDescriptor(), ACE_HANDLE, -1); + return ::AllocateNullConsoleDescriptor(); } else { - ACE_OSCALL_RETURN (::open (filename, mode, perms), ACE_HANDLE, -1); + return ::open (filename, mode, perms); } #elif defined (ACE_MQX) ACE_UNUSED_ARG (perms); @@ -131,7 +131,7 @@ ACE_OS::open (const char *filename, return MQX_Filesystem::inst ().open (filename, mode); #else ACE_UNUSED_ARG (sa); - ACE_OSCALL_RETURN (::open (filename, mode, perms), ACE_HANDLE, ACE_INVALID_HANDLE); + return ::open (filename, mode, perms); #endif /* ACE_WIN32 */ } diff --git a/ACE/ace/OS_NS_fcntl.inl b/ACE/ace/OS_NS_fcntl.inl index afb95c68428..029892e382c 100644 --- a/ACE/ace/OS_NS_fcntl.inl +++ b/ACE/ace/OS_NS_fcntl.inl @@ -13,7 +13,7 @@ ACE_OS::fcntl (ACE_HANDLE handle, int cmd, long arg) ACE_UNUSED_ARG (arg); ACE_NOTSUP_RETURN (-1); # else - ACE_OSCALL_RETURN (::fcntl (handle, cmd, arg), int, -1); + return ::fcntl (handle, cmd, arg); # endif /* ACE_LACKS_FCNTL */ } diff --git a/ACE/ace/OS_NS_macros.h b/ACE/ace/OS_NS_macros.h index 0714f574f7c..e901019ddb0 100644 --- a/ACE/ace/OS_NS_macros.h +++ b/ACE/ace/OS_NS_macros.h @@ -31,8 +31,8 @@ if (RESULT == FAILVALUE) { int ___ = ::WSAGetLastError (); errno = ___; RESULT = FAILVALUE; } \ } while (0) #else -# define ACE_SOCKCALL_RETURN(OP,TYPE,FAILVALUE) ACE_OSCALL_RETURN(OP,TYPE,FAILVALUE) -# define ACE_SOCKCALL(OP,TYPE,FAILVALUE,RESULT) ACE_OSCALL(OP,TYPE,FAILVALUE,RESULT) +# define ACE_SOCKCALL_RETURN(OP,TYPE,FAILVALUE) ACE_OSCALL_RETURN(OP,TYPE) +# define ACE_SOCKCALL(OP,TYPE,FAILVALUE,RESULT) ACE_OSCALL(OP,TYPE,RESULT) #endif /* ACE_WIN32 */ #if !defined (ACE_WIN32) diff --git a/ACE/ace/OS_NS_netdb.inl b/ACE/ace/OS_NS_netdb.inl index 5f4e4c258e9..ad67751c875 100644 --- a/ACE/ace/OS_NS_netdb.inl +++ b/ACE/ace/OS_NS_netdb.inl @@ -13,7 +13,7 @@ else \ { \ TYPE ace_result_; \ - ACE_OSCALL (OP, TYPE, FAILVALUE, ace_result_); \ + ACE_OSCALL (OP, TYPE, ace_result_); \ if (ace_result_ != FAILVALUE) \ ACE_OS::memcpy (TARGET, \ ace_result_, \ @@ -27,7 +27,7 @@ do \ { \ TYPE ace_result_; \ - ACE_OSCALL(OP,TYPE,FAILVALUE,ace_result_); \ + ACE_OSCALL(OP,TYPE,ace_result_); \ if (ace_result_ != FAILVALUE) \ ACE_OS::memcpy (TARGET, \ ace_result_, \ diff --git a/ACE/ace/OS_NS_poll.inl b/ACE/ace/OS_NS_poll.inl index 511c71948c3..04c2f5521d9 100644 --- a/ACE/ace/OS_NS_poll.inl +++ b/ACE/ace/OS_NS_poll.inl @@ -12,7 +12,7 @@ ACE_OS::poll (struct pollfd *pollfds, ACE_OS_TRACE ("ACE_OS::poll"); #if defined (ACE_HAS_POLL) int to = timeout == 0 ? -1 : int (timeout->msec ()); - ACE_OSCALL_RETURN (::poll (pollfds, len, to), int, -1); + return ::poll (pollfds, len, to); #else ACE_UNUSED_ARG (timeout); ACE_UNUSED_ARG (len); @@ -29,7 +29,7 @@ ACE_OS::poll (struct pollfd *pollfds, { ACE_OS_TRACE ("ACE_OS::poll"); #if defined (ACE_HAS_POLL) - ACE_OSCALL_RETURN (::poll (pollfds, len, int (timeout.msec ())), int, -1); + return ::poll (pollfds, len, int (timeout.msec ())); #else ACE_UNUSED_ARG (timeout); ACE_UNUSED_ARG (len); diff --git a/ACE/ace/OS_NS_regex.inl b/ACE/ace/OS_NS_regex.inl index e135051c762..53f197f241f 100644 --- a/ACE/ace/OS_NS_regex.inl +++ b/ACE/ace/OS_NS_regex.inl @@ -9,7 +9,7 @@ ACE_OS::compile (const char *instring, char *expbuf, char *endbuf) { ACE_OS_TRACE ("ACE_OS::compile"); #if defined (ACE_HAS_REGEX) - ACE_OSCALL_RETURN (::compile (instring, expbuf, endbuf), char *, 0); + return ::compile (instring, expbuf, endbuf); #else ACE_UNUSED_ARG (instring); ACE_UNUSED_ARG (expbuf); @@ -24,7 +24,7 @@ ACE_OS::step (const char *str, char *expbuf) { ACE_OS_TRACE ("ACE_OS::step"); #if defined (ACE_HAS_REGEX) - ACE_OSCALL_RETURN (::step (str, expbuf), int, -1); + return ::step (str, expbuf); #else ACE_UNUSED_ARG (str); ACE_UNUSED_ARG (expbuf); diff --git a/ACE/ace/OS_NS_signal.h b/ACE/ace/OS_NS_signal.h index fc0b8101aee..c09ef5e94e1 100644 --- a/ACE/ace/OS_NS_signal.h +++ b/ACE/ace/OS_NS_signal.h @@ -139,22 +139,7 @@ extern "C" ACE_BEGIN_VERSIONED_NAMESPACE_DECL -// This hack is needed to get around an odd and hard-to-reproduce problem -// with HP aC++. If struct sigaction is defined extern "C" and the sigaction -// function in namespace ACE_OS, the compiler sometimes gets confused. -// If we help it with this typedef, it's fine. User code should not use -// the ACE typedef - it will be removed without warning as soon as we can -// either drop support for the broken compilers or figure out how to reproduce -// it so it can be reported to HP and fixed. -// There's a similar hack in OS_TLI.h for struct t_optmgmt. -// Also see ChangeLog entries: -// Mon Jan 23 16:35:40 UTC 2006 Steve Huston <shuston@riverace.com> -// Mon Jan 23 22:08:56 UTC 2006 Steve Huston <shuston@riverace.com> -#if defined (__HP_aCC) && (__HP_aCC <= 37300) -typedef extern "C" struct sigaction ACE_SIGACTION; -#else typedef struct sigaction ACE_SIGACTION; -#endif namespace ACE_OS { diff --git a/ACE/ace/OS_NS_signal.inl b/ACE/ace/OS_NS_signal.inl index 1f74021742d..8317bf3b6b8 100644 --- a/ACE/ace/OS_NS_signal.inl +++ b/ACE/ace/OS_NS_signal.inl @@ -23,9 +23,9 @@ kill (pid_t pid, int signum) * This only becomes an issue when using the 64bit compiler * as the TASK_ID is no longer defined as an int. */ - ACE_OSCALL_RETURN (::kill ((ACE_VX_TASK_ID)pid, signum), int, -1); + return ::kill ((ACE_VX_TASK_ID)pid, signum); #else - ACE_OSCALL_RETURN (::kill (pid, signum), int, -1); + return ::kill (pid, signum); #endif /* ACE_LACKS_KILL */ } @@ -35,19 +35,12 @@ pthread_sigmask (int how, const sigset_t *nsp, sigset_t *osp) #if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_SIGMASK) int result; # ifdef ACE_PTHREAD_SIGMASK_MACRO - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (ACE_PTHREAD_SIGMASK_MACRO (how, nsp, osp) - , result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (ACE_PTHREAD_SIGMASK_MACRO (how, nsp, osp), result), int); # elif defined (ACE_HAS_NONCONST_PTHREAD_SIGMASK) sigset_t *ncnsp = const_cast<sigset_t *>(nsp); - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, ncnsp, osp), - result), - int, - -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, ncnsp, osp), result), int); # else - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, nsp, osp), - result), - int, - -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, nsp, osp), result), int); # endif /* ACE_HAS_NONCONST__PTHREAD_SIGMASK */ #else /* !ACE_HAS_PTHREADS && !ACE_LACKS_PTHREAD_SIGMASK */ ACE_UNUSED_ARG (how); @@ -82,12 +75,9 @@ sigaction (int signum, const ACE_SIGACTION *nsa, ACE_SIGACTION *osa) ACE_UNUSED_ARG (osa); ACE_NOTSUP_RETURN (-1); #elif !defined (ACE_HAS_SIGACTION_CONSTP2) - ACE_OSCALL_RETURN (::sigaction (signum, - const_cast<ACE_SIGACTION*> (nsa), - osa), - int, -1); + return ::sigaction (signum, const_cast<ACE_SIGACTION*> (nsa), osa); #else - ACE_OSCALL_RETURN (::sigaction (signum, nsa, osa), int, -1); + return ::sigaction (signum, nsa, osa); #endif /* ACE_WIN32 !ACE_HAS_WINCE */ } @@ -219,7 +209,7 @@ sigprocmask (int how, const sigset_t *nsp, sigset_t *osp) ACE_UNUSED_ARG (osp); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::sigprocmask (how, nsp, osp), int, -1); + return ::sigprocmask (how, nsp, osp); #endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS || ACE_LACKS_SIGPROCMASK */ } @@ -248,7 +238,7 @@ raise (const int signum) ACE_UNUSED_ARG (signum); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::raise (signum), int, -1); + return ::raise (signum); #endif /* ACE_LACKS_RAISE */ } diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp index 8579fc7f4b1..0eba78f34c6 100644 --- a/ACE/ace/OS_NS_stdio.cpp +++ b/ACE/ace/OS_NS_stdio.cpp @@ -863,12 +863,8 @@ namespace { // helpers for vsnprintf_emulation const long double log = val > 0 ? std::log10 (val) : 0; int dig_left = static_cast<int> (1 + ((val >= 1) ? log : 0)); - -#if defined __HP_aCC && __HP_aCC < 40000 - int exp = static_cast<int> (log); -#else int exp = static_cast<int> (std::floor (log)); -#endif + if (flags.has (SNPRINTF_FLEXPONENT)) { const int p = precision > 0 ? precision : (precision < 0 ? 6 : 1); diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl index f17002c630e..9c448db1562 100644 --- a/ACE/ace/OS_NS_stdio.inl +++ b/ACE/ace/OS_NS_stdio.inl @@ -110,10 +110,7 @@ ACE_OS::flock_init (ACE_OS::ace_flock_t *lock, if (name != 0) { - ACE_OSCALL (ACE_OS::open (name, flags, perms), - ACE_HANDLE, - ACE_INVALID_HANDLE, - lock->handle_); + ACE_OSCALL (ACE_OS::open (name, flags, perms), ACE_HANDLE, lock->handle_); if (lock->handle_ != ACE_INVALID_HANDLE) lock->lockname_ = ACE_OS::strdup (name); return lock->handle_ == ACE_INVALID_HANDLE ? -1 : 0; @@ -153,9 +150,7 @@ ACE_OS::flock_unlock (ACE_OS::ace_flock_t *lock, lock->lock_.l_type = F_UNLCK; // Unlock file. // release lock - ACE_OSCALL_RETURN (ACE_OS::fcntl (lock->handle_, F_SETLK, - reinterpret_cast<long> (&lock->lock_)), - int, -1); + return ACE_OS::fcntl (lock->handle_, F_SETLK, reinterpret_cast<long> (&lock->lock_)); #endif /* ACE_WIN32 */ } @@ -217,9 +212,7 @@ ACE_OS::flock_rdlock (ACE_OS::ace_flock_t *lock, lock->lock_.l_len = len; lock->lock_.l_type = F_RDLCK; // set read lock // block, if no access - ACE_OSCALL_RETURN (ACE_OS::fcntl (lock->handle_, F_SETLKW, - reinterpret_cast<long> (&lock->lock_)), - int, -1); + return ACE_OS::fcntl (lock->handle_, F_SETLKW, reinterpret_cast<long> (&lock->lock_)); #endif /* ACE_WIN32 */ } @@ -258,7 +251,7 @@ ACE_OS::flock_tryrdlock (ACE_OS::ace_flock_t *lock, // Does not block, if no access, returns -1 and set errno = EBUSY; ACE_OSCALL (ACE_OS::fcntl (lock->handle_, F_SETLK, reinterpret_cast<long> (&lock->lock_)), - int, -1, result); + int, result); if (result == -1 && (errno == EACCES || errno == EAGAIN)) errno = EBUSY; @@ -303,7 +296,7 @@ ACE_OS::flock_trywrlock (ACE_OS::ace_flock_t *lock, ACE_OSCALL (ACE_OS::fcntl (lock->handle_, F_SETLK, reinterpret_cast<long> (&lock->lock_)), - int, -1, result); + int, result); if (result == -1 && (errno == EACCES || errno == EAGAIN)) errno = EBUSY; @@ -343,9 +336,7 @@ ACE_OS::flock_wrlock (ACE_OS::ace_flock_t *lock, lock->lock_.l_len = len; lock->lock_.l_type = F_WRLCK; // set write lock // block, if no access - ACE_OSCALL_RETURN (ACE_OS::fcntl (lock->handle_, F_SETLKW, - reinterpret_cast<long> (&lock->lock_)), - int, -1); + return ACE_OS::fcntl (lock->handle_, F_SETLKW, reinterpret_cast<long> (&lock->lock_)); #endif /* ACE_WIN32 */ } @@ -459,7 +450,7 @@ ACE_OS::cuserid (char *user, size_t maxlen) #else // Hackish because of missing buffer size! ACE_UNUSED_ARG (maxlen); - ACE_OSCALL_RETURN (::ace_cuserid(user), char*, 0); + return ::ace_cuserid(user); #endif /* ACE_VXWORKS */ } @@ -501,7 +492,7 @@ ACE_INLINE int ACE_OS::fclose (FILE *fp) { ACE_OS_TRACE ("ACE_OS::fclose"); - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fclose (fp), int, -1); + return ACE_STD_NAMESPACE::fclose (fp); } ACE_INLINE FILE * @@ -510,13 +501,9 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode) ACE_OS_TRACE ("ACE_OS::fdopen"); #if defined (ACE_HAS_WINCE) # if defined (ACE_HAS_NONCONST_WFDOPEN) - ACE_OSCALL_RETURN (::_wfdopen ((int)handle, const_cast <ACE_TCHAR*> (ACE_TEXT_ALWAYS_WCHAR (mode))), - FILE*, - 0); + return ::_wfdopen ((int)handle, const_cast <ACE_TCHAR*> (ACE_TEXT_ALWAYS_WCHAR (mode))); # else - ACE_OSCALL_RETURN (::_wfdopen (handle, ACE_TEXT_ALWAYS_WCHAR (mode)), - FILE*, - 0); + return ::_wfdopen (handle, ACE_TEXT_ALWAYS_WCHAR (mode)); # endif #elif defined (ACE_WIN32) // kernel file handle -> FILE* conversion... @@ -546,8 +533,7 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode) ACE_UNUSED_ARG (mode); ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN - (::fdopen (handle, ACE_TEXT_ALWAYS_CHAR (mode)), FILE *, 0); + return ::fdopen (handle, ACE_TEXT_ALWAYS_CHAR (mode)); #endif /* ACE_HAS_WINCE */ } @@ -555,7 +541,7 @@ ACE_INLINE int ACE_OS::fflush (FILE *fp) { ACE_OS_TRACE ("ACE_OS::fflush"); - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fflush (fp), int, -1); + return ACE_STD_NAMESPACE::fflush (fp); } ACE_INLINE int @@ -583,7 +569,7 @@ ACE_OS::fgetpos (FILE *fp, fpos_t *pos) ACE_UNUSED_ARG (pos); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgetpos (fp, pos), int, -1); + return ACE_STD_NAMESPACE::fgetpos (fp, pos); #endif } @@ -603,7 +589,7 @@ ACE_OS::fgets (char *buf, int size, FILE *fp) *iter = '\0'; return c == EOF ? 0 : buf; #else - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgets (buf, size, fp), char *, 0); + return ACE_STD_NAMESPACE::fgets (buf, size, fp); #endif /* ACE_LACKS_FGETS */ } @@ -612,7 +598,7 @@ ACE_INLINE wchar_t * ACE_OS::fgets (wchar_t *buf, int size, FILE *fp) { ACE_OS_TRACE ("ACE_OS::fgets"); - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgetws (buf, size, fp), wchar_t *, 0); + return ACE_STD_NAMESPACE::fgetws (buf, size, fp); } #endif /* ACE_HAS_WCHAR && !ACE_LACKS_FGETWS */ @@ -632,7 +618,7 @@ ACE_INLINE FILE * ACE_OS::fopen (const char *filename, const char *mode) { ACE_OS_TRACE ("ACE_OS::fopen"); - ACE_OSCALL_RETURN (::fopen (filename, mode), FILE *, 0); + return ::fopen (filename, mode); } #if defined (ACE_HAS_WCHAR) @@ -642,7 +628,7 @@ ACE_OS::fopen (const char *filename, const wchar_t *mode) { ACE_OS_TRACE ("ACE_OS::fopen"); ACE_Wide_To_Ascii n_mode (mode); - ACE_OSCALL_RETURN (::fopen (filename, n_mode.char_rep ()), FILE *, 0); + return ::fopen (filename, n_mode.char_rep ()); } // Win32 PC implementation of fopen () is in OS_NS_stdio.cpp. @@ -651,13 +637,12 @@ ACE_OS::fopen (const wchar_t *filename, const wchar_t *mode) { ACE_OS_TRACE ("ACE_OS::fopen"); #if defined (ACE_HAS_WINCE) - ACE_OSCALL_RETURN (::_wfopen (filename, mode), FILE *, 0); + return ::_wfopen (filename, mode); #else // Non-Windows doesn't use wchar_t file systems. ACE_Wide_To_Ascii n_filename (filename); ACE_Wide_To_Ascii n_mode (mode); - ACE_OSCALL_RETURN - (::fopen (n_filename.char_rep (), n_mode.char_rep ()), FILE*, 0); + return ::fopen (n_filename.char_rep (), n_mode.char_rep ()); #endif /* ACE_HAS_WINCE */ } // Win32 PC implementation of fopen () is in OS_NS_stdio.cpp. @@ -667,13 +652,11 @@ ACE_OS::fopen (const wchar_t *filename, const char *mode) ACE_OS_TRACE ("ACE_OS::fopen"); #if defined (ACE_HAS_WINCE) ACE_Ascii_To_Wide n_mode (mode); - ACE_OSCALL_RETURN - (::_wfopen (filename, n_mode.wchar_rep ()), FILE *, 0); + return ::_wfopen (filename, n_mode.wchar_rep ()); #else // Non-Windows doesn't use wchar_t file systems. ACE_Wide_To_Ascii n_filename (filename); - ACE_OSCALL_RETURN - (::fopen (n_filename.char_rep (), mode), FILE*, 0); + return ::fopen (n_filename.char_rep (), mode); #endif /* ACE_HAS_WINCE */ } #endif /* ACE_HAS_WCHAR */ @@ -725,7 +708,7 @@ ACE_OS::fputs (const char *s, FILE *stream) ACE_UNUSED_ARG (stream); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fputs (s, stream), int, -1); + return ACE_STD_NAMESPACE::fputs (s, stream); #endif } @@ -734,7 +717,7 @@ ACE_INLINE int ACE_OS::fputs (const wchar_t *s, FILE *stream) { ACE_OS_TRACE ("ACE_OS::fputs"); - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fputws (s, stream), int, -1); + return ACE_STD_NAMESPACE::fputws (s, stream); } #endif /* ACE_HAS_WCHAR && !ACE_LACKS_FPUTWS */ @@ -742,9 +725,7 @@ ACE_INLINE size_t ACE_OS::fread (void *ptr, size_t size, size_t nelems, FILE *fp) { ACE_OS_TRACE ("ACE_OS::fread"); - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fread (ptr, size, nelems, fp), - size_t, - 0); + return ACE_STD_NAMESPACE::fread (ptr, size, nelems, fp); } ACE_INLINE FILE * @@ -752,21 +733,14 @@ ACE_OS::freopen (const ACE_TCHAR *filename, const ACE_TCHAR *mode, FILE* stream) { ACE_OS_TRACE ("ACE_OS::freopen"); #if defined (ACE_WIN32) && defined(ACE_USES_WCHAR) - ACE_OSCALL_RETURN (::_wfreopen (ACE_TEXT_ALWAYS_WCHAR (filename), - ACE_TEXT_ALWAYS_WCHAR (mode), - stream), - FILE *, 0); + return ::_wfreopen (ACE_TEXT_ALWAYS_WCHAR (filename), ACE_TEXT_ALWAYS_WCHAR (mode), stream); #elif defined (ACE_LACKS_FREOPEN) ACE_UNUSED_ARG (filename); ACE_UNUSED_ARG (mode); ACE_UNUSED_ARG (stream); ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN - (ACE_STD_NAMESPACE::freopen (ACE_TEXT_ALWAYS_CHAR (filename), - ACE_TEXT_ALWAYS_CHAR (mode), - stream), - FILE *, 0); + return ACE_STD_NAMESPACE::freopen (ACE_TEXT_ALWAYS_CHAR (filename), ACE_TEXT_ALWAYS_CHAR (mode), stream); #endif /* ACE_WIN32 && ACE_USES_WCHAR */ } @@ -793,7 +767,7 @@ ACE_OS::fseek (FILE *fp, long offset, int whence) } # endif /* SEEK_SET != FILE_BEGIN || SEEK_CUR != FILE_CURRENT || SEEK_END != FILE_END */ #endif /* ACE_WIN32 */ - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fseek (fp, offset, whence), int, -1); + return ACE_STD_NAMESPACE::fseek (fp, offset, whence); } ACE_INLINE int @@ -804,23 +778,21 @@ ACE_OS::fsetpos (FILE* fp, fpos_t* pos) ACE_UNUSED_ARG (pos); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::fsetpos (fp, pos), int, -1); + return ::fsetpos (fp, pos); #endif /* ACE_LACKS_FSETPOS */ } ACE_INLINE long ACE_OS::ftell (FILE* fp) { - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::ftell (fp), long, -1); + return ACE_STD_NAMESPACE::ftell (fp); } ACE_INLINE size_t ACE_OS::fwrite (const void *ptr, size_t size, size_t nitems, FILE *fp) { ACE_OS_TRACE ("ACE_OS::fwrite"); - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fwrite (ptr, size, nitems, fp), - size_t, - 0); + return ACE_STD_NAMESPACE::fwrite (ptr, size, nitems, fp); } ACE_INLINE void @@ -858,7 +830,7 @@ ACE_OS::puts (const char *s) ACE_UNUSED_ARG (s); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::puts (s), int, -1); + return ::puts (s); #endif /* ACE_LACKS_PUTS */ } @@ -868,11 +840,11 @@ ACE_OS::puts (const wchar_t *s) { ACE_OS_TRACE ("ACE_OS::puts"); #if defined (ACE_WIN32) - ACE_OSCALL_RETURN (::_putws (s), int, -1); + return ::_putws (s); #else /* ACE_WIN32 */ // There's no putws()... ACE_Wide_To_Ascii n_s (s); - ACE_OSCALL_RETURN (::puts (n_s.char_rep ()), int, -1); + return ::puts (n_s.char_rep ()); #endif /* ACE_WIN32 */ } #endif /* ACE_HAS_WCHAR */ @@ -905,10 +877,10 @@ ACE_OS::rename (const char *old_name, ACE_FAIL_RETURN (-1); return 0; #elif defined (ACE_RENAME_EQUIVALENT) - ACE_OSCALL_RETURN (ACE_RENAME_EQUIVALENT (old_name, new_name), int, -1); + return ACE_RENAME_EQUIVALENT (old_name, new_name); # else ACE_UNUSED_ARG (flags); - ACE_OSCALL_RETURN (::rename (old_name, new_name), int, -1); + return ::rename (old_name, new_name); # endif /* ACE_HAS_WINCE */ } @@ -940,7 +912,7 @@ ACE_OS::rename (const wchar_t *old_name, return 0; # elif defined (ACE_WIN32) ACE_UNUSED_ARG (flags); - ACE_OSCALL_RETURN (::_wrename (old_name, new_name), int, -1); + return ::_wrename (old_name, new_name); # else ACE_Wide_To_Ascii nold_name (old_name); ACE_Wide_To_Ascii nnew_name (new_name); @@ -976,11 +948,11 @@ ACE_OS::tempnam (const char *dir, const char *pfx) ACE_UNUSED_ARG (pfx); ACE_NOTSUP_RETURN (0); #elif defined (ACE_HAS_NONCONST_TEMPNAM) - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::tempnam (const_cast <char *> (dir), const_cast<char *> (pfx)), char *, 0); + return ACE_STD_NAMESPACE::tempnam (const_cast <char *> (dir), const_cast<char *> (pfx)); #elif defined (ACE_TEMPNAM_EQUIVALENT) - ACE_OSCALL_RETURN (ACE_TEMPNAM_EQUIVALENT (dir, pfx), char *, 0); + return ACE_TEMPNAM_EQUIVALENT (dir, pfx); #else /* ACE_LACKS_TEMPNAM */ - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::tempnam (dir, pfx), char *, 0); + return ACE_STD_NAMESPACE::tempnam (dir, pfx); #endif /* ACE_LACKS_TEMPNAM */ } @@ -995,9 +967,9 @@ ACE_OS::tempnam (const wchar_t *dir, const wchar_t *pfx) ACE_NOTSUP_RETURN (0); #elif defined(ACE_WIN32) # if defined (ACE_HAS_NONCONST_TEMPNAM) - ACE_OSCALL_RETURN (::_wtempnam (const_cast <wchar_t*> (dir), const_cast <wchar_t*> (pfx)), wchar_t *, 0); + return ::_wtempnam (const_cast <wchar_t*> (dir), const_cast <wchar_t*> (pfx)); # else - ACE_OSCALL_RETURN (::_wtempnam (dir, pfx), wchar_t *, 0); + return ::_wtempnam (dir, pfx); # endif /* ACE_HAS_NONCONST_TEMPNAM */ #else /* ACE_LACKS_TEMPNAM */ // No native wide-char support; convert to narrow and call the char* variant. diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl index 356b258ae69..61c90985c83 100644 --- a/ACE/ace/OS_NS_stdlib.inl +++ b/ACE/ace/OS_NS_stdlib.inl @@ -57,7 +57,7 @@ ACE_OS::atexit (ACE_EXIT_HOOK func, const char* name) ACE_INLINE int ACE_OS::atoi (const char *s) { - ACE_OSCALL_RETURN (::atoi (s), int, -1); + return ::atoi (s); } #if defined (ACE_HAS_WCHAR) @@ -65,7 +65,7 @@ ACE_INLINE int ACE_OS::atoi (const wchar_t *s) { #if defined (ACE_WIN32) && defined (ACE_HAS_WTOI) - ACE_OSCALL_RETURN (::_wtoi (s), int, -1); + return ::_wtoi (s); #else /* ACE_WIN32 */ return ACE_OS::atoi (ACE_Wide_To_Ascii (s).char_rep ()); #endif /* ACE_WIN32 */ @@ -75,7 +75,7 @@ ACE_OS::atoi (const wchar_t *s) ACE_INLINE long ACE_OS::atol (const char *s) { - ACE_OSCALL_RETURN (::atol (s), long, -1); + return ::atol (s); } #if defined (ACE_HAS_WCHAR) @@ -83,7 +83,7 @@ ACE_INLINE long ACE_OS::atol (const wchar_t *s) { #if defined (ACE_WIN32) && defined (ACE_HAS_WTOL) - ACE_OSCALL_RETURN (::_wtol (s), long, -1); + return ::_wtol (s); #else /* ACE_WIN32 */ return ACE_OS::atol (ACE_Wide_To_Ascii (s).char_rep ()); #endif /* ACE_WIN32 */ @@ -93,7 +93,7 @@ ACE_OS::atol (const wchar_t *s) ACE_INLINE double ACE_OS::atof (const char *s) { - ACE_OSCALL_RETURN (::atof (s), double, -1); + return ::atof (s); } #if defined (ACE_HAS_WCHAR) @@ -103,9 +103,9 @@ ACE_OS::atof (const wchar_t *s) #if !defined (ACE_HAS_WTOF) return ACE_OS::atof (ACE_Wide_To_Ascii (s).char_rep ()); #elif defined (ACE_WTOF_EQUIVALENT) - ACE_OSCALL_RETURN (ACE_WTOF_EQUIVALENT (s), double, -1); + return ACE_WTOF_EQUIVALENT (s); #else /* ACE_HAS__WTOF */ - ACE_OSCALL_RETURN (::wtof (s), double, -1); + return ::wtof (s); #endif /* ACE_HAS_WTOF */ } #endif /* ACE_HAS_WCHAR */ @@ -176,7 +176,7 @@ ACE_OS::getenv (const char *symbol) ACE_UNUSED_ARG (symbol); ACE_NOTSUP_RETURN (0); #else /* ACE_LACKS_GETENV */ - ACE_OSCALL_RETURN (::getenv (symbol), char *, 0); + return ::getenv (symbol); #endif /* ACE_LACKS_GETENV */ } @@ -188,7 +188,7 @@ ACE_OS::getenv (const wchar_t *symbol) ACE_UNUSED_ARG (symbol); ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (::_wgetenv (symbol), wchar_t *, 0); + return ::_wgetenv (symbol); #endif /* ACE_LACKS_GETENV */ } #endif /* ACE_HAS_WCHAR && ACE_WIN32 */ @@ -341,9 +341,9 @@ ACE_OS::putenv (const char *string) ACE_UNUSED_ARG (string); ACE_NOTSUP_RETURN (0); #elif defined (ACE_PUTENV_EQUIVALENT) - ACE_OSCALL_RETURN (ACE_PUTENV_EQUIVALENT (const_cast <char *> (string)), int, -1); + return ACE_PUTENV_EQUIVALENT (const_cast <char *> (string)); #else /* ! ACE_HAS_WINCE */ - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::putenv (const_cast <char *> (string)), int, -1); + return ACE_STD_NAMESPACE::putenv (const_cast <char *> (string)); #endif /* ACE_LACKS_PUTENV && ACE_HAS_SETENV */ } @@ -356,7 +356,7 @@ ACE_OS::setenv(const char *envname, const char *envval, int overwrite) ACE_UNUSED_ARG (overwrite); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::setenv (envname, envval, overwrite), int, -1); + return ACE_STD_NAMESPACE::setenv (envname, envval, overwrite); #endif } @@ -371,7 +371,7 @@ ACE_OS::unsetenv(const char *name) ::unsetenv (name); return 0; #else - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::unsetenv (name), int, -1); + return ACE_STD_NAMESPACE::unsetenv (name); # endif /* ACE_HAS_VOID_UNSETENV */ #endif /* ACE_LACKS_UNSETENV */ } @@ -385,7 +385,7 @@ ACE_OS::putenv (const wchar_t *string) ACE_UNUSED_ARG (string); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::_wputenv (string), int, -1); + return ::_wputenv (string); #endif /* ACE_LACKS_PUTENV */ } #endif /* ACE_HAS_WCHAR && ACE_WIN32 */ @@ -411,7 +411,7 @@ ACE_OS::rand () { ACE_OS_TRACE ("ACE_OS::rand"); #if !defined (ACE_LACKS_RAND) - ACE_OSCALL_RETURN (::rand (), int, -1); + return ::rand (); #else ACE_NOTSUP_RETURN (-1); #endif /* ACE_LACKS_RAND */ @@ -609,9 +609,9 @@ ACE_OS::system (const ACE_TCHAR *s) ACE_UNUSED_ARG (s); ACE_NOTSUP_RETURN (-1); #elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OSCALL_RETURN (::_wsystem (s), int, -1); + return ::_wsystem (s); #else - ACE_OSCALL_RETURN (::system (ACE_TEXT_ALWAYS_CHAR (s)), int, -1); + return ::system (ACE_TEXT_ALWAYS_CHAR (s)); #endif /* ACE_LACKS_SYSTEM */ } diff --git a/ACE/ace/OS_NS_stropts.inl b/ACE/ace/OS_NS_stropts.inl index 6f433a441ce..547a80cb3d5 100644 --- a/ACE/ace/OS_NS_stropts.inl +++ b/ACE/ace/OS_NS_stropts.inl @@ -45,7 +45,7 @@ ACE_OS::getmsg (ACE_HANDLE handle, { ACE_OS_TRACE ("ACE_OS::getmsg"); #if defined (ACE_HAS_STREAM_PIPES) - ACE_OSCALL_RETURN (::getmsg (handle, ctl, data, flags), int, -1); + return ::getmsg (handle, ctl, data, flags); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (ctl); @@ -66,7 +66,7 @@ ACE_OS::getpmsg (ACE_HANDLE handle, { ACE_OS_TRACE ("ACE_OS::getpmsg"); #if defined (ACE_HAS_STREAM_PIPES) - ACE_OSCALL_RETURN (::getpmsg (handle, ctl, data, band, flags), int, -1); + return ::getpmsg (handle, ctl, data, band, flags); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (ctl); @@ -84,7 +84,7 @@ ACE_OS::fattach (int handle, const char *path) { ACE_OS_TRACE ("ACE_OS::fattach"); #if defined (ACE_HAS_STREAM_PIPES) - ACE_OSCALL_RETURN (::fattach (handle, path), int, -1); + return ::fattach (handle, path); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (path); @@ -98,7 +98,7 @@ ACE_OS::fdetach (const char *file) { ACE_OS_TRACE ("ACE_OS::fdetach"); #if defined (ACE_HAS_STREAM_PIPES) - ACE_OSCALL_RETURN (::fdetach (file), int, -1); + return ::fdetach (file); #else ACE_UNUSED_ARG (file); @@ -121,13 +121,12 @@ ACE_OS::ioctl (ACE_HANDLE handle, ACE_SOCKET sock = (ACE_SOCKET) handle; ACE_SOCKCALL_RETURN (::ioctlsocket (sock, cmd, reinterpret_cast<unsigned long *> (val)), int, -1); #elif defined (ACE_HAS_IOCTL_INT_3_PARAM) - ACE_OSCALL_RETURN (::ioctl (handle, cmd, reinterpret_cast<int> (val)), - int, -1); + return ::ioctl (handle, cmd, reinterpret_cast<int> (val)); #elif defined (ACE_MQX) // TBD: See if there is a way to provide this functionality ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (::ioctl (handle, cmd, val), int, -1); + return ::ioctl (handle, cmd, val); #endif /* ACE_WIN32 */ } @@ -136,7 +135,7 @@ ACE_OS::isastream (ACE_HANDLE handle) { ACE_OS_TRACE ("ACE_OS::isastream"); #if defined (ACE_HAS_STREAM_PIPES) - ACE_OSCALL_RETURN (::isastream (handle), int, -1); + return ::isastream (handle); #else ACE_UNUSED_ARG (handle); @@ -150,10 +149,7 @@ ACE_OS::putmsg (ACE_HANDLE handle, const struct strbuf *ctl, { ACE_OS_TRACE ("ACE_OS::putmsg"); #if defined (ACE_HAS_STREAM_PIPES) - ACE_OSCALL_RETURN (::putmsg (handle, - (ACE_STRBUF_TYPE) ctl, - (ACE_STRBUF_TYPE) data, - flags), int, -1); + return ::putmsg (handle, (ACE_STRBUF_TYPE) ctl, (ACE_STRBUF_TYPE) data, flags); #else ACE_UNUSED_ARG (flags); ssize_t result; @@ -205,10 +201,7 @@ ACE_OS::putpmsg (ACE_HANDLE handle, { ACE_OS_TRACE ("ACE_OS::putpmsg"); #if defined (ACE_HAS_STREAM_PIPES) - ACE_OSCALL_RETURN (::putpmsg (handle, - (ACE_STRBUF_TYPE) ctl, - (ACE_STRBUF_TYPE) data, - band, flags), int, -1); + return ::putpmsg (handle, (ACE_STRBUF_TYPE) ctl, (ACE_STRBUF_TYPE) data, band, flags); #else ACE_UNUSED_ARG (flags); ACE_UNUSED_ARG (band); diff --git a/ACE/ace/OS_NS_sys_mman.inl b/ACE/ace/OS_NS_sys_mman.inl index cd2931a8e1c..905b0b5e08a 100644 --- a/ACE/ace/OS_NS_sys_mman.inl +++ b/ACE/ace/OS_NS_sys_mman.inl @@ -19,7 +19,7 @@ ACE_OS::madvise (caddr_t addr, size_t len, int map_advice) { ACE_OS_TRACE ("ACE_OS::madvise"); #if !defined (ACE_LACKS_MADVISE) - ACE_OSCALL_RETURN (::madvise (addr, len, map_advice), int, -1); + return ::madvise (addr, len, map_advice); #else ACE_UNUSED_ARG (addr); ACE_UNUSED_ARG (len); @@ -166,7 +166,7 @@ ACE_OS::mmap (void *addr, flags, file_handle, off), - void *, MAP_FAILED); + void *); //FUZZ: enable check_for_lack_ACE_OS #else ACE_UNUSED_ARG (addr); @@ -194,7 +194,7 @@ ACE_OS::mprotect (void *addr, size_t len, int prot) DWORD dummy; // Sigh! return ::VirtualProtect(addr, len, prot, &dummy) ? 0 : -1; #elif !defined (ACE_LACKS_MPROTECT) - ACE_OSCALL_RETURN (::mprotect ((ACE_MMAP_TYPE) addr, len, prot), int, -1); + return ::mprotect ((ACE_MMAP_TYPE) addr, len, prot); #else ACE_UNUSED_ARG (addr); ACE_UNUSED_ARG (len); @@ -212,7 +212,7 @@ ACE_OS::msync (void *addr, size_t len, int sync) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::FlushViewOfFile (addr, len), ace_result_), int, -1); #elif !defined (ACE_LACKS_MSYNC) - ACE_OSCALL_RETURN (::msync ((ACE_MMAP_TYPE) addr, len, sync), int, -1); + return ::msync ((ACE_MMAP_TYPE) addr, len, sync); #else ACE_UNUSED_ARG (addr); ACE_UNUSED_ARG (len); @@ -230,7 +230,7 @@ ACE_OS::munmap (void *addr, size_t len) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::UnmapViewOfFile (addr), ace_result_), int, -1); #elif !defined (ACE_LACKS_MMAP) && !defined (ACE_LACKS_MUNMAP) - ACE_OSCALL_RETURN (::munmap ((ACE_MMAP_TYPE) addr, len), int, -1); + return ::munmap ((ACE_MMAP_TYPE) addr, len); #else ACE_UNUSED_ARG (addr); ACE_UNUSED_ARG (len); @@ -263,10 +263,10 @@ ACE_OS::shm_open (const ACE_TCHAR *filename, } filename = buf; #endif - ACE_OSCALL_RETURN (::shm_open (ACE_TEXT_ALWAYS_CHAR(filename), mode, perms), ACE_HANDLE, ACE_INVALID_HANDLE); + return ::shm_open (ACE_TEXT_ALWAYS_CHAR(filename), mode, perms); #elif defined (ACE_OPENVMS) //FUZZ: disable check_for_lack_ACE_OS - ACE_OSCALL_RETURN (::open (filename, mode, perms, ACE_TEXT("shr=get,put,upd")), ACE_HANDLE, ACE_INVALID_HANDLE); + return ::open (filename, mode, perms, ACE_TEXT("shr=get,put,upd")); //FUZZ: enable check_for_lack_ACE_OS #else /* ! ACE_HAS_SHM_OPEN */ // Just use ::open. @@ -299,7 +299,7 @@ ACE_OS::shm_unlink (const ACE_TCHAR *path) ACE_UNUSED_ARG (path); ACE_NOTSUP_RETURN (-1); # else - ACE_OSCALL_RETURN (::shm_unlink (ACE_TEXT_ALWAYS_CHAR(path)), int, -1); + return ::shm_unlink (ACE_TEXT_ALWAYS_CHAR(path)); # endif /* ACE_LACKS_SHM_UNLINK */ #else /* ! ACE_HAS_SHM_OPEN */ // Just use ::unlink. diff --git a/ACE/ace/OS_NS_sys_msg.inl b/ACE/ace/OS_NS_sys_msg.inl index 92b7a646e19..7a5ebe9f411 100644 --- a/ACE/ace/OS_NS_sys_msg.inl +++ b/ACE/ace/OS_NS_sys_msg.inl @@ -8,7 +8,7 @@ ACE_OS::msgctl (int msqid, int cmd, struct msqid_ds *val) { ACE_OS_TRACE ("ACE_OS::msgctl"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::msgctl (msqid, cmd, val), int, -1); + return ::msgctl (msqid, cmd, val); #else ACE_UNUSED_ARG (msqid); ACE_UNUSED_ARG (cmd); @@ -23,7 +23,7 @@ ACE_OS::msgget (key_t key, int msgflg) { ACE_OS_TRACE ("ACE_OS::msgget"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::msgget (key, msgflg), int, -1); + return ::msgget (key, msgflg); #else ACE_UNUSED_ARG (key); ACE_UNUSED_ARG (msgflg); @@ -38,8 +38,7 @@ ACE_OS::msgrcv (int int_id, void *buf, size_t len, { ACE_OS_TRACE ("ACE_OS::msgrcv"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::msgrcv (int_id, buf, len, type, flags), - int, -1); + return ::msgrcv (int_id, buf, len, type, flags); #else ACE_UNUSED_ARG (int_id); ACE_UNUSED_ARG (buf); @@ -57,10 +56,9 @@ ACE_OS::msgsnd (int int_id, const void *buf, size_t len, int flags) ACE_OS_TRACE ("ACE_OS::msgsnd"); #if defined (ACE_HAS_SYSV_IPC) # if defined (ACE_HAS_NONCONST_MSGSND) - ACE_OSCALL_RETURN (::msgsnd (int_id, - const_cast<void *> (buf), len, flags), int, -1); + return ::msgsnd (int_id, const_cast<void *> (buf), len, flags); # else - ACE_OSCALL_RETURN (::msgsnd (int_id, buf, len, flags), int, -1); + return ::msgsnd (int_id, buf, len, flags); # endif /* ACE_HAS_NONCONST_MSGSND */ #else ACE_UNUSED_ARG (int_id); diff --git a/ACE/ace/OS_NS_sys_resource.inl b/ACE/ace/OS_NS_sys_resource.inl index e49119d3e32..dad59017602 100644 --- a/ACE/ace/OS_NS_sys_resource.inl +++ b/ACE/ace/OS_NS_sys_resource.inl @@ -16,9 +16,9 @@ ACE_OS::getrlimit (int resource, struct rlimit *rl) ACE_NOTSUP_RETURN (-1); #else # if defined (ACE_HAS_RLIMIT_RESOURCE_ENUM) - ACE_OSCALL_RETURN (::getrlimit ((ACE_HAS_RLIMIT_RESOURCE_ENUM) resource, rl), int, -1); + return ::getrlimit ((ACE_HAS_RLIMIT_RESOURCE_ENUM) resource, rl); # else - ACE_OSCALL_RETURN (::getrlimit (resource, rl), int, -1); + return ::getrlimit (resource, rl); # endif /* ACE_HAS_RLIMIT_RESOURCE_ENUM */ #endif /* ACE_LACKS_RLIMIT */ } @@ -48,9 +48,9 @@ ACE_OS::getrusage (int who, struct rusage *ru) # endif /* ACE_LACKS_WIN32_GETPROCESSTIMES */ # else # if defined (ACE_HAS_RUSAGE_WHO_ENUM) - ACE_OSCALL_RETURN (::getrusage ((ACE_HAS_RUSAGE_WHO_ENUM) who, ru), int, -1); + return ::getrusage ((ACE_HAS_RUSAGE_WHO_ENUM) who, ru); # else - ACE_OSCALL_RETURN (::getrusage (who, ru), int, -1); + return ::getrusage (who, ru); # endif /* ACE_HAS_RUSAGE_WHO_ENUM */ # endif /* ACE_WIN32 */ #else @@ -73,20 +73,15 @@ ACE_OS::setrlimit (int resource, const struct rlimit *rl) #else # if defined (ACE_HAS_RLIMIT_RESOURCE_ENUM) # if defined (ACE_HAS_NONCONST_SETRLIMIT) - ACE_OSCALL_RETURN (::setrlimit ((ACE_HAS_RLIMIT_RESOURCE_ENUM) resource, - const_cast<struct rlimit *>(rl) - ), int, -1); + return ::setrlimit ((ACE_HAS_RLIMIT_RESOURCE_ENUM) resource, const_cast<struct rlimit *>(rl)); # else - ACE_OSCALL_RETURN (::setrlimit ((ACE_HAS_RLIMIT_RESOURCE_ENUM) resource, - rl - ), int, -1); + return ::setrlimit ((ACE_HAS_RLIMIT_RESOURCE_ENUM) resource, rl); # endif /* ACE_HAS_NONCONST_SETRLIMIT */ # else /* ACE_HAS_RLIMIT_RESOURCE_ENUM */ # if defined (ACE_HAS_NONCONST_SETRLIMIT) - ACE_OSCALL_RETURN (::setrlimit (resource, const_cast<struct rlimit *>(rl) - ), int, -1); + return ::setrlimit (resource, const_cast<struct rlimit *>(rl)); # else - ACE_OSCALL_RETURN (::setrlimit (resource, rl), int, -1); + return ::setrlimit (resource, rl); # endif /* ACE_HAS_NONCONST_SETRLIMIT */ # endif /* ACE_HAS_RLIMIT_RESOURCE_ENUM */ #endif /* ACE_LACKS_RLIMIT */ diff --git a/ACE/ace/OS_NS_sys_shm.inl b/ACE/ace/OS_NS_sys_shm.inl index 02c3b9221f5..b5540766568 100644 --- a/ACE/ace/OS_NS_sys_shm.inl +++ b/ACE/ace/OS_NS_sys_shm.inl @@ -9,9 +9,9 @@ ACE_OS::shmat (int int_id, const void *shmaddr, int shmflg) ACE_OS_TRACE ("ACE_OS::shmat"); #if defined (ACE_HAS_SYSV_IPC) # if defined (ACE_HAS_CHARPTR_SHMAT) - ACE_OSCALL_RETURN (::shmat (int_id, static_cast <char*> (const_cast <void *>(shmaddr)), shmflg), void *, (void *) -1); + return ::shmat (int_id, static_cast <char*> (const_cast <void *>(shmaddr)), shmflg); # else - ACE_OSCALL_RETURN (::shmat (int_id, shmaddr, shmflg), void *, (void *) -1); + return ::shmat (int_id, shmaddr, shmflg); # endif /* ACE_HAS_CHARPTR_SHMAT */ #else ACE_UNUSED_ARG (int_id); @@ -27,7 +27,7 @@ ACE_OS::shmctl (int int_id, int cmd, struct shmid_ds *buf) { ACE_OS_TRACE ("ACE_OS::shmctl"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::shmctl (int_id, cmd, buf), int, -1); + return ::shmctl (int_id, cmd, buf); #else ACE_UNUSED_ARG (buf); ACE_UNUSED_ARG (cmd); @@ -43,10 +43,9 @@ ACE_OS::shmdt (const void *shmaddr) ACE_OS_TRACE ("ACE_OS::shmdt"); #if defined (ACE_HAS_SYSV_IPC) # if defined (ACE_HAS_CHARPTR_SHMDT) - ACE_OSCALL_RETURN (::shmdt ( - static_cast <char*> (const_cast <void *>(shmaddr))), int, -1); + return ::shmdt (static_cast <char*> (const_cast <void *>(shmaddr))); # else - ACE_OSCALL_RETURN (::shmdt (shmaddr), int, -1); + return ::shmdt (shmaddr); # endif /* ACE_HAS_CHARPTR_SHMDT */ #else ACE_UNUSED_ARG (shmaddr); @@ -60,7 +59,7 @@ ACE_OS::shmget (key_t key, size_t size, int flags) { ACE_OS_TRACE ("ACE_OS::shmget"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::shmget (key, size, flags), int, -1); + return ::shmget (key, size, flags); #else ACE_UNUSED_ARG (flags); ACE_UNUSED_ARG (size); diff --git a/ACE/ace/OS_NS_sys_socket.inl b/ACE/ace/OS_NS_sys_socket.inl index 53036af3b8f..60404b85e12 100644 --- a/ACE/ace/OS_NS_sys_socket.inl +++ b/ACE/ace/OS_NS_sys_socket.inl @@ -137,7 +137,7 @@ ACE_OS::closesocket (ACE_HANDLE handle) ACE_SOCKCALL_RETURN (::closesocket ((SOCKET) handle), int, -1); #else //FUZZ: disable check_for_lack_ACE_OS - ACE_OSCALL_RETURN (::close (handle), int, -1); + return ::close (handle); //FUZZ: enable check_for_lack_ACE_OS #endif /* ACE_WIN32 */ } @@ -1015,8 +1015,7 @@ ACE_OS::socketpair (int domain, int type, ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::socketpair (domain, type, protocol, sv), - int, -1); + return ::socketpair (domain, type, protocol, sv); #endif /* ACE_LACKS_SOCKETPAIR */ } @@ -1028,7 +1027,7 @@ ACE_OS::if_nametoindex (const char *ifname) ACE_UNUSED_ARG (ifname); ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (::if_nametoindex (ifname), int, 0); + return ::if_nametoindex (ifname); #endif /* ACE_LACKS_IF_NAMETOINDEX */ } @@ -1041,7 +1040,7 @@ ACE_OS::if_indextoname (unsigned int ifindex, char *ifname) ACE_UNUSED_ARG (ifname); ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (::if_indextoname (ifindex, ifname), char *, 0); + return ::if_indextoname (ifindex, ifname); #endif /* ACE_LACKS_IF_NAMETOINDEX */ } @@ -1052,7 +1051,7 @@ ACE_OS::if_nameindex () #ifdef ACE_LACKS_IF_NAMEINDEX ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (::if_nameindex (), struct if_nameindex *, 0); + return ::if_nameindex (); #endif /* ACE_LACKS_IF_NAMEINDEX */ } diff --git a/ACE/ace/OS_NS_sys_stat.inl b/ACE/ace/OS_NS_sys_stat.inl index dd940376d9c..b8f7c9fc829 100644 --- a/ACE/ace/OS_NS_sys_stat.inl +++ b/ACE/ace/OS_NS_sys_stat.inl @@ -20,8 +20,7 @@ namespace ACE_OS #if defined (ACE_WIN32) || defined (ACE_MQX) return ACE_OS::open (filename, O_CREAT|O_TRUNC|O_WRONLY, mode); #else - ACE_OSCALL_RETURN (::creat (ACE_TEXT_ALWAYS_CHAR (filename), mode), - ACE_HANDLE, ACE_INVALID_HANDLE); + return ::creat (ACE_TEXT_ALWAYS_CHAR (filename), mode); #endif /* ACE_WIN32 */ } @@ -33,7 +32,7 @@ namespace ACE_OS // Solaris for intel uses an macro for fstat(), this is a wrapper // for _fxstat() use of the macro. // causes compile and runtime problems. - ACE_OSCALL_RETURN (::_fxstat (_STAT_VER, handle, stp), int, -1); + return ::_fxstat (_STAT_VER, handle, stp); #elif defined (ACE_WIN32) BY_HANDLE_FILE_INFORMATION fdata; @@ -70,7 +69,7 @@ namespace ACE_OS ::fsync(handle); //FUZZ: enable check_for_lack_ACE_OS # endif - ACE_OSCALL_RETURN (::fstat (handle, stp), int, -1); + return ::fstat (handle, stp); #endif /* !ACE_HAS_X86_STAT_MACROS */ } @@ -132,9 +131,9 @@ namespace ACE_OS # elif defined (ACE_HAS_X86_STAT_MACROS) // Solaris for intel uses an macro for lstat(), this macro is a // wrapper for _lxstat(). - ACE_OSCALL_RETURN (::_lxstat (_STAT_VER, file, stp), int, -1); + return ::_lxstat (_STAT_VER, file, stp); # else /* !ACE_HAS_X86_STAT_MACROS */ - ACE_OSCALL_RETURN (::lstat (file, stp), int, -1); + return ::lstat (file, stp); # endif /* ACE_LACKS_LSTAT */ } @@ -162,12 +161,12 @@ namespace ACE_OS #elif defined (ACE_MKDIR_LACKS_MODE) ACE_UNUSED_ARG (mode); # if defined (ACE_MKDIR_EQUIVALENT) - ACE_OSCALL_RETURN (ACE_MKDIR_EQUIVALENT (path), int, -1); + return ACE_MKDIR_EQUIVALENT (path); # else - ACE_OSCALL_RETURN (::mkdir (path), int, -1); + return ::mkdir (path); # endif #else - ACE_OSCALL_RETURN (::mkdir (path, mode), int, -1); + return::mkdir (path, mode); #endif } @@ -183,7 +182,7 @@ namespace ACE_OS int, -1); #elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) ACE_UNUSED_ARG (mode); - ACE_OSCALL_RETURN (::_wmkdir (path), int, -1); + return ::_wmkdir (path); #else return ACE_OS::mkdir (ACE_Wide_To_Ascii (path).char_rep (), mode); #endif /* ACE_HAS_WINCE */ @@ -200,7 +199,7 @@ namespace ACE_OS ACE_UNUSED_ARG (mode); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::mkfifo (ACE_TEXT_ALWAYS_CHAR (file), mode), int, -1); + return ::mkfifo (ACE_TEXT_ALWAYS_CHAR (file), mode); #endif /* ACE_LACKS_MKFIFO */ } @@ -209,7 +208,7 @@ namespace ACE_OS { ACE_OS_TRACE ("ACE_OS::stat"); #if defined (ACE_HAS_NONCONST_STAT) - ACE_OSCALL_RETURN (::stat (const_cast <char *> (file), stp), int, -1); + return ::stat (const_cast <char *> (file), stp); #elif defined (ACE_LACKS_STAT) ACE_NOTSUP_RETURN (-1); #elif defined (ACE_HAS_WINCE) @@ -241,11 +240,11 @@ namespace ACE_OS #elif defined (ACE_HAS_X86_STAT_MACROS) // Solaris for intel uses an macro for stat(), this macro is a // wrapper for _xstat(). - ACE_OSCALL_RETURN (::_xstat (_STAT_VER, file, stp), int, -1); + return ::_xstat (_STAT_VER, file, stp); #elif defined (ACE_MQX) return MQX_Filesystem::inst ().stat (file, stp); #else - ACE_OSCALL_RETURN (ACE_STAT_FUNC_NAME (file, stp), int, -1); + return ACE_STAT_FUNC_NAME (file, stp); #endif /* ACE_HAS_NONCONST_STAT */ } @@ -283,7 +282,7 @@ namespace ACE_OS #elif defined (__BORLANDC__) \ || defined (_MSC_VER) \ || (defined (__MINGW32__) && !defined (__MINGW64_VERSION_MAJOR)) - ACE_OSCALL_RETURN (ACE_WSTAT_FUNC_NAME (file, stp), int, -1); + return ACE_WSTAT_FUNC_NAME (file, stp); #else /* ACE_HAS_WINCE */ ACE_Wide_To_Ascii nfile (file); return ACE_OS::stat (nfile.char_rep (), stp); @@ -304,7 +303,7 @@ namespace ACE_OS ACE_SECURECRTCALL (_umask_s (new_mode, &old_mode), mode_t, -1, old_mode); return static_cast<mode_t> (old_mode); # elif defined (ACE_WIN32) && !defined (__BORLANDC__) - ACE_OSCALL_RETURN (::_umask (cmask), mode_t, -1); + return ::_umask (cmask); # else return ::umask (cmask); // This call shouldn't fail... # endif /* ACE_LACKS_UMASK */ diff --git a/ACE/ace/OS_NS_sys_time.inl b/ACE/ace/OS_NS_sys_time.inl index 1f7efda9fcb..5692bf0d8df 100644 --- a/ACE/ace/OS_NS_sys_time.inl +++ b/ACE/ace/OS_NS_sys_time.inl @@ -49,14 +49,14 @@ ACE_OS::gettimeofday () # if defined (ACE_HAS_TIMEZONE_GETTIMEOFDAY) || \ defined(ACE_HAS_VOIDPTR_GETTIMEOFDAY) || \ (defined (ACE_HAS_SVR4_GETTIMEOFDAY) && !defined (SCO)) - ACE_OSCALL (::gettimeofday (&tv, 0), int, -1, result); + ACE_OSCALL (::gettimeofday (&tv, 0), int, result); # elif defined (ACE_VXWORKS) // Assumes that struct timespec is same size as struct timeval, // which assumes that time_t is a long: it currently (VxWorks // 5.2/5.3) is. struct timespec ts; - ACE_OSCALL (ACE_OS::clock_gettime (CLOCK_REALTIME, &ts), int, -1, result); + ACE_OSCALL (ACE_OS::clock_gettime (CLOCK_REALTIME, &ts), int, result); tv.tv_sec = ts.tv_sec; tv.tv_usec = ts.tv_nsec / 1000L; // timespec has nsec, but timeval has usec # elif defined (ACE_MQX) @@ -68,7 +68,7 @@ ACE_OS::gettimeofday () # if defined (ACE_LACKS_GETTIMEOFDAY) ACE_NOTSUP_RETURN (ACE_Time_Value ((time_t)-1)); # else - ACE_OSCALL (::gettimeofday (&tv), int, -1, result); + ACE_OSCALL (::gettimeofday (&tv), int, result); # endif /* ACE_LACKS_GETTIMEOFDAY */ # endif /* ACE_HAS_SVR4_GETTIMEOFDAY */ #endif /* 0 */ diff --git a/ACE/ace/OS_NS_sys_uio.inl b/ACE/ace/OS_NS_sys_uio.inl index d31e7034e0f..c3d590519d5 100644 --- a/ACE/ace/OS_NS_sys_uio.inl +++ b/ACE/ace/OS_NS_sys_uio.inl @@ -10,18 +10,12 @@ ACE_OS::readv (ACE_HANDLE handle, { ACE_OS_TRACE ("ACE_OS::readv"); #if defined (ACE_LACKS_READV) - ACE_OSCALL_RETURN (ACE_OS::readv_emulation (handle, iov, iovlen), - ssize_t, - -1); + return ACE_OS::readv_emulation (handle, iov, iovlen); #else /* ACE_LACKS_READV */ #if defined (ACE_HAS_NONCONST_READV) - ACE_OSCALL_RETURN (::readv (handle, - const_cast<iovec *>(iov), - iovlen), ssize_t, -1); + return ::readv (handle, const_cast<iovec *>(iov), iovlen); #else - ACE_OSCALL_RETURN (::readv (handle, - iov, - iovlen), ssize_t, -1); + return ::readv (handle, iov, iovlen); #endif /* ACE_HAS_NONCONST_READV */ #endif /* ACE_LACKS_READV */ } @@ -33,18 +27,12 @@ ACE_OS::writev (ACE_HANDLE handle, { ACE_OS_TRACE ("ACE_OS::writev"); #if defined (ACE_LACKS_WRITEV) - ACE_OSCALL_RETURN (ACE_OS::writev_emulation (handle, - iov, - iovcnt), ssize_t, -1); + return ACE_OS::writev_emulation (handle, iov, iovcnt); #else /* ACE_LACKS_WRITEV */ #if defined (ACE_HAS_NONCONST_WRITEV) - ACE_OSCALL_RETURN (::writev (handle, - const_cast<iovec *>(iov), - iovcnt), ssize_t, -1); + return ::writev (handle, const_cast<iovec *>(iov), iovcnt); #else - ACE_OSCALL_RETURN (::writev (handle, - iov, - iovcnt), ssize_t, -1); + return ::writev (handle, iov, iovcnt); #endif /* ACE_HAS_NONCONST_WRITEV */ #endif /* ACE_LACKS_WRITEV */ } diff --git a/ACE/ace/OS_NS_sys_utsname.cpp b/ACE/ace/OS_NS_sys_utsname.cpp index fd561ebac61..b073a641a59 100644 --- a/ACE/ace/OS_NS_sys_utsname.cpp +++ b/ACE/ace/OS_NS_sys_utsname.cpp @@ -18,7 +18,7 @@ ACE_OS::uname (ACE_utsname *name) { ACE_OS_TRACE ("ACE_OS::uname"); #if !defined (ACE_LACKS_UNAME) - ACE_OSCALL_RETURN (::uname (name), int, -1); + return ::uname (name); #elif defined (ACE_WIN32) size_t maxnamelen = sizeof name->nodename; ACE_OS::strcpy (name->sysname, "Win32"); diff --git a/ACE/ace/OS_NS_sys_wait.inl b/ACE/ace/OS_NS_sys_wait.inl index 1d687a8702d..c688b07b05b 100644 --- a/ACE/ace/OS_NS_sys_wait.inl +++ b/ACE/ace/OS_NS_sys_wait.inl @@ -12,7 +12,7 @@ ACE_OS::wait (int *status) ACE_UNUSED_ARG (status); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::wait (status), pid_t, -1); + return ::wait (status); #endif /* ACE_LACKS_WAIT */ } @@ -75,8 +75,7 @@ ACE_OS::waitpid (pid_t pid, return result; #else ACE_UNUSED_ARG (handle); - ACE_OSCALL_RETURN (::waitpid (pid, status, wait_options), - pid_t, -1); + return ::waitpid (pid, status, wait_options); #endif /* ACE_LACKS_WAITPID */ } diff --git a/ACE/ace/OS_NS_time.cpp b/ACE/ace/OS_NS_time.cpp index 2ab3c7ebe47..09a223b8574 100644 --- a/ACE/ace/OS_NS_time.cpp +++ b/ACE/ace/OS_NS_time.cpp @@ -278,7 +278,7 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res) ACE_UNUSED_ARG (res); struct tm * res_ptr = 0; - ACE_OSCALL (::localtime (t), struct tm *, 0, res_ptr); + ACE_OSCALL (::localtime (t), struct tm *, res_ptr); if (res_ptr == 0) return 0; else @@ -315,7 +315,7 @@ ACE_OS::mktime (struct tm *t) ACE_OS_GUARD # endif /* ACE_HAS_THREADS && ! ACE_HAS_MT_SAFE_MKTIME */ - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::mktime (t), time_t, (time_t) -1); + return ACE_STD_NAMESPACE::mktime (t); # endif /* ACE_HAS_WINCE */ } diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h index 6b115e6bc61..d155dc3636f 100644 --- a/ACE/ace/OS_NS_time.h +++ b/ACE/ace/OS_NS_time.h @@ -67,7 +67,7 @@ inline long ace_timezone() struct timeval time; struct timezone zone; ACE_UNUSED_ARG (result); - ACE_OSCALL (::gettimeofday (&time, &zone), int, -1, result); + ACE_OSCALL (::gettimeofday (&time, &zone), int, result); return zone.tz_minuteswest * 60; #else ACE_NOTSUP_RETURN (0); diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl index fee739324e7..c5f676ae800 100644 --- a/ACE/ace/OS_NS_time.inl +++ b/ACE/ace/OS_NS_time.inl @@ -15,7 +15,7 @@ ACE_OS::asctime (const struct tm *t) ACE_UNUSED_ARG (t); ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::asctime (t), char *, 0); + return ACE_STD_NAMESPACE::asctime (t); #endif /* ACE_LACKS_ASCTIME */ } @@ -31,9 +31,9 @@ ACE_OS::asctime_r (const struct tm *t, char *buf, int buflen) return buf; # else # if defined (ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R) - ACE_OSCALL_RETURN (::asctime_r (t, buf, reinterpret_cast<size_t*>(&buflen)), char *, 0); + return ::asctime_r (t, buf, reinterpret_cast<size_t*>(&buflen)); # else - ACE_OSCALL_RETURN (::asctime_r (t, buf, buflen), char *, 0); + return ::asctime_r (t, buf, buflen); # endif /* ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R */ # endif /* ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R */ #elif defined (ACE_HAS_TR24731_2005_CRT) @@ -48,7 +48,7 @@ ACE_OS::asctime_r (const struct tm *t, char *buf, int buflen) ACE_NOTSUP_RETURN (0); #else char *result = 0; - ACE_OSCALL (ACE_STD_NAMESPACE::asctime (t), char *, 0, result); + ACE_OSCALL (ACE_STD_NAMESPACE::asctime (t), char *, result); ACE_OS::strsncpy (buf, result, buflen); return buf; #endif /* ACE_HAS_REENTRANT_FUNCTIONS */ @@ -59,7 +59,7 @@ ACE_OS::clock_gettime (clockid_t clockid, struct timespec *ts) { ACE_OS_TRACE ("ACE_OS::clock_gettime"); #if defined (ACE_HAS_CLOCK_GETTIME) - ACE_OSCALL_RETURN (::clock_gettime (clockid, ts), int, -1); + return ::clock_gettime (clockid, ts); #else ACE_UNUSED_ARG (clockid); ACE_UNUSED_ARG (ts); @@ -72,9 +72,9 @@ ACE_OS::clock_settime (clockid_t clockid, const struct timespec *ts) { #if defined (ACE_HAS_CLOCK_SETTIME) # if defined (ACE_HAS_NONCONST_CLOCK_SETTIME) - ACE_OSCALL_RETURN (::clock_settime (clockid, const_cast<struct timespec *>(ts)), int, -1); + return ::clock_settime (clockid, const_cast<struct timespec *>(ts)); # else - ACE_OSCALL_RETURN (::clock_settime (clockid, ts), int, -1); + return ::clock_settime (clockid, ts); # endif /* ACE_HAS_NONCONST_CLOCK_SETTIME */ #else ACE_UNUSED_ARG (clockid); @@ -99,11 +99,11 @@ ACE_OS::ctime (const time_t *t) buf, ctime_buf_size); #elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OSCALL_RETURN (::_wctime (t), wchar_t *, 0); + return ::_wctime (t); #else # if defined (ACE_USES_WCHAR) /* Not Win32, else it would do the above */ char *narrow_time; - ACE_OSCALL (::ctime (t), char *, 0, narrow_time); + ACE_OSCALL (::ctime (t), char *, narrow_time); if (narrow_time == 0) return 0; // ACE_Ascii_To_Wide::convert allocates (via new []) a wchar_t[]. If @@ -116,7 +116,7 @@ ACE_OS::ctime (const time_t *t) wide_time = ACE_Ascii_To_Wide::convert (narrow_time); return wide_time; # else - ACE_OSCALL_RETURN (::ctime (t), char *, 0); + return ::ctime (t); # endif /* ACE_USES_WCHAR */ # endif /* ACE_HAS_WINCE */ } @@ -143,7 +143,7 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen) return 0; } # if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) - ACE_OSCALL (::ctime_r (t, bufp), char *, 0, bufp); + ACE_OSCALL (::ctime_r (t, bufp), char *, bufp); # else /* ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R */ # if defined (ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R) @@ -188,9 +188,9 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen) ACE_TCHAR *result = 0; # if defined (ACE_USES_WCHAR) - ACE_OSCALL (::_wctime (t), wchar_t *, 0, result); + ACE_OSCALL (::_wctime (t), wchar_t *, result); # else /* ACE_USES_WCHAR */ - ACE_OSCALL (::ctime (t), char *, 0, result); + ACE_OSCALL (::ctime (t), char *, result); # endif /* ACE_USES_WCHAR */ if (result != 0) ACE_OS::strsncpy (buf, result, buflen); @@ -350,7 +350,7 @@ ACE_OS::gmtime (const time_t *t) ACE_UNUSED_ARG (t); ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (::gmtime (t), struct tm *, 0); + return ::gmtime (t); #endif /* ACE_LACKS_GMTIME */ } @@ -370,7 +370,7 @@ ACE_OS::gmtime_r (const time_t *t, struct tm *res) ACE_NOTSUP_RETURN (0); #else struct tm *result; - ACE_OSCALL (::gmtime (t), struct tm *, 0, result) ; + ACE_OSCALL (::gmtime (t), struct tm *, result) ; if (result != 0) *res = *result; return res; @@ -385,7 +385,7 @@ ACE_OS::localtime (const time_t *t) ACE_UNUSED_ARG (t); ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (::localtime (t), struct tm *, 0); + return ::localtime (t); #endif /* ACE_LACKS_LOCALTIME */ } @@ -446,7 +446,7 @@ ACE_OS::time (time_t *tloc) *tloc = retv; return retv; #else - ACE_OSCALL_RETURN (::time (tloc), time_t, (time_t) -1); + return ::time (tloc); #endif /* ACE_LACKS_TIME */ } diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp index 04900f3d318..b9f0fe6e6ca 100644 --- a/ACE/ace/OS_NS_unistd.cpp +++ b/ACE/ace/OS_NS_unistd.cpp @@ -231,7 +231,7 @@ ACE_OS::execl (const char * /* path */, const char * /* arg0 */, ...) ACE_OS_TRACE ("ACE_OS::execl"); ACE_NOTSUP_RETURN (-1); // Need to write this code. - // ACE_OSCALL_RETURN (::execv (path, argv), int, -1); + // return ::execv (path, argv); } int @@ -240,7 +240,7 @@ ACE_OS::execle (const char * /* path */, const char * /* arg0 */, ...) ACE_OS_TRACE ("ACE_OS::execle"); ACE_NOTSUP_RETURN (-1); // Need to write this code. - // ACE_OSCALL_RETURN (::execve (path, argv, envp), int, -1); + // return ::execve (path, argv, envp); } int @@ -249,7 +249,7 @@ ACE_OS::execlp (const char * /* file */, const char * /* arg0 */, ...) ACE_OS_TRACE ("ACE_OS::execlp"); ACE_NOTSUP_RETURN (-1); // Need to write this code. - // ACE_OSCALL_RETURN (::execvp (file, argv), int, -1); + // return ::execvp (file, argv); } pid_t diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl index bb29b1cfcee..e65fb47f708 100644 --- a/ACE/ace/OS_NS_unistd.inl +++ b/ACE/ace/OS_NS_unistd.inl @@ -59,12 +59,12 @@ ACE_OS::access (const char *path, int amode) #elif defined(ACE_WIN32) // Windows doesn't support checking X_OK(6) # if defined (ACE_ACCESS_EQUIVALENT) - ACE_OSCALL_RETURN (ACE_ACCESS_EQUIVALENT (path, amode & 6), int, -1); + return ACE_ACCESS_EQUIVALENT (path, amode & 6); # else - ACE_OSCALL_RETURN (::access (path, amode & 6), int, -1); + return ::access (path, amode & 6); # endif #else - ACE_OSCALL_RETURN (::access (path, amode), int, -1); + return ::access (path, amode); #endif /* ACE_LACKS_ACCESS */ } @@ -74,7 +74,7 @@ ACE_INLINE int ACE_OS::access (const wchar_t *path, int amode) { #if defined (ACE_WIN32) && !defined (ACE_LACKS__WACCESS) - ACE_OSCALL_RETURN (::_waccess (path, amode), int, -1); + return ::_waccess (path, amode); #else /* ACE_WIN32 && !ACE_HAS_WINCE */ return ACE_OS::access (ACE_Wide_To_Ascii (path).char_rep (), amode); #endif /* ACE_WIN32 && !ACE_LACKS__WACCESS */ @@ -131,11 +131,11 @@ ACE_OS::chdir (const char *path) ACE_UNUSED_ARG (path); ACE_NOTSUP_RETURN (-1); #elif defined (ACE_HAS_NONCONST_CHDIR) - ACE_OSCALL_RETURN (::chdir (const_cast<char *> (path)), int, -1); + return ::chdir (const_cast<char *> (path)); #elif defined (ACE_CHDIR_EQUIVALENT) - ACE_OSCALL_RETURN (ACE_CHDIR_EQUIVALENT (path), int, -1); + return ACE_CHDIR_EQUIVALENT (path); #else - ACE_OSCALL_RETURN (::chdir (path), int, -1); + return ::chdir (path); #endif /* ACE_HAS_NONCONST_CHDIR */ } @@ -147,7 +147,7 @@ ACE_OS::chdir (const wchar_t *path) ACE_UNUSED_ARG (path); ACE_NOTSUP_RETURN (-1); #elif defined (ACE_WIN32) - ACE_OSCALL_RETURN (::_wchdir (path), int, -1); + return ::_wchdir (path); #else /* ACE_WIN32 */ return ACE_OS::chdir (ACE_Wide_To_Ascii (path).char_rep ()); #endif /* ACE_WIN32 */ @@ -162,9 +162,9 @@ ACE_OS::rmdir (const char *path) ace_result_), int, -1); #elif defined (ACE_RMDIR_EQUIVALENT) - ACE_OSCALL_RETURN (ACE_RMDIR_EQUIVALENT (path), int, -1); + return ACE_RMDIR_EQUIVALENT (path); #else - ACE_OSCALL_RETURN (::rmdir (path), int, -1); + return ::rmdir (path); #endif /* ACE_WIN32 */ } @@ -177,7 +177,7 @@ ACE_OS::rmdir (const wchar_t *path) ace_result_), int, -1); #elif defined (ACE_WIN32) - ACE_OSCALL_RETURN (::_wrmdir (path), int, -1); + return ::_wrmdir (path); #else ACE_Wide_To_Ascii n_path (path); return ACE_OS::rmdir (n_path.char_rep ()); @@ -198,7 +198,7 @@ ACE_OS::close (ACE_HANDLE handle) #elif defined (ACE_MQX) return MQX_Filesystem::inst ().close (handle); #else - ACE_OSCALL_RETURN (::close (handle), int, -1); + return ::close (handle); #endif /* ACE_WIN32 */ } @@ -223,7 +223,7 @@ ACE_OS::dup (ACE_HANDLE handle) ACE_FAIL_RETURN (ACE_INVALID_HANDLE); /* NOTREACHED */ #else - ACE_OSCALL_RETURN (::dup (handle), ACE_HANDLE, ACE_INVALID_HANDLE); + return ::dup (handle); #endif /* ACE_LACKS_DUP */ } @@ -256,7 +256,7 @@ ACE_OS::dup(ACE_HANDLE handle, pid_t pid) /*NOTREACHED*/ #else ACE_UNUSED_ARG (pid); - ACE_OSCALL_RETURN(::dup(handle), ACE_HANDLE, ACE_INVALID_HANDLE); + return ::dup(handle); #endif /*ACE_WIN32 && !ACE_HAS_WINCE*/ } @@ -270,7 +270,7 @@ ACE_OS::dup2 (ACE_HANDLE oldhandle, ACE_HANDLE newhandle) ACE_UNUSED_ARG (newhandle); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::dup2 (oldhandle, newhandle), int, -1); + return ::dup2 (oldhandle, newhandle); #endif /* ACE_LACKS_DUP2 */ } @@ -298,7 +298,7 @@ ACE_OS::execv (const char *path, return -1; # endif /* __BORLANDC__ */ #else - ACE_OSCALL_RETURN (::execv (path, argv), int, -1); + return ::execv (path, argv); #endif /* ACE_LACKS_EXEC */ } @@ -328,7 +328,7 @@ ACE_OS::execve (const char *path, return -1; # endif /* __BORLANDC__ */ #else - ACE_OSCALL_RETURN (::execve (path, argv, envp), int, -1); + return ::execve (path, argv, envp); #endif /* ACE_LACKS_EXEC */ } @@ -356,7 +356,7 @@ ACE_OS::execvp (const char *file, return -1; # endif /* __BORLANDC__ */ #else - ACE_OSCALL_RETURN (::execvp (file, argv), int, -1); + return ::execvp (file, argv); #endif /* ACE_LACKS_EXEC */ } @@ -367,7 +367,7 @@ ACE_OS::fork () #if defined (ACE_LACKS_FORK) ACE_NOTSUP_RETURN (pid_t (-1)); #else - ACE_OSCALL_RETURN (::fork (), pid_t, -1); + return ::fork (); #endif /* ACE_LACKS_FORK */ } @@ -381,7 +381,7 @@ ACE_OS::fsync (ACE_HANDLE handle) # elif defined (ACE_WIN32) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::FlushFileBuffers (handle), ace_result_), int, -1); # else - ACE_OSCALL_RETURN (::fsync (handle), int, -1); + return ::fsync (handle); # endif /* ACE_LACKS_FSYNC */ } @@ -406,7 +406,7 @@ ACE_OS::ftruncate (ACE_HANDLE handle, ACE_OFF_T offset) #elif defined (ACE_LACKS_FTRUNCATE) ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::ftruncate (handle, offset), int, -1); + return ::ftruncate (handle, offset); #endif /* ACE_WIN32 */ } @@ -423,7 +423,7 @@ ACE_OS::getcwd (char *buf, size_t size) #elif defined (ACE_WIN32) return ::getcwd (buf, static_cast<int> (size)); #else - ACE_OSCALL_RETURN (::getcwd (buf, size), char *, 0); + return ::getcwd (buf, size); #endif /* ACE_LACKS_GETCWD */ } @@ -457,7 +457,7 @@ ACE_OS::getgid () #if defined (ACE_LACKS_GETGID) ACE_NOTSUP_RETURN (static_cast<gid_t> (-1)); # else - ACE_OSCALL_RETURN (::getgid (), gid_t, static_cast<gid_t> (-1)); + return ::getgid (); # endif /* ACE_LACKS_GETGID */ } @@ -468,7 +468,7 @@ ACE_OS::getegid () #if defined (ACE_LACKS_GETEGID) ACE_NOTSUP_RETURN (static_cast<gid_t> (-1)); # else - ACE_OSCALL_RETURN (::getegid (), gid_t, static_cast<gid_t> (-1)); + return ::getegid (); # endif /* ACE_LACKS_GETEGID */ } @@ -482,7 +482,7 @@ ACE_OS::getopt (int argc, char *const *argv, const char *optstring) ACE_UNUSED_ARG (optstring); ACE_NOTSUP_RETURN (-1); # else - ACE_OSCALL_RETURN (::getopt (argc, argv, optstring), int, -1); + return ::getopt (argc, argv, optstring); # endif /* ACE_LACKS_GETOPT */ } @@ -498,9 +498,9 @@ ACE_OS::getpgid (pid_t pid) // doesn't enable its prototype by default. // Rather than create our own extern prototype, just use the one // that is visible (ugh). - ACE_OSCALL_RETURN (::__getpgid (pid), pid_t, -1); + return ::__getpgid (pid); #else - ACE_OSCALL_RETURN (::getpgid (pid), pid_t, -1); + return ::getpgid (pid); #endif /* ACE_LACKS_GETPGID */ } @@ -513,7 +513,7 @@ ACE_OS::getpid () #elif defined (ACE_WIN32) return ::GetCurrentProcessId (); #else - ACE_OSCALL_RETURN (::getpid (), pid_t, -1); + return ::getpid (); #endif /* ACE_LACKS_GETPID */ } @@ -524,7 +524,7 @@ ACE_OS::getppid () #if defined (ACE_LACKS_GETPPID) ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::getppid (), pid_t, -1); + return ::getppid (); #endif /* ACE_LACKS_GETPPID */ } @@ -535,7 +535,7 @@ ACE_OS::getuid () #if defined (ACE_LACKS_GETUID) ACE_NOTSUP_RETURN (static_cast<uid_t> (-1)); # else - ACE_OSCALL_RETURN (::getuid (), uid_t, static_cast<uid_t> (-1)); + return ::getuid (); # endif /* ACE_LACKS_GETUID*/ } @@ -546,7 +546,7 @@ ACE_OS::geteuid () #if defined (ACE_LACKS_GETEUID) ACE_NOTSUP_RETURN (static_cast<uid_t> (-1)); # else - ACE_OSCALL_RETURN (::geteuid (), uid_t, (uid_t) -1); + return ::geteuid (); # endif /* ACE_LACKS_GETEUID */ } @@ -567,7 +567,7 @@ ACE_OS::hostname (char name[], size_t maxnamelen) ACE_NOTSUP_RETURN (-1); # endif /* ACE_HAS_PHARLAP_RT */ #elif defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE) - ACE_OSCALL_RETURN (::gethostname (name, maxnamelen), int, -1); + return ::gethostname (name, maxnamelen); #elif defined (ACE_WIN32) if (::gethostname (name, ACE_Utils::truncate_cast<int> (maxnamelen)) == 0) { @@ -636,7 +636,7 @@ ACE_OS::isatty (int handle) # elif defined (ACE_WIN32) return ::_isatty (handle); # else - ACE_OSCALL_RETURN (::isatty (handle), int, -1); + return ::isatty (handle); # endif /* ACE_LACKS_ISATTY */ } @@ -710,7 +710,7 @@ ACE_OS::lseek (ACE_HANDLE handle, ACE_OFF_T offset, int whence) } return static_cast<ACE_OFF_T> (MQX_Filesystem::inst ().lseek (handle, offset, whence)); #else - ACE_OSCALL_RETURN (::lseek (handle, offset, whence), ACE_OFF_T, -1); + return ::lseek (handle, offset, whence); #endif /* ACE_WIN32 */ } @@ -726,7 +726,7 @@ ACE_OS::llseek (ACE_HANDLE handle, ACE_LOFF_T offset, int whence) #elif defined (ACE_HAS_LLSEEK) && defined (ACE_HAS_LSEEK64) # error Either ACE_HAS_LSEEK64 and ACE_HAS_LLSEEK should be defined, not both! #elif defined (ACE_HAS_LSEEK64) - ACE_OSCALL_RETURN (::lseek64 (handle, offset, whence), ACE_LOFF_T, -1); + return ::lseek64 (handle, offset, whence); #elif defined (ACE_HAS_LLSEEK) # if defined (ACE_WIN32) # ifndef ACE_LACKS_WIN32_SETFILEPOINTEREX @@ -755,7 +755,7 @@ ACE_OS::llseek (ACE_HANDLE handle, ACE_LOFF_T offset, int whence) return l_offset.QuadPart; # endif /* ACE_LACKS_WIN32_SETFILEPOINTEREX */ # else - ACE_OSCALL_RETURN (::llseek (handle, offset, whence), ACE_LOFF_T, -1); + return ::llseek (handle, offset, whence); # endif /* WIN32 */ #endif } @@ -780,9 +780,9 @@ ACE_OS::read (ACE_HANDLE handle, void *buf, size_t len) ssize_t result; # if defined (ACE_HAS_CHARPTR_SOCKOPT) - ACE_OSCALL (::read (handle, static_cast <char *> (buf), len), ssize_t, -1, result); + ACE_OSCALL (::read (handle, static_cast <char *> (buf), len), ssize_t, -result); # else - ACE_OSCALL (::read (handle, buf, len), ssize_t, -1, result); + ACE_OSCALL (::read (handle, buf, len), ssize_t, result); # endif /* ACE_HAS_CHARPTR_SOCKOPT */ # if !(defined (EAGAIN) && defined (EWOULDBLOCK) && EAGAIN == EWOULDBLOCK) @@ -833,10 +833,9 @@ ACE_OS::readlink (const char *path, char *buf, size_t bufsiz) ACE_UNUSED_ARG (bufsiz); ACE_NOTSUP_RETURN (-1); # elif defined(ACE_HAS_NONCONST_READLINK) - ACE_OSCALL_RETURN ( - ::readlink (const_cast <char *>(path), buf, bufsiz), ssize_t, -1); + return ::readlink (const_cast <char *>(path), buf, bufsiz); # else - ACE_OSCALL_RETURN (::readlink (path, buf, bufsiz), ssize_t, -1); + return ::readlink (path, buf, bufsiz); # endif /* ACE_LACKS_READLINK */ } @@ -852,7 +851,7 @@ ACE_OS::pipe (ACE_HANDLE fds[]) (::CreatePipe (&fds[0], &fds[1], 0, 0), ace_result_), int, -1); # else - ACE_OSCALL_RETURN (::pipe (fds), int, -1); + return ::pipe (fds); # endif /* ACE_LACKS_PIPE */ } @@ -863,7 +862,7 @@ ACE_OS::sbrk (intptr_t brk) ACE_UNUSED_ARG (brk); ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (::sbrk (brk), void *, 0); + return ::sbrk (brk); #endif /* ACE_LACKS_SBRK */ } @@ -875,7 +874,7 @@ ACE_OS::setgid (gid_t gid) ACE_UNUSED_ARG (gid); ACE_NOTSUP_RETURN (-1); # else - ACE_OSCALL_RETURN (::setgid (gid), int, -1); + return ::setgid (gid); # endif /* ACE_LACKS_SETGID */ } @@ -887,7 +886,7 @@ ACE_OS::setegid (gid_t gid) ACE_UNUSED_ARG (gid); ACE_NOTSUP_RETURN (-1); # else - ACE_OSCALL_RETURN (::setegid (gid), int, -1); + return ::setegid (gid); # endif /* ACE_LACKS_SETEGID */ } @@ -900,7 +899,7 @@ ACE_OS::setpgid (pid_t pid, pid_t pgid) ACE_UNUSED_ARG (pgid); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::setpgid (pid, pgid), int, -1); + return ::setpgid (pid, pgid); #endif /* ACE_LACKS_SETPGID */ } @@ -913,7 +912,7 @@ ACE_OS::setregid (gid_t rgid, gid_t egid) ACE_UNUSED_ARG (egid); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::setregid (rgid, egid), int, -1); + return ::setregid (rgid, egid); #endif /* ACE_LACKS_SETREGID */ } @@ -926,7 +925,7 @@ ACE_OS::setreuid (uid_t ruid, uid_t euid) ACE_UNUSED_ARG (euid); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::setreuid (ruid, euid), int, -1); + return ::setreuid (ruid, euid); #endif /* ACE_LACKS_SETREUID */ } @@ -937,7 +936,7 @@ ACE_OS::setsid () #if defined (ACE_LACKS_SETSID) ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::setsid (), int, -1); + return ::setsid (); # endif /* ACE_LACKS_SETSID */ } @@ -949,7 +948,7 @@ ACE_OS::setuid (uid_t uid) ACE_UNUSED_ARG (uid); ACE_NOTSUP_RETURN (-1); # else - ACE_OSCALL_RETURN (::setuid (uid), int, -1); + return ::setuid (uid); # endif /* ACE_LACKS_SETUID */ } @@ -961,7 +960,7 @@ ACE_OS::seteuid (uid_t uid) ACE_UNUSED_ARG (uid); ACE_NOTSUP_RETURN (-1); # else - ACE_OSCALL_RETURN (::seteuid (uid), int, -1); + return ::seteuid (uid); # endif /* ACE_LACKS_SETEUID */ } @@ -975,7 +974,7 @@ ACE_OS::sleep (u_int seconds) rqtp.tv_sec = seconds; rqtp.tv_nsec = 0L; //FUZZ: disable check_for_lack_ACE_OS - ACE_OSCALL_RETURN (::nanosleep (&rqtp, 0), int, -1); + return ::nanosleep (&rqtp, 0); //FUZZ: enable check_for_lack_ACE_OS #elif defined (ACE_LACKS_SLEEP) ACE_UNUSED_ARG (seconds); @@ -987,7 +986,7 @@ ACE_OS::sleep (u_int seconds) _time_delay (seconds * ACE_ONE_SECOND_IN_MSECS); return 0; #else - ACE_OSCALL_RETURN (::sleep (seconds), int, -1); + return ::sleep (seconds); #endif /* ACE_WIN32 */ } @@ -1004,7 +1003,7 @@ ACE_OS::sleep (const ACE_Time_Value &tv) #elif defined (ACE_HAS_CLOCK_GETTIME) timespec_t rqtp = tv; //FUZZ: disable check_for_lack_ACE_OS - ACE_OSCALL_RETURN (::nanosleep (&rqtp, 0), int, -1); + return ::nanosleep (&rqtp, 0); //FUZZ: enable check_for_lack_ACE_OS #else # if defined (ACE_HAS_NONCONST_SELECT_TIMEVAL) @@ -1012,12 +1011,12 @@ ACE_OS::sleep (const ACE_Time_Value &tv) // as a pointer to const. timeval tv_copy = tv; //FUZZ: disable check_for_lack_ACE_OS - ACE_OSCALL_RETURN (::select (0, 0, 0, 0, &tv_copy), int, -1); + return ::select (0, 0, 0, 0, &tv_copy); //FUZZ: enable check_for_lack_ACE_OS # else /* ! ACE_HAS_NONCONST_SELECT_TIMEVAL */ const timeval *tvp = tv; //FUZZ: disable check_for_lack_ACE_OS - ACE_OSCALL_RETURN (::select (0, 0, 0, 0, tvp), int, -1); + return ::select (0, 0, 0, 0, tvp); //FUZZ: enable check_for_lack_ACE_OS # endif /* ACE_HAS_NONCONST_SELECT_TIMEVAL */ #endif /* ACE_WIN32 */ @@ -1093,7 +1092,7 @@ ACE_OS::sysconf (int name) ACE_UNUSED_ARG (name); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::sysconf (name), long, -1); + return ::sysconf (name); #endif /* ACE_LACKS_SYSCONF */ } @@ -1102,7 +1101,7 @@ ACE_OS::sysinfo (int cmd, char *buf, long count) { ACE_OS_TRACE ("ACE_OS::sysinfo"); #if defined (ACE_HAS_SYSV_SYSINFO) - ACE_OSCALL_RETURN (::sysinfo (cmd, buf, count), long, -1); + return ::sysinfo (cmd, buf, count); #else ACE_UNUSED_ARG (cmd); ACE_UNUSED_ARG (buf); @@ -1157,8 +1156,7 @@ ACE_OS::truncate (const ACE_TCHAR *filename, } /* NOTREACHED */ #elif !defined (ACE_LACKS_TRUNCATE) - ACE_OSCALL_RETURN - (::truncate (ACE_TEXT_ALWAYS_CHAR (filename), offset), int, -1); + return ::truncate (ACE_TEXT_ALWAYS_CHAR (filename), offset); #else ACE_UNUSED_ARG (filename); ACE_UNUSED_ARG (offset); @@ -1217,7 +1215,7 @@ ACE_OS::unlink (const char *path) { ACE_OS_TRACE ("ACE_OS::unlink"); # if defined (ACE_HAS_NONCONST_UNLINK) - ACE_OSCALL_RETURN (::unlink (const_cast<char *> (path)), int, -1); + return ::unlink (const_cast<char *> (path)); # elif defined (ACE_HAS_WINCE) // @@ The problem is, DeleteFile is not actually equals to unlink. ;( ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::DeleteFile (ACE_TEXT_CHAR_TO_TCHAR (path)), ace_result_), @@ -1226,9 +1224,9 @@ ACE_OS::unlink (const char *path) ACE_UNUSED_ARG (path); ACE_NOTSUP_RETURN (-1); # elif defined (ACE_UNLINK_EQUIVALENT) - ACE_OSCALL_RETURN (ACE_UNLINK_EQUIVALENT (path), int, -1); + return ACE_UNLINK_EQUIVALENT (path); # else - ACE_OSCALL_RETURN (::unlink (path), int, -1); + return ::unlink (path); # endif /* ACE_HAS_NONCONST_UNLINK */ } @@ -1242,7 +1240,7 @@ ACE_OS::unlink (const wchar_t *path) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::DeleteFileW (path), ace_result_), int, -1); # elif defined (ACE_WIN32) - ACE_OSCALL_RETURN (::_wunlink (path), int, -1); + return ::_wunlink (path); # else ACE_Wide_To_Ascii npath (path); return ACE_OS::unlink (npath.char_rep ()); @@ -1268,9 +1266,9 @@ ACE_OS::write (ACE_HANDLE handle, const void *buf, size_t nbyte) return MQX_Filesystem::inst ().write (handle, reinterpret_cast<const unsigned char *> (buf), nbyte); #else # if defined (ACE_HAS_CHARPTR_SOCKOPT) - ACE_OSCALL_RETURN (::write (handle, static_cast <char *> (const_cast <void *> (buf)), nbyte), ssize_t, -1); + return ::write (handle, static_cast <char *> (const_cast <void *> (buf)), nbyte); # else - ACE_OSCALL_RETURN (::write (handle, buf, nbyte), ssize_t, -1); + return ::write (handle, buf, nbyte); # endif /* ACE_HAS_CHARPTR_SOCKOPT */ #endif /* ACE_WIN32 */ } diff --git a/ACE/ace/OS_NS_wchar.inl b/ACE/ace/OS_NS_wchar.inl index 0b11e61e303..3feee38ec13 100644 --- a/ACE/ace/OS_NS_wchar.inl +++ b/ACE/ace/OS_NS_wchar.inl @@ -9,7 +9,7 @@ ACE_OS::fgetwc (FILE* fp) ACE_UNUSED_ARG (fp); ACE_NOTSUP_RETURN (0); # else - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgetwc (fp), wint_t, WEOF); + return ACE_STD_NAMESPACE::fgetwc (fp); # endif /* ACE_LACKS_FGETWC */ } #endif /* ACE_HAS_WCHAR */ @@ -76,7 +76,7 @@ ACE_OS::ungetwc (wint_t c, FILE* fp) ACE_UNUSED_ARG (fp); ACE_NOTSUP_RETURN (0); # else - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::ungetwc (c, fp), wint_t, WEOF); + return ACE_STD_NAMESPACE::ungetwc (c, fp); # endif /* ACE_LACKS_FGETWC */ } #endif /* ACE_HAS_WCHAR */ diff --git a/ACE/ace/OS_TLI.h b/ACE/ace/OS_TLI.h index c1b0e40ec11..c8b82bfd10e 100644 --- a/ACE/ace/OS_TLI.h +++ b/ACE/ace/OS_TLI.h @@ -131,24 +131,8 @@ extern "C" ACE_BEGIN_VERSIONED_NAMESPACE_DECL -// This hack is needed to get around an odd and hard-to-reproduce problem -// with HP aC++. If struct sigaction is defined extern "C" and the sigaction -// function in namespace ACE_OS, the compiler sometimes gets confused. -// If we help it with this typedef, it's fine. User code should not use -// the ACE typedef - it will be removed without warning as soon as we can -// either drop support for the broken compilers or figure out how to reproduce -// it so it can be reported to HP and fixed. -// There's a similar hack in OS_TLI.h for struct t_optmgmt. -// Also see ChangeLog entries: -// Mon Jan 23 16:35:40 UTC 2006 Steve Huston <shuston@riverace.com> -// Mon Jan 23 22:08:56 UTC 2006 Steve Huston <shuston@riverace.com> -#if defined (__HP_aCC) && (__HP_aCC <= 37300) -typedef extern "C" struct t_optmgmt ACE_TOPTMGMT; -typedef extern "C" struct t_bind ACE_TBIND; -#else typedef struct t_optmgmt ACE_TOPTMGMT; typedef struct t_bind ACE_TBIND; -#endif /** * @namespace ACE_OS diff --git a/ACE/ace/OS_TLI.inl b/ACE/ace/OS_TLI.inl index 7104344cac6..e2bc18c830f 100644 --- a/ACE/ace/OS_TLI.inl +++ b/ACE/ace/OS_TLI.inl @@ -9,7 +9,7 @@ ACE_INLINE int t_accept (ACE_HANDLE handle, ACE_HANDLE reshandle, struct t_call *call) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_accept (handle, reshandle, call), int, -1); + return ::t_accept (handle, reshandle, call); #else ACE_UNUSED_ARG (call); ACE_UNUSED_ARG (reshandle); @@ -27,11 +27,10 @@ t_alloc (ACE_HANDLE handle, int struct_type, int fields) // XPG5 changes t_alloc() return from char* to void*, so ACE_OSCALL_RETURN // doesn't compile correctly. char *result; - ACE_OSCALL (::t_alloc (handle, struct_type, fields), char *, 0, result); + ACE_OSCALL (::t_alloc (handle, struct_type, fields), char *, result); return result; # else - ACE_OSCALL_RETURN (::t_alloc (handle, struct_type, fields), - char *, 0); + return ::t_alloc (handle, struct_type, fields); # endif /* XPG4 vs XPG5 */ #else ACE_UNUSED_ARG (fields); @@ -46,7 +45,7 @@ ACE_INLINE int t_bind (ACE_HANDLE handle, ACE_TBIND *req, ACE_TBIND *ret) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_bind (handle, req, ret), int, -1); + return ::t_bind (handle, req, ret); #else ACE_UNUSED_ARG (ret); ACE_UNUSED_ARG (req); @@ -60,7 +59,7 @@ ACE_INLINE int t_close (ACE_HANDLE handle) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_close (handle), int, -1); + return ::t_close (handle); #else ACE_UNUSED_ARG (handle); @@ -74,7 +73,7 @@ t_connect(ACE_HANDLE fildes, struct t_call *rcvcall) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_connect (fildes, sndcall, rcvcall), int, -1); + return ::t_connect (fildes, sndcall, rcvcall); #else ACE_UNUSED_ARG (fildes); ACE_UNUSED_ARG (sndcall); @@ -102,9 +101,9 @@ ACE_INLINE int t_free (char *ptr, int struct_type) { #if defined (ACE_HAS_TLI) - if (ptr == 0) + if (!ptr) return 0; - ACE_OSCALL_RETURN (::t_free (ptr, struct_type), int, -1); + return ::t_free (ptr, struct_type); #else ACE_UNUSED_ARG (struct_type); ACE_UNUSED_ARG (ptr); @@ -117,7 +116,7 @@ ACE_INLINE int t_getinfo (ACE_HANDLE handle, struct t_info *info) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_getinfo (handle, info), int, -1); + return ::t_getinfo (handle, info); #else ACE_UNUSED_ARG (info); ACE_UNUSED_ARG (handle); @@ -166,7 +165,7 @@ t_getname (ACE_HANDLE handle, struct netbuf *namep, int type) return 0; #elif defined (ACE_HAS_SVR4_TLI) - ACE_OSCALL_RETURN (::t_getname (handle, namep, type), int, -1); + return ::t_getname (handle, namep, type); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (namep); @@ -180,7 +179,7 @@ ACE_INLINE int t_getstate (ACE_HANDLE handle) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_getstate (handle), int, -1); + return ::t_getstate (handle); #else ACE_UNUSED_ARG (handle); @@ -192,7 +191,7 @@ ACE_INLINE int t_listen (ACE_HANDLE handle, struct t_call *call) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_listen (handle, call), int, -1); + return ::t_listen (handle, call); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (call); @@ -205,7 +204,7 @@ ACE_INLINE int t_look (ACE_HANDLE handle) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_look (handle), int, -1); + return ::t_look (handle); #else ACE_UNUSED_ARG (handle); @@ -217,7 +216,7 @@ ACE_INLINE ACE_HANDLE t_open (char *path, int oflag, struct t_info *info) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_open (path, oflag, info), ACE_HANDLE, ACE_INVALID_HANDLE); + return ::t_open (path, oflag, info); #else ACE_UNUSED_ARG (path); ACE_UNUSED_ARG (oflag); @@ -231,7 +230,7 @@ ACE_INLINE int t_optmgmt (ACE_HANDLE handle, ACE_TOPTMGMT *req, ACE_TOPTMGMT *ret) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_optmgmt (handle, req, ret), int, -1); + return ::t_optmgmt (handle, req, ret); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (req); @@ -248,8 +247,7 @@ t_rcv (ACE_HANDLE handle, int *flags) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_rcv (handle, buf, nbytes, flags), - int, -1); + return ::t_rcv (handle, buf, nbytes, flags); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (buf); @@ -264,7 +262,7 @@ ACE_INLINE int t_rcvdis (ACE_HANDLE handle, struct t_discon *discon) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_rcvdis (handle, discon), int, -1); + return ::t_rcvdis (handle, discon); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (discon); @@ -277,7 +275,7 @@ ACE_INLINE int t_rcvrel (ACE_HANDLE handle) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_rcvrel (handle), int, -1); + return ::t_rcvrel (handle); #else ACE_UNUSED_ARG (handle); @@ -291,8 +289,7 @@ t_rcvudata (ACE_HANDLE handle, int *flags) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_rcvudata (handle, unitdata, flags), - int, -1); + return ::t_rcvudata (handle, unitdata, flags); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (unitdata); @@ -306,7 +303,7 @@ ACE_INLINE int t_rcvuderr (ACE_HANDLE handle, struct t_uderr *uderr) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_rcvuderr (handle, uderr), int, -1); + return ::t_rcvuderr (handle, uderr); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (uderr); @@ -322,7 +319,7 @@ t_snd (ACE_HANDLE handle, int flags) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_snd (handle, (char *) buf, nbytes, flags), int, -1); + return ::t_snd (handle, (char *) buf, nbytes, flags); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (buf); @@ -337,7 +334,7 @@ ACE_INLINE int t_snddis (ACE_HANDLE handle, struct t_call *call) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_snddis (handle, call), int, -1); + return ::t_snddis (handle, call); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (call); @@ -350,7 +347,7 @@ ACE_INLINE int t_sndrel (ACE_HANDLE handle) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_sndrel (handle), int, -1); + return ::t_sndrel (handle); #else ACE_UNUSED_ARG (handle); @@ -362,7 +359,7 @@ ACE_INLINE int t_sync (ACE_HANDLE handle) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_sync (handle), int, -1); + return ::t_sync (handle); #else ACE_UNUSED_ARG (handle); @@ -374,7 +371,7 @@ ACE_INLINE int t_unbind (ACE_HANDLE handle) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_unbind (handle), int, -1); + return ::t_unbind (handle); #else ACE_UNUSED_ARG (handle); diff --git a/ACE/ace/OS_Thread_Adapter.cpp b/ACE/ace/OS_Thread_Adapter.cpp index 6074974a232..514cc692a40 100644 --- a/ACE/ace/OS_Thread_Adapter.cpp +++ b/ACE/ace/OS_Thread_Adapter.cpp @@ -15,18 +15,18 @@ ACE_OS_Thread_Adapter::ACE_OS_Thread_Adapter ( ACE_THR_FUNC user_func , void *arg , ACE_THR_C_FUNC entry_point -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) , ACE_SEH_EXCEPT_HANDLER selector , ACE_SEH_EXCEPT_HANDLER handler -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ , long cancel_flags ) : ACE_Base_Thread_Adapter (user_func, arg, entry_point , 0 -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) , selector , handler -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ , cancel_flags ) { @@ -108,13 +108,13 @@ ACE_OS_Thread_Adapter::invoke () } } -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) ACE_SEH_EXCEPT (ACE_OS_Object_Manager::seh_except_selector ()( (void *) GetExceptionInformation ())) { ACE_OS_Object_Manager::seh_except_handler ()(0); } -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ } ACE_SEH_FINALLY diff --git a/ACE/ace/OS_Thread_Adapter.h b/ACE/ace/OS_Thread_Adapter.h index dc994327dc8..738e5e88230 100644 --- a/ACE/ace/OS_Thread_Adapter.h +++ b/ACE/ace/OS_Thread_Adapter.h @@ -44,12 +44,11 @@ public: ACE_OS_Thread_Adapter (ACE_THR_FUNC user_func, void *arg, ACE_THR_C_FUNC entry_point = (ACE_THR_C_FUNC) ACE_THREAD_ADAPTER_NAME -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) , ACE_SEH_EXCEPT_HANDLER selector = 0 , ACE_SEH_EXCEPT_HANDLER handler = 0 -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - , long cancel_flags = 0 - ); +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ + , long cancel_flags = 0); /** * Execute the @a user_func_ with the @a arg. This function deletes diff --git a/ACE/ace/Object_Manager.cpp b/ACE/ace/Object_Manager.cpp index eb8aaf462e7..a079b2d467d 100644 --- a/ACE/ace/Object_Manager.cpp +++ b/ACE/ace/Object_Manager.cpp @@ -271,10 +271,10 @@ ACE_Object_Manager::init () // And this will catch all unhandled exceptions. SetUnhandledExceptionFilter (&ACE_UnhandledExceptionFilter); -#if !defined (__MINGW32__) +#if !defined (ACE_LACKS_SET_ABORT_BEHAVIOR) // And this will stop the abort system call from being treated as a crash _set_abort_behavior( 0, _CALL_REPORTFAULT); -#endif /* !__MINGW32__ */ +#endif /* !ACE_LACKS_SET_ABORT_BEHAVIOR */ // Note the following fix was derived from that proposed by Jochen Kalmbach // http://blog.kalmbachnet.de/?postid=75 diff --git a/ACE/ace/Object_Manager_Base.cpp b/ACE/ace/Object_Manager_Base.cpp index c38e811c73b..0cf1b6c9e89 100644 --- a/ACE/ace/Object_Manager_Base.cpp +++ b/ACE/ace/Object_Manager_Base.cpp @@ -11,7 +11,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) int ACE_SEH_Default_Exception_Selector (void *) { // this is only windows and only used here, @@ -23,7 +23,7 @@ int ACE_SEH_Default_Exception_Handler (void *) { return 0; } -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ #if defined (ACE_HAS_ALLOC_HOOKS) # define ACE_OS_PREALLOCATE_OBJECT(TYPE, ID)\ @@ -93,10 +93,10 @@ ACE_OS_Object_Manager::ACE_OS_Object_Manager () : default_mask_ (0) , thread_hook_ (0) , exit_info_ () -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) , seh_except_selector_ (ACE_SEH_Default_Exception_Selector) , seh_except_handler_ (ACE_SEH_Default_Exception_Handler) -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ { // If instance_ was not 0, then another ACE_OS_Object_Manager has // already been instantiated (it is likely to be one initialized by @@ -135,7 +135,7 @@ ACE_OS_Object_Manager::thread_hook () return ACE_OS_Object_Manager::instance ()->thread_hook_; } -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) ACE_SEH_EXCEPT_HANDLER ACE_OS_Object_Manager::seh_except_selector (void) { @@ -169,7 +169,7 @@ ACE_OS_Object_Manager::seh_except_handler (ACE_SEH_EXCEPT_HANDLER n) instance->seh_except_handler_ = n; return retv; } -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ ACE_Thread_Hook * ACE_OS_Object_Manager::thread_hook (ACE_Thread_Hook *new_thread_hook) diff --git a/ACE/ace/Object_Manager_Base.h b/ACE/ace/Object_Manager_Base.h index 619311eb249..22fa9d20602 100644 --- a/ACE/ace/Object_Manager_Base.h +++ b/ACE/ace/Object_Manager_Base.h @@ -177,14 +177,14 @@ public: /// Returns the existing thread hook and assign a <new_thread_hook>. static ACE_Thread_Hook *thread_hook (ACE_Thread_Hook *new_thread_hook); -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) /// Get/Set TSS exception action. - static ACE_SEH_EXCEPT_HANDLER seh_except_selector (void); + static ACE_SEH_EXCEPT_HANDLER seh_except_selector (); static ACE_SEH_EXCEPT_HANDLER seh_except_selector (ACE_SEH_EXCEPT_HANDLER); - static ACE_SEH_EXCEPT_HANDLER seh_except_handler (void); + static ACE_SEH_EXCEPT_HANDLER seh_except_handler (); static ACE_SEH_EXCEPT_HANDLER seh_except_handler (ACE_SEH_EXCEPT_HANDLER); -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ public: // = Applications shouldn't use these so they're hidden here. @@ -220,12 +220,12 @@ public: /// For at_exit support. ACE_OS_Exit_Info exit_info_; -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) /// These handlers determine how a thread handles win32 structured /// exception. ACE_SEH_EXCEPT_HANDLER seh_except_selector_; ACE_SEH_EXCEPT_HANDLER seh_except_handler_; -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ /// For use by init () and fini (), to consolidate error reporting. static void print_error_message (unsigned int line_number, const ACE_TCHAR *message); diff --git a/ACE/ace/README b/ACE/ace/README index 59c493a026e..d327f232334 100644 --- a/ACE/ace/README +++ b/ACE/ace/README @@ -104,8 +104,6 @@ ACE_USES_ASM_SYMBOL_IN_DLSYM Platform uses assembly symbols instead of C symbols in dlsym() ACE_USES_STATIC_MFC When linking MFC as a static library is desired -ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB Platform has its standard c++ - library in the namespace std. ACE_USES_EXPLICIT_STD_NAMESPACE Set this when ::fclose doesn't work and you have to explicitly specify the std @@ -195,7 +193,7 @@ ACE_HAS_STDARG_THR_DEST Platform has void (*)(...) prototype for pthread_key_create() destructor (e.g., LynxOS). -ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS Platform/compiler supports +ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS Platform/compiler supports Win32 structural exceptions ACE_HAS_4_4BSD_SENDMSG_RECVMSG Platform has BSD 4.4 sendmsg()/recvmsg() APIs. @@ -477,10 +475,6 @@ ACE_HAS_XPG4_MULTIBYTE_CHAR Platform has support for classification. ACE_HAS_REGEX Platform supports the POSIX regular expression library -ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE For OpenBSD: The dlsym call - segfaults when passed an invalid - handle. Other platforms handle - this more gracefully. ACE_HAS_SELECT_H Platform has special header for select(). ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL For Win32: Use Select_Reactor as default implementation of @@ -529,8 +523,6 @@ ACE_HAS_SSIZE_T Compiler supports the ssize_t typedef ACE_HAS_STHREADS Platform supports Solaris threads -ACE_HAS_STANDARD_CPP_LIBRARY Platform/compiler supports - Standard C++ Library ACE_HAS_STRBUF_T Compiler/platform supports struct strbuf ACE_HAS_STRDUP_EMULATION Use ACE's strdup() emulation (even @@ -545,9 +537,6 @@ ACE_HAS_STRNLEN Platform supports strnlen(3). ACE_HAS_STREAMS Platform supports STREAMS ACE_HAS_STREAM_PIPES Platform supports STREAM pipes ACE_HAS_STRICT Use the STRICT compilation mode on Win32. -ACE_HAS_STRING_CLASS Platform/Compiler supports a - String class (e.g., GNU or - Win32). ACE_HAS_STRUCT_NETDB_DATA Compiler/platform has strange hostent API for socket *_r() calls @@ -738,7 +727,7 @@ ACE_HRTIME_T_IS_BASIC_TYPE ACE_hrtime_t is a basic type that doesn't require ACE_U64_TO_U32 conversion ACE_LACKS_ACCESS Platform lacks access() (e.g., - VxWorks and Chorus) + VxWorks) ACE_LACKS_ACE_IOSTREAM Platform can not build ace/IOStream{,_T}.cpp. This does not necessarily mean that @@ -779,18 +768,17 @@ ACE_LACKS_INLINE_FUNCTIONS Platform can't handle "inline" keyword correctly. ACE_LACKS_EXEC Platform lacks the exec() family of system calls (e.g., - Win32, VxWorks, Chorus) + Win32, VxWorks) ACE_LACKS_FILELOCKS Platform lacks file locking mechanism ACE_LACKS_FORK Platform lacks the fork() system call (e.g., Win32, - VxWorks, Chorus) + VxWorks) ACE_LACKS_GETPGID Platform lacks getpgid() call - (e.g., Win32, Chorus, and + (e.g., Win32, and FreeBSD). ACE_LACKS_GETSERVBYNAME Platforms lacks - getservbyname() (e.g., VxWorks - and Chorus). + getservbyname() (e.g., VxWorks) ACE_LACKS_GETIPNODEBYADDR Platform lacks getipnodebyaddr(). ACE_LACKS_GETIPNODEBYNAME Platform lacks getipnodebyname(). ACE_LACKS_INET_ATON Platform lacks the inet_aton() @@ -799,7 +787,7 @@ ACE_LACKS_IOSTREAM_FX iostream header does not declare ipfx (), opfx (), etc. ACE_LACKS_KEY_T Platform lacks key_t (e.g., - Chorus, VxWorks, Win32) + VxWorks, Win32) ACE_LACKS_LINEBUFFERED_STREAMBUF Platform lacks streambuf "linebuffered ()". ACE_LACKS_LSTAT Platform lacks the lstat() function. @@ -807,9 +795,9 @@ ACE_LACKS_MADVISE Platform lacks madvise() (e.g., Linux) ACE_LACKS_MALLOC_H Platform lacks malloc.h ACE_LACKS_MEMORY_H Platform lacks memory.h (e.g., - VxWorks and Chorus) + VxWorks) ACE_LACKS_MKFIFO Platform lacks mkfifo() e.g., - VxWorks, Chorus, pSoS, and WinNT. + VxWorks, pSoS, and WinNT. ACE_LACKS_MKTEMP Platform lacks the mktemp() function. ACE_LACKS_MKSTEMP Platform lacks the mkstemp() function. ACE_LACKS_MMAP The platform doesn't have @@ -831,7 +819,7 @@ ACE_LACKS_MSYNC Platform lacks msync() (e.g., ACE_LACKS_MUTEXATTR_PSHARED Platform lacks pthread_mutexattr_setpshared(). ACE_LACKS_NAMED_POSIX_SEM Platform lacks named POSIX - semaphores (e.g., Chorus) + semaphores ACE_LACKS_NETDB_REENTRANT_FUNCTIONS Platform does not support reentrant netdb functions (getprotobyname_r, @@ -874,7 +862,7 @@ ACE_LACKS_READV Platform doesn't define readv, ACE_LACKS_RENAME Platform lacks rename(). ACE_LACKS_RLIMIT Platform/compiler lacks {get,set}rlimit() function - (e.g., VxWorks, Chorus, and + (e.g., VxWorks, and SCO UNIX) ACE_LACKS_RLIMIT_PROTOTYPE Platform/compiler lacks {get,set}rlimit() prototypes @@ -908,12 +896,11 @@ ACE_LACKS_SETSCHED Platform lacks pthread_attr_setsched() (e.g. MVS) ACE_LACKS_SIGACTION Platform lacks struct - sigaction (e.g., Win32 and - Chorus) + sigaction (e.g., Win32) ACE_LACKS_SIGNED_CHAR Platform lacks "signed char" type (broken!) ACE_LACKS_SIGSET Platform lacks signal sets - (e.g., Chorus and Win32) + (e.g., Win32) ACE_LACKS_STRPTIME Platform/compiler lacks the strptime() function. ACE_LACKS_WCSCHR Platform/compiler lacks wcschr() @@ -923,7 +910,7 @@ ACE_LACKS_WCSRCHR Platform/compiler lacks wcsrchr() ACE_LACKS_SWAB Platform/compiler lacks swab () function. ACE_LACKS_SYS_MSG_H Platform lacks sys/msg.h - (e.g., Chorus and VxWorks) + (e.g., VxWorks) ACE_LACKS_SYS_PARAM_H Platform lacks <sys/param.h> (e.g., MVS) ACE_LACKS_SENDMSG Platform lacks sendmsg() @@ -992,8 +979,7 @@ ACE_LACKS_UNISTD_H Platform lacks the unistd.h ACE_LACKS_UNIX_DOMAIN_SOCKETS ACE platform has no UNIX domain sockets ACE_LACKS_UNIX_SIGNALS Platform lacks full signal - support (e.g., Win32 and - Chorus). + support (e.g., Win32). ACE_LACKS_UNSIGNEDLONGLONG_T Compiler/platform does not support the unsigned long long datatype. diff --git a/ACE/ace/SStringfwd.h b/ACE/ace/SStringfwd.h index 95aa9591c7c..aaa1b5b8865 100644 --- a/ACE/ace/SStringfwd.h +++ b/ACE/ace/SStringfwd.h @@ -23,12 +23,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (defined (__HP_aCC) && (36300 <= __HP_aCC) && (__HP_aCC <= 37300)) -// Due to a bug in the aCC 3.xx compiler need to define the ACE_String_Base -// template before we can typedef ACE_CString -# include "ace/String_Base.h" -#endif /* __HP_aCC */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class ACE_CHAR_T> class ACE_String_Base; // Forward declaration. diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp index d04c2b577d8..04ce825ce6b 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -1473,6 +1473,9 @@ ip_check (int &ipvn_enabled, int pf) { #if defined (ACE_WIN32) + static bool recursing = false; + if (recursing) return 1; + // as of the release of Windows 2008, even hosts that have IPv6 interfaces disabled // will still permit the creation of a PF_INET6 socket, thus rendering the socket // creation test inconsistent. The recommended solution is to get the list of @@ -1480,14 +1483,22 @@ ip_check (int &ipvn_enabled, int pf) ACE_INET_Addr *if_addrs = 0; size_t if_cnt = 0; - ipvn_enabled = 1; // assume enabled to avoid recursion during interface lookup. + // assume enabled to avoid recursion during interface lookup. + recursing = true; ACE::get_ip_interfaces (if_cnt, if_addrs); - ipvn_enabled = 0; - for (size_t i = 0; ipvn_enabled == 0 && i < if_cnt; i++) + recursing = false; + + bool found = false; + for (size_t i = 0; !found && i < if_cnt; i++) { - ipvn_enabled = (if_addrs[i].get_type () == pf); + found = (if_addrs[i].get_type () == pf); } delete [] if_addrs; + + // If the list of interfaces is empty, we've tried too quickly. Assume enabled, but don't cache the result + if (!if_cnt) return 1; + + ipvn_enabled = found ? 1 : 0; #else // Determine if the kernel has IPv6 support by attempting to // create a PF_INET6 socket and see if it fails. diff --git a/ACE/ace/Stack_Trace.cpp b/ACE/ace/Stack_Trace.cpp index 2aa29079757..3cf26a354fd 100644 --- a/ACE/ace/Stack_Trace.cpp +++ b/ACE/ace/Stack_Trace.cpp @@ -741,12 +741,6 @@ ACE_Stack_Trace::generate_trace (ssize_t starting_frame_offset, void ACE_Stack_Trace::generate_trace (ssize_t, size_t) { -// Call determine_starting_frame() on HP aCC build to resolve declared -// method never referenced warning. -#if defined (__HP_aCC) - size_t starting_frame = determine_starting_frame (0, 0); -#endif - ACE_OS::strcpy (&this->buf_[0], UNSUPPORTED); } #endif diff --git a/ACE/ace/TTY_IO.cpp b/ACE/ace/TTY_IO.cpp index b471555d1a8..e18f5e6d107 100644 --- a/ACE/ace/TTY_IO.cpp +++ b/ACE/ace/TTY_IO.cpp @@ -36,6 +36,7 @@ ACE_TTY_IO::Serial_Params::Serial_Params () readmincharacters = 0; readtimeoutmsec = 10000; paritymode = ACE_TTY_IO_NONE; + inpckenb = true; ctsenb = false; rtsenb = 0; xinenb = false; @@ -243,14 +244,20 @@ int ACE_TTY_IO::control (Control_Mode cmd, Serial_Params *arg) const devpar.c_cflag |= PARENB; devpar.c_cflag |= PARODD; devpar.c_iflag &= ~IGNPAR; - devpar.c_iflag |= INPCK | PARMRK; + if(arg->inpckenb) + devpar.c_iflag |= INPCK | PARMRK; + else + devpar.c_iflag &= ~(INPCK | PARMRK); } else if (ACE_OS::strcasecmp (arg->paritymode, ACE_TTY_IO_EVEN) == 0) { devpar.c_cflag |= PARENB; devpar.c_cflag &= ~PARODD; devpar.c_iflag &= ~IGNPAR; - devpar.c_iflag |= INPCK | PARMRK; + if(arg->inpckenb) + devpar.c_iflag |= INPCK | PARMRK; + else + devpar.c_iflag &= ~(INPCK | PARMRK); } else if (ACE_OS::strcasecmp (arg->paritymode, ACE_TTY_IO_NONE) == 0) { @@ -301,6 +308,8 @@ int ACE_TTY_IO::control (Control_Mode cmd, Serial_Params *arg) const if (arg->databits < 8) devpar.c_iflag |= ISTRIP; + else + devpar.c_iflag &= ~ISTRIP; #if defined (IGNBRK) // If device is not a modem set to ignore break points @@ -346,6 +355,21 @@ int ACE_TTY_IO::control (Control_Mode cmd, Serial_Params *arg) const devpar.c_lflag &= ~ISIG; #endif /* ISIG */ +#if defined (IGNCR) + // Do not discard CR characters + devpar.c_iflag &= ~IGNCR; +#endif /* IGNCR */ + +#if defined (ICRNL) + // Disable CR to NL conversion + devpar.c_iflag &= ~ICRNL; +#endif /* ICRNL */ + +#if defined (INLCR) + // Disable NL to CR conversion + devpar.c_iflag &= ~INLCR; +#endif /* INLCR */ + #if defined (OPOST) // Disable post-processing of output data devpar.c_oflag &= ~OPOST; diff --git a/ACE/ace/TTY_IO.h b/ACE/ace/TTY_IO.h index 5b2a414fcbc..323e310f78c 100644 --- a/ACE/ace/TTY_IO.h +++ b/ACE/ace/TTY_IO.h @@ -66,6 +66,9 @@ public: "odd" parity. Additionally Win32 supports "mark" and "space" parity modes. */ const char *paritymode; + /** Enable/disable input parity checking. This option is only applicable + on systems which support the POSIX termios API */ + bool inpckenb; /** Enable & set CTS mode. Note that RTS & CTS are enabled/disabled together on some systems (RTS/CTS is enabled if either <code>ctsenb</code> or <code>rtsenb</code> is set). */ diff --git a/ACE/ace/Thread_Adapter.cpp b/ACE/ace/Thread_Adapter.cpp index 024827d01a3..ec43c7bc2d9 100644 --- a/ACE/ace/Thread_Adapter.cpp +++ b/ACE/ace/Thread_Adapter.cpp @@ -16,23 +16,21 @@ ACE_Thread_Adapter::ACE_Thread_Adapter (ACE_THR_FUNC user_func, ACE_THR_C_FUNC entry_point, ACE_Thread_Manager *tm, ACE_Thread_Descriptor *td -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) , ACE_SEH_EXCEPT_HANDLER selector, ACE_SEH_EXCEPT_HANDLER handler -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - , long cancel_flags - ) +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ + , long cancel_flags) : ACE_Base_Thread_Adapter ( user_func , arg , entry_point , td -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) , selector , handler -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - , cancel_flags - ) +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ + , cancel_flags) , thr_mgr_ (tm) { ACE_OS_TRACE ("ACE_Thread_Adapter::ACE_Thread_Adapter"); @@ -161,13 +159,13 @@ ACE_Thread_Adapter::invoke_i () status = (*func) (arg); } -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) ACE_SEH_EXCEPT (ACE_OS_Object_Manager::seh_except_selector ()( (void *) GetExceptionInformation ())) { ACE_OS_Object_Manager::seh_except_handler ()(0); } -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ } ACE_SEH_FINALLY diff --git a/ACE/ace/Thread_Adapter.h b/ACE/ace/Thread_Adapter.h index a0e6fe6a5e4..f5c778b3c4d 100644 --- a/ACE/ace/Thread_Adapter.h +++ b/ACE/ace/Thread_Adapter.h @@ -50,12 +50,11 @@ public: ACE_THR_C_FUNC entry_point = (ACE_THR_C_FUNC) ACE_THREAD_ADAPTER_NAME, ACE_Thread_Manager *thr_mgr = 0, ACE_Thread_Descriptor *td = 0 -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) , ACE_SEH_EXCEPT_HANDLER selector = 0, ACE_SEH_EXCEPT_HANDLER handler = 0 -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - , long cancel_flags = 0 - ); +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ + , long cancel_flags = 0); /** * Execute the <user_func_> with the <arg>. This function deletes diff --git a/ACE/ace/Thread_Manager.cpp b/ACE/ace/Thread_Manager.cpp index af2deb3ae6a..0c462ad96fb 100644 --- a/ACE/ace/Thread_Manager.cpp +++ b/ACE/ace/Thread_Manager.cpp @@ -594,7 +594,7 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func, new_thr_desc->reset (this); ACE_Thread_Adapter *thread_args = 0; -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +# if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) ACE_NEW_RETURN (thread_args, ACE_Thread_Adapter (func, args, @@ -614,7 +614,7 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func, new_thr_desc.get (), flags), -1); -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +# endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ std::unique_ptr <ACE_Base_Thread_Adapter> auto_thread_args (static_cast<ACE_Base_Thread_Adapter *> (thread_args)); ACE_TRACE ("ACE_Thread_Manager::spawn_i"); @@ -1784,7 +1784,7 @@ ACE_Thread_Manager::wait (const ACE_Time_Value *timeout, #if !defined (ACE_HAS_VXTHREADS) // @@ VxWorks doesn't support thr_join (yet.) We are working - // on our implementation. Chorus'es thr_join seems broken. + // on our implementation. ACE_Thread_Descriptor_Base *item = 0; while ((item = term_thr_list_copy.delete_head ()) != 0) diff --git a/ACE/ace/Time_Value.cpp b/ACE/ace/Time_Value.cpp index 6e8678860fb..292c5a5d310 100644 --- a/ACE/ace/Time_Value.cpp +++ b/ACE/ace/Time_Value.cpp @@ -12,12 +12,7 @@ #include "ace/If_Then_Else.h" #include "ace/OS_NS_math.h" #include "ace/Time_Policy.h" - -#ifdef ACE_HAS_CPP98_IOSTREAMS -# include <ostream> -# include <iomanip> -#endif /* ACE_HAS_CPP98_IOSTREAMS */ - +#include <iomanip> #include <cstdlib> #include <cmath> @@ -306,8 +301,7 @@ ACE_Time_Value::operator *= (double d) return *this; } -#ifdef ACE_HAS_CPP98_IOSTREAMS -ostream &operator<<(ostream &o, const ACE_Time_Value &v) +std::ostream &operator<<(std::ostream &o, const ACE_Time_Value &v) { char const oldFiller = o.fill (); o.fill ('0'); @@ -330,6 +324,5 @@ ostream &operator<<(ostream &o, const ACE_Time_Value &v) o.fill (oldFiller); return o; } -#endif /* ACE_HAS_CPP98_IOSTREAMS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Time_Value.h b/ACE/ace/Time_Value.h index 8e1f7de6383..dd2871bd4ee 100644 --- a/ACE/ace/Time_Value.h +++ b/ACE/ace/Time_Value.h @@ -20,8 +20,9 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/os_include/os_time.h" -#include <chrono> #include "ace/Truncate.h" +#include <chrono> +#include <ostream> // Define some helpful constants. // Not type-safe, and signed. For backward compatibility. @@ -32,9 +33,6 @@ suseconds_t const ACE_ONE_SECOND_IN_USECS = 1000000; // needed for ACE_UINT64 #include "ace/Basic_Types.h" -// needed to determine if iostreams are present -#include "ace/iosfwd.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** @@ -460,9 +458,7 @@ private: #endif /* ACE_HAS_TIME_T_LONG_MISMATCH */ }; -#ifdef ACE_HAS_CPP98_IOSTREAMS -extern ACE_Export ostream &operator<<( ostream &o, const ACE_Time_Value &v ); -#endif +extern ACE_Export std::ostream &operator<<(std::ostream &o, const ACE_Time_Value &v ); ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/XML_Utils/XML_Helper.tpp b/ACE/ace/XML_Utils/XML_Helper.tpp index 78d28b9cfd3..b8e6bd7d6a6 100644 --- a/ACE/ace/XML_Utils/XML_Helper.tpp +++ b/ACE/ace/XML_Utils/XML_Helper.tpp @@ -64,8 +64,6 @@ namespace XML if (this->initialized_) return; - // CIAO_DEBUG ((LM_TRACE, CLINFO - //"XML_Helper<>::is_initialized - Initializing the Xerces runtime \n")); // Initialize the Xerces run-time try { diff --git a/ACE/ace/ace_wchar.h b/ACE/ace/ace_wchar.h index f6a73d9704f..832e43ea8db 100644 --- a/ACE/ace/ace_wchar.h +++ b/ACE/ace/ace_wchar.h @@ -38,15 +38,12 @@ # elif defined (ACE_OPENVMS) # include /**/ <wchar.h> # include /**/ <wctype.h> -# elif defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \ - (ACE_HAS_STANDARD_CPP_LIBRARY != 0) -# include /**/ <cwchar> -# include /**/ <cwctype> # elif defined (ACE_HAS_WINCE) # include /**/ <wtypes.h> # else -# include /**/ <wchar.h> -# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ +# include /**/ <cwchar> +# include /**/ <cwctype> +# endif /* ACE_VXWORKS */ #endif /* ACE_HAS_WCHAR */ #if defined (ACE_HAS_ICONV) diff --git a/ACE/ace/config-aix-5.x.h b/ACE/ace/config-aix-5.x.h index 31c17376ff1..afe100a524c 100644 --- a/ACE/ace/config-aix-5.x.h +++ b/ACE/ace/config-aix-5.x.h @@ -74,8 +74,6 @@ # undef WIFEXITED # undef WEXITSTATUS -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_HAS_CUSTOM_EXPORT_MACROS # define ACE_Proper_Export_Flag @@ -86,9 +84,6 @@ # define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) extern template class SINGLETON_TYPE < CLASS, LOCK >; #elif defined (__GNUG__) - // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so - // this must appear before its #include. -# define ACE_HAS_STRING_CLASS # include "ace/config-g++-common.h" diff --git a/ACE/ace/config-all.h b/ACE/ace/config-all.h index c14f89c2a93..53925b24e02 100644 --- a/ACE/ace/config-all.h +++ b/ACE/ace/config-all.h @@ -82,6 +82,16 @@ # define ACE_HAS_MONITOR_POINTS 0 #endif +// For all compilers we require the std library to be in the std namespace +#if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) +#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 +#endif + +// We require that the standard C++ library is support +#if !defined (ACE_HAS_STANDARD_CPP_LIBRARY) +# define ACE_HAS_STANDARD_CPP_LIBRARY 1 +#endif + // Define ACE_NEW_THROWS_EXCEPTIONS for all compilers, we // expect all compilers to do so #if !defined (ACE_NEW_THROWS_EXCEPTIONS) @@ -94,6 +104,18 @@ # define ACE_HAS_NEW_NOTHROW #endif /* ACE_HAS_NEW_NOTHROW */ +// We require the platform to have a string class +#if !defined (ACE_HAS_STRING_CLASS) +# define ACE_HAS_STRING_CLASS +#endif /* ACE_HAS_STRING_CLASS */ + +// ACE 7.0.3 renamed this macro, defining the old name for +// backwards compatibility +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) +# define ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ + + // These includes are here to avoid circular dependencies. // Keep this at the bottom of the file. It contains the main macros. #include "ace/OS_main.h" diff --git a/ACE/ace/config-android.h b/ACE/ace/config-android.h index ea367836baf..c20fde90c03 100644 --- a/ACE/ace/config-android.h +++ b/ACE/ace/config-android.h @@ -156,8 +156,6 @@ # define TEST_DIR "/data" #endif -#define ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE - #if !defined (ACE_AS_STATIC_LIBS) # if (__GNUC__ == 4 && __GNUC_MINOR__ == 4) # error Shared library support is not possible with GCC 4.4.x diff --git a/ACE/ace/config-cygwin32.h b/ACE/ace/config-cygwin32.h index 6884680e93f..29569a216fe 100644 --- a/ACE/ace/config-cygwin32.h +++ b/ACE/ace/config-cygwin32.h @@ -62,10 +62,6 @@ // It's there on all libc 5 systems I checked. #include /**/ <features.h> -// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so -// this must appear before its #include. -#define ACE_HAS_STRING_CLASS - #if defined (__GNUG__) # include "ace/config-g++-common.h" #else diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h index 6ae80087860..e45bf1b7d0c 100644 --- a/ACE/ace/config-g++-common.h +++ b/ACE/ace/config-g++-common.h @@ -14,10 +14,7 @@ #define ACE_CC_MINOR_VERSION __GNUC_MINOR__ #define ACE_CC_BETA_VERSION (0) -#define ACE_HAS_STANDARD_CPP_LIBRARY 1 -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 #define ACE_TEMPLATES_REQUIRE_SOURCE -#define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS #if __cplusplus >= 201103L # define ACE_HAS_CPP11 diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h index d772389e349..f3802570a64 100644 --- a/ACE/ace/config-hpux-11.00.h +++ b/ACE/ace/config-hpux-11.00.h @@ -10,13 +10,7 @@ #define ACE_LACKS_SYS_SELECT_H #if defined (__GNUG__) - -// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so -// this must appear before its #include. -# define ACE_HAS_STRING_CLASS - # include "ace/config-g++-common.h" - #else // aC++... @@ -24,31 +18,9 @@ // Precompiler needs extra flags to ignore "invalid #pragma directive" # define ACE_CC_PREPROCESSOR_ARGS "-E +W 67" -// If the -AA compile option is used, the compiler defines _HP_NAMESPACE_STD. -// The -AA option enables the 2.0 standard C++ library. If not used, then -// we have the old, 1.2.1 C++ library. -# if defined (_HP_NAMESPACE_STD) -# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) -# undef ACE_HAS_STANDARD_CPP_LIBRARY -# endif -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -# undef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB -# endif -# if defined (RWSTD_NO_NAMESPACE) - namespace std {} using namespace std; -# else -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# endif /* RWSTD_NO_NAMESPACE */ -# else -# define ACE_USES_OLD_IOSTREAMS -# endif /* _HP_NAMESPACE_STD */ - // Platform lacks streambuf "linebuffered ()". # define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 -# define ACE_HAS_NEW_NO_H 1 - // Compiler's template mechanism must see source code (i.e., .C files). # define ACE_TEMPLATES_REQUIRE_SOURCE diff --git a/ACE/ace/config-hurd.h b/ACE/ace/config-hurd.h index 7659d7d3b33..ef78e596b37 100644 --- a/ACE/ace/config-hurd.h +++ b/ACE/ace/config-hurd.h @@ -79,9 +79,6 @@ // Then the compiler specific parts #if defined (__GNUG__) - // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so - // this must appear before its #include. -# define ACE_HAS_STRING_CLASS # include "ace/config-g++-common.h" #elif defined (__GNUC__) /** @@ -236,7 +233,6 @@ #define ACE_HAS_SVR4_DYNAMIC_LINKING #define ACE_HAS_AUTOMATIC_INIT_FINI -#define ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE #define ACE_HAS_RECURSIVE_MUTEXES #define ACE_HAS_THREAD_SPECIFIC_STORAGE #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS diff --git a/ACE/ace/config-icc-common.h b/ACE/ace/config-icc-common.h index 5c472fa0e0b..ce825d2beed 100644 --- a/ACE/ace/config-icc-common.h +++ b/ACE/ace/config-icc-common.h @@ -3,10 +3,6 @@ #define ACE_LINUX_ICC_COMMON_H #include /**/ "ace/pre.h" -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# define ACE_HAS_STRING_CLASS - #if defined (ACE_HAS_CUSTOM_EXPORT_MACROS) && ACE_HAS_CUSTOM_EXPORT_MACROS == 0 # undef ACE_HAS_CUSTOM_EXPORT_MACROS # if defined (ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS) diff --git a/ACE/ace/config-integritySCA.h b/ACE/ace/config-integritySCA.h index 56fcf606174..7c48856e50f 100644 --- a/ACE/ace/config-integritySCA.h +++ b/ACE/ace/config-integritySCA.h @@ -24,7 +24,6 @@ #define ACE_LACKS_GETEGID #define ACE_LACKS_GETGID -#define ACE_HAS_STANDARD_CPP_LIBRARY 1 #define ACE_TEMPLATES_REQUIRE_SOURCE 1 #define TAO_USE_SEQUENCE_TEMPLATES #define _REENTRANT @@ -176,7 +175,6 @@ extern "C" #define ACE_LACKS_READLINK #define ACE_LACKS_GETPPID #define NSIG (SIGRTMAX+1) -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 #define ACE_LACKS_CUSERID #define ACE_NEEDS_HUGE_THREAD_STACKSIZE 0x5000 #define fileno(file) ((file)->io_channel) //Hack to get Svc_Conf_l.cpp compiled diff --git a/ACE/ace/config-kfreebsd.h b/ACE/ace/config-kfreebsd.h index 052ab1c3a20..bc13d8b428d 100644 --- a/ACE/ace/config-kfreebsd.h +++ b/ACE/ace/config-kfreebsd.h @@ -122,9 +122,6 @@ #define ACE_LACKS_NEW_H 1 #endif -/* Platform provides new style C++ <new> header */ -#define ACE_HAS_NEW_NO_H 1 - /* Platform's select() uses non-const timeval* (only found on Linux right now) */ #define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 @@ -234,9 +231,6 @@ /* Define to 1 if the system has the type `ssize_t'. */ #define ACE_HAS_SSIZE_T 1 -/* Platform/compiler supports Standard C++ Library */ -#define ACE_HAS_STANDARD_CPP_LIBRARY 1 - /* Compiler supports standard C++ template class member specializations */ #define ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 1 @@ -256,9 +250,6 @@ /* Platform has <strings.h> (which contains bzero() prototype) */ #define ACE_HAS_STRINGS 1 -/* Platform/Compiler supports a String class (e.g., GNU or Win32). */ -#define ACE_HAS_STRING_CLASS 1 - /* Define to 1 if platform has strnlen(). */ #define ACE_HAS_STRNLEN 1 @@ -363,7 +354,7 @@ /* Platform defines ACE_HAS_MSG, but lacks msg_accrights{len}. */ #define ACE_LACKS_MSG_ACCRIGHTS 1 -/* Platform lacks named POSIX semaphores (e.g., Chorus) */ +/* Platform lacks named POSIX semaphores */ #define ACE_LACKS_NAMED_POSIX_SEM 1 /* Compiler complains about use of obsolete "pragma once" */ @@ -404,9 +395,6 @@ */ #define ACE_USES_IPV4_IPV6_MIGRATION 1 -/* Platform has its standard C++ library in the namespace std. */ -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 - /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD @@ -419,7 +407,6 @@ # endif #endif - /* Enable ACE inlining */ #define __ACE_INLINE__ 1 diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h index 0e8bce599e4..5953e4534c5 100644 --- a/ACE/ace/config-linux-common.h +++ b/ACE/ace/config-linux-common.h @@ -52,16 +52,11 @@ #if defined (__INTEL_COMPILER) # include "ace/config-icc-common.h" #elif defined (__GNUG__) - // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so - // this must appear before its #include. -# define ACE_HAS_STRING_CLASS # include "ace/config-g++-common.h" #elif defined (__SUNCC_PRO) || defined (__SUNPRO_CC) # include "ace/config-suncc-common.h" #elif defined (__PGI) // Portable group compiler -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_LACKS_SWAB #elif defined (__GNUC__) /** diff --git a/ACE/ace/config-lite.h b/ACE/ace/config-lite.h index 50b4398b706..29ac3d130a5 100644 --- a/ACE/ace/config-lite.h +++ b/ACE/ace/config-lite.h @@ -65,20 +65,20 @@ typedef void (*ACE_CLEANUP_FUNC)(void *object, void *param) /* throw () */; ACE_BEGIN_VERSIONED_NAMESPACE_DECL -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +# if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) typedef int (*ACE_SEH_EXCEPT_HANDLER)(void *); // Prototype of win32 structured exception handler functions. // They are used to get the exception handling expression or // as exception handlers. -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +# endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ class ACE_OS_Thread_Descriptor; class ACE_OS_Log_Msg_Attributes; typedef void (*ACE_INIT_LOG_MSG_HOOK) (ACE_OS_Log_Msg_Attributes &attr -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +# if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) , ACE_SEH_EXCEPT_HANDLER selector , ACE_SEH_EXCEPT_HANDLER handler -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +# endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ ); typedef void (*ACE_INHERIT_LOG_MSG_HOOK) (ACE_OS_Thread_Descriptor*, ACE_OS_Log_Msg_Attributes &); diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h index b45bc08388d..6f4b8068e51 100644 --- a/ACE/ace/config-lynxos.h +++ b/ACE/ace/config-lynxos.h @@ -84,7 +84,6 @@ #define ACE_HAS_SSIZE_T #define ACE_HAS_STREAMS #define ACE_HAS_STRINGS -#define ACE_HAS_STRING_CLASS #define ACE_HAS_SYSCTL #define ACE_HAS_SYS_FILIO_H #define ACE_HAS_SYS_SOCKIO_H diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index 1a2bcbaad48..5b302b80607 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -471,11 +471,11 @@ */ // ============================================================================ -#define ACE_OSCALL_RETURN(X,TYPE,FAILVALUE) \ +#define ACE_OSCALL_RETURN(X,TYPE) \ do \ return (TYPE) (X); \ while (0) -#define ACE_OSCALL(X,TYPE,FAILVALUE,RESULT) \ +#define ACE_OSCALL(X,TYPE,RESULT) \ do \ RESULT = (TYPE) (X); \ while (0) diff --git a/ACE/ace/config-mqx.h b/ACE/ace/config-mqx.h index 890760ea188..b27de279666 100644 --- a/ACE/ace/config-mqx.h +++ b/ACE/ace/config-mqx.h @@ -331,7 +331,6 @@ inline int puts(const char* str) { #define ACE_HAS_SOCKLEN_T #define ACE_HAS_DIRENT -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB #define ACE_TEXT_WIN32_FIND_DATA MFS_SEARCH_DATA #define ACE_LACKS_UNIX_SIGNALS diff --git a/ACE/ace/config-netbsd.h b/ACE/ace/config-netbsd.h index e07fa2b5e63..85c0da476d9 100644 --- a/ACE/ace/config-netbsd.h +++ b/ACE/ace/config-netbsd.h @@ -41,7 +41,6 @@ #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT 1 #define ACE_HAS_IP_MULTICAST 1 #define ACE_HAS_MSG 1 -#define ACE_HAS_NEW_NO_H 1 #define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 #define ACE_HAS_ONLY_SCHED_OTHER 1 #define ACE_HAS_POLL 1 @@ -64,9 +63,7 @@ #define ACE_HAS_SOCKADDR_MSG_NAME 1 #define ACE_HAS_SOCKLEN_T 1 #define ACE_HAS_SSIZE_T 1 -#define ACE_HAS_STANDARD_CPP_LIBRARY 1 #define ACE_HAS_STRINGS 1 -#define ACE_HAS_STRING_CLASS 1 #define ACE_HAS_SVR4_DYNAMIC_LINKING 1 #define ACE_HAS_SYSV_IPC #define ACE_HAS_SYS_FILIO_H 1 diff --git a/ACE/ace/config-openbsd.h b/ACE/ace/config-openbsd.h index 43a9364314a..b1cd54a8226 100644 --- a/ACE/ace/config-openbsd.h +++ b/ACE/ace/config-openbsd.h @@ -39,7 +39,6 @@ #define ACE_HAS_MKDIR #define ACE_HAS_MSG #define ACE_HAS_NANOSLEEP -#define ACE_HAS_NEW_NO_H #define ACE_HAS_NONCONST_SELECT_TIMEVAL #define ACE_HAS_POLL #define ACE_HAS_POSIX_NONBLOCK @@ -68,7 +67,6 @@ #define ACE_HAS_SOCKLEN_T #define ACE_HAS_SSIZE_T #define ACE_HAS_STRINGS -#define ACE_HAS_STRING_CLASS #define ACE_HAS_SVR4_DYNAMIC_LINKING #define ACE_HAS_SVR4_SIGNAL_T #define ACE_HAS_SYSCTL @@ -118,10 +116,6 @@ # define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 #endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */ -// OpenBSD's dlsym call segfaults when passed an invalid handle. -// It seems as if most other OSs detect this and just report an error. -#define ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE - #define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%ld" #define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" diff --git a/ACE/ace/config-openvms.h b/ACE/ace/config-openvms.h index c25ce75fa8d..e4e5071c80d 100644 --- a/ACE/ace/config-openvms.h +++ b/ACE/ace/config-openvms.h @@ -152,7 +152,6 @@ /* language/platform conformance */ #define ACE_TEMPLATES_REQUIRE_SOURCE 1 -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 #define ACE_HAS_AUTOMATIC_INIT_FINI 1 #define ACE_LACKS_UNIX_SIGNALS 1 @@ -165,8 +164,6 @@ #define ACE_HAS_POSIX_NONBLOCK 1 #define ACE_HAS_POSIX_TIME 1 #define ACE_HAS_BROKEN_POSIX_TIME 1 -#define ACE_HAS_STANDARD_CPP_LIBRARY 1 -#define ACE_HAS_STRING_CLASS 1 #define ACE_HAS_SVR4_DYNAMIC_LINKING 1 #define ACE_LACKS_NAMED_POSIX_SEM 1 diff --git a/ACE/ace/config-qnx.h b/ACE/ace/config-qnx.h index b760c2b5ad5..64c5e9f280e 100644 --- a/ACE/ace/config-qnx.h +++ b/ACE/ace/config-qnx.h @@ -98,14 +98,11 @@ #define ACE_HAS_GETTIMEOFDAY 1 #define ACE_HAS_GETRUSAGE 1 #define ACE_HAS_GETRUSAGE_PROTOTYPE 1 -#define ACE_HAS_NEW_NO_H 1 #define ACE_IOCTL_TYPE_ARG2 u_long #define ACE_HAS_TIMEZONE 1 #define ACE_HAS_SOCKADDR_MSG_NAME 1 #define ACE_HAS_SIG_C_FUNC 1 #define ACE_HAS_SOCKADDR_IN6_SIN6_LEN 1 -#define ACE_HAS_STANDARD_CPP_LIBRARY 1 -#define ACE_HAS_STRING_CLASS 1 #define ACE_HAS_STRSIGNAL #define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1 #define ACE_HAS_POSIX_NONBLOCK 1 @@ -158,7 +155,6 @@ #define ACE_MT_SAFE 1 #define ACE_NEEDS_HUGE_THREAD_STACKSIZE 64000 #define ACE_THR_PRI_FIFO_DEF 10 -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 #define ACE_HAS_SIGTIMEDWAIT #define ACE_HAS_SIGSUSPEND diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h index 6c4c2995dfb..e74a3faa463 100644 --- a/ACE/ace/config-rtems.h +++ b/ACE/ace/config-rtems.h @@ -21,9 +21,6 @@ // Then the compiler specific parts #if defined (__GNUG__) - // config-g-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so - // this must appear before its #include. -# define ACE_HAS_STRING_CLASS # include "ace/config-g++-common.h" #else /* ! __GNUG__ */ # ifdef __cplusplus /* Let it slide for C compilers. */ diff --git a/ACE/ace/config-suncc-common.h b/ACE/ace/config-suncc-common.h index 7953f85e32a..517e743d1d8 100644 --- a/ACE/ace/config-suncc-common.h +++ b/ACE/ace/config-suncc-common.h @@ -3,9 +3,6 @@ #define ACE_SUNCC_COMMON_H #include /**/ "ace/pre.h" -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# define ACE_HAS_STRING_CLASS # define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS # define ACE_HAS_THR_C_DEST 1 # define ACE_LACKS_SWAB diff --git a/ACE/ace/config-sunos5.4-g++.h b/ACE/ace/config-sunos5.4-g++.h index 514fb4a8768..74be0d51147 100644 --- a/ACE/ace/config-sunos5.4-g++.h +++ b/ACE/ace/config-sunos5.4-g++.h @@ -10,10 +10,6 @@ # define __ACE_INLINE__ #endif /* ! __ACE_INLINE__ */ -// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so -// this must appear before its #include. -#define ACE_HAS_STRING_CLASS - #include "ace/config-g++-common.h" #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h index e87605431c1..cc2ba11caff 100644 --- a/ACE/ace/config-sunos5.5.h +++ b/ACE/ace/config-sunos5.5.h @@ -42,8 +42,6 @@ // If -compat=4 is turned on, the old 4.2 settings for iostreams are used, // but the newer, explicit instantiation is used (above) # if (__SUNPRO_CC_COMPAT >= 5) -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_HAS_THR_C_DEST # endif /* __SUNPRO_CC_COMPAT >= 5 */ # endif /* __SUNPRO_CC >= 0x500 */ @@ -83,10 +81,6 @@ # endif /* __SUNPRO_CC > 0x540 (> Sun C++ 5.4) */ #elif defined (__GNUG__) - // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so - // this must appear before its #include. -# define ACE_HAS_STRING_CLASS - # include "ace/config-g++-common.h" # define ACE_HAS_HI_RES_TIMER diff --git a/ACE/ace/config-sunos5.6.h b/ACE/ace/config-sunos5.6.h index 34684cb34ae..2e2ef3b9d03 100644 --- a/ACE/ace/config-sunos5.6.h +++ b/ACE/ace/config-sunos5.6.h @@ -49,15 +49,6 @@ #ifndef ACE_HAS_SIG_C_FUNC #define ACE_HAS_SIG_C_FUNC 1 #endif /* ACE_HAS_SIG_C_FUNC */ -#ifndef ACE_HAS_STRING_CLASS -#define ACE_HAS_STRING_CLASS 1 -#endif /* ACE_HAS_STRING_CLASS */ -#ifndef ACE_HAS_STANDARD_CPP_LIBRARY -#define ACE_HAS_STANDARD_CPP_LIBRARY 1 -#endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ -#ifndef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -#endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ #ifndef ACE_LACKS_IOSTREAM_FX #define ACE_LACKS_IOSTREAM_FX 1 #endif /* ACE_LACKS_IOSTREAM_FX */ diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h index 84e208ca02a..eff24fbdec2 100644 --- a/ACE/ace/config-vxworks6.4.h +++ b/ACE/ace/config-vxworks6.4.h @@ -52,7 +52,6 @@ # endif #elif defined (__DCC__) -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_TEMPLATES_REQUIRE_SOURCE #else /* ! __GNUG__ && !__DCC__ */ # ifdef __cplusplus /* Let it slide for C compilers. */ diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index a5c315aa256..9b5d0058bca 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -6,7 +6,7 @@ #include /**/ "ace/pre.h" #ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header +# error Use config-win32.h in config.h instead of this header #endif /* ACE_CONFIG_WIN32_H */ #define ACE_HAS_CUSTOM_EXPORT_MACROS 1 @@ -17,23 +17,17 @@ #define ACE_IMPORT_SINGLETON_DECLARATION(T) template class __declspec (dllimport) T #define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllimport) SINGLETON_TYPE <CLASS, LOCK>; -// In later versions of C++Builder we will prefer inline functions by -// default. The debug configuration of ACE is built with functions -// out-of-line, so when linking your application against a debug ACE -// build, you can choose to use the out-of-line functions by adding -// ACE_NO_INLINE=1 to your project settings. -# if !defined (__ACE_INLINE__) -# define __ACE_INLINE__ 1 -# endif /* __ACE_INLINE__ */ - -# define ACE_CC_NAME ACE_TEXT ("Embarcadero C++ Builder") -# define ACE_CC_MAJOR_VERSION (__BORLANDC__ / 0x100) -# define ACE_CC_MINOR_VERSION (__BORLANDC__ % 0x100) -# define ACE_CC_BETA_VERSION (0) - -#if (__BORLANDC__ >= 0x620) -# define ACE_CC_PREPROCESSOR_ARGS "-q -Sl -o%s" -#endif +// Default to no inlining +#if !defined (__ACE_INLINE__) +# define __ACE_INLINE__ 0 +#endif /* __ACE_INLINE__ */ + +#define ACE_CC_NAME ACE_TEXT ("Embarcadero C++ Builder") +#define ACE_CC_MAJOR_VERSION (__BORLANDC__ / 0x100) +#define ACE_CC_MINOR_VERSION (__BORLANDC__ % 0x100) +#define ACE_CC_BETA_VERSION (0) + +#define ACE_CC_PREPROCESSOR_ARGS "-Xdriver -E -q -o%s" #if !defined (WIN32) # if defined (__WIN32__) || defined (_WIN32) @@ -55,18 +49,17 @@ #endif #if defined (ACE_HAS_BCC64) -// Use 32bit pre processor because cpp64 doesn't have the same -// options -# define ACE_CC_PREPROCESSOR "CPP32.EXE" +# define ACE_CC_PREPROCESSOR "BCC64.EXE" #else -# define ACE_CC_PREPROCESSOR "CPP32.EXE" +# define ACE_CC_PREPROCESSOR "BCC32C.EXE" #endif # include "ace/config-win32-common.h" -# define ACE_WSTRING_HAS_USHORT_SUPPORT 1 -# define ACE_HAS_DIRENT +#define ACE_WSTRING_HAS_USHORT_SUPPORT 1 +#define ACE_HAS_DIRENT +#define ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS #define ACE_USES_STD_NAMESPACE_FOR_STDC_LIB 1 #define ACE_LACKS_TERMIOS_H @@ -96,6 +89,7 @@ #define ACE_LACKS_SYS_IOCTL_H #define ACE_LACKS_STROPTS_H #define ACE_LACKS_WCSRTOMBS +#define ACE_LACKS_SET_ABORT_BEHAVIOR #undef ACE_LACKS_STRUCT_DIR #undef ACE_LACKS_CLOSEDIR @@ -117,8 +111,6 @@ #define ACE_HAS_NONCONST_SELECT_TIMEVAL #define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_STANDARD_CPP_LIBRARY 1 -#define ACE_HAS_STRING_CLASS 1 #define ACE_HAS_USER_MODE_MASKS 1 #define ACE_LACKS_ACE_IOSTREAM 1 #define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 @@ -127,8 +119,6 @@ # define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%Lu" # define ACE_INT64_FORMAT_SPECIFIER_ASCII "%Ld" #endif -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -#define ACE_USES_STD_NAMESPACE_FOR_ABS 1 #define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) #if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0) diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index 05d69ff24cd..e3eb100dc5c 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -223,10 +223,6 @@ # define ACE_HAS_IO_H #endif /* ! ACE_HAS_WINCE */ -#if !defined (__MINGW32__) -# define ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS -#endif /* __MINGW32__ */ - #define ACE_DEFAULT_THREAD_PRIORITY 0 #define ACE_HAS_DIRENT diff --git a/ACE/ace/config-win32-mingw.h b/ACE/ace/config-win32-mingw.h index 63a78386938..5216f0d7e8e 100644 --- a/ACE/ace/config-win32-mingw.h +++ b/ACE/ace/config-win32-mingw.h @@ -92,6 +92,7 @@ #define ACE_HAS_NONCONST_WCSDUP #define ACE_HAS_WINSOCK2_GQOS #define ACE_ISCTYPE_EQUIVALENT ::_isctype +#define ACE_LACKS_SET_ABORT_BEHAVIOR // We trust the user: He must have used -mpentiumpro or -mpentium // if that is what he wants. diff --git a/ACE/ace/config-win32-mingw64.h b/ACE/ace/config-win32-mingw64.h index b801b10a771..939006a263f 100644 --- a/ACE/ace/config-win32-mingw64.h +++ b/ACE/ace/config-win32-mingw64.h @@ -126,6 +126,7 @@ #define ACE_LACKS_ASCTIME_R #define ACE_HAS_NONCONST_WCSDUP #define ACE_ISCTYPE_EQUIVALENT ::_isctype +#define ACE_LACKS_SET_ABORT_BEHAVIOR #define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h index 01f73c6f863..41bc784d45f 100644 --- a/ACE/ace/config-win32-msvc-14.h +++ b/ACE/ace/config-win32-msvc-14.h @@ -23,15 +23,6 @@ # define ACE_WIN32_VC14 #endif -// Visual C++ 9.0 (.NET) deprecated the old iostreams -#if !defined (ACE_HAS_STANDARD_CPP_LIBRARY) -#define ACE_HAS_STANDARD_CPP_LIBRARY 1 -#endif - -#if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -#endif - // Windows' timeval is non-conformant (defined in terms of long instead of // time_t) and VC8 changed time_t to a 64-bit value even when compiling a // 32-bit application. Therefore, ace/Time_Value needs to rearrange a few @@ -80,30 +71,16 @@ // Platform support linebuffered streaming is broken #define ACE_LACKS_LINEBUFFERED_STREAMBUF -#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) - -// Platform has its Standard C++ library in the namespace std -# if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - // ace/iostream.h does not work with the standard cpp library (yet). -# if !defined (ACE_USES_OLD_IOSTREAMS) +#if !defined (ACE_USES_OLD_IOSTREAMS) # define ACE_LACKS_ACE_IOSTREAM -# endif /* ! ACE_USES_OLD_IOSTREAMS */ - -#else - -// iostream header lacks ipfx (), isfx (), etc., declarations -# define ACE_LACKS_IOSTREAM_FX - -#endif +#endif /* ! ACE_USES_OLD_IOSTREAMS */ // There are too many instances of this warning to fix it right now. // Maybe in the future. // Disable warning of using Microsoft Extension. -# pragma warning(disable:4231) +#pragma warning(disable:4231) // 'class1' : inherits 'class2::member' via dominance #pragma warning(disable:4250) diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h index 58d44eb8019..ceb18c2568f 100644 --- a/ACE/ace/config-win32-msvc.h +++ b/ACE/ace/config-win32-msvc.h @@ -114,6 +114,8 @@ #define ACE_LACKS_CORRECT_ISWPRINT_TAB #define ACE_ISCTYPE_EQUIVALENT ::_isctype +#define ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS + // Turn off warnings for /W4 // To resume any of these warning: #pragma warning(default: 4xxx) // which should be placed after these defines diff --git a/ACE/ace/iosfwd.h b/ACE/ace/iosfwd.h index 2d29b38c43f..467d822d213 100644 --- a/ACE/ace/iosfwd.h +++ b/ACE/ace/iosfwd.h @@ -29,15 +29,14 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) +// We except that each platform does support std streams +#define ACE_HAS_CPP98_IOSTREAMS 1 -#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \ - (ACE_HAS_STANDARD_CPP_LIBRARY != 0) +#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) -# if !defined (ACE_USES_OLD_IOSTREAMS) +#if !defined (ACE_USES_OLD_IOSTREAMS) # include /**/ <iosfwd> -#define ACE_HAS_CPP98_IOSTREAMS 1 -# else +#else // @note If these forward declarations don't work (e.g. aren't // portable), we may have to include "ace/streams.h" as a last // resort. Doing so would defeat the purpose of this header, @@ -51,39 +50,20 @@ class ifstream; class ofstream; class fstream; -# endif /* ! ACE_USES_OLD_IOSTREAMS */ - -# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \ - (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0) - -# if !defined (ACE_USES_OLD_IOSTREAMS) - // Make these available in the global name space - using std::ios; - using std::streambuf; - using std::istream; - using std::ostream; - using std::iostream; - using std::filebuf; - using std::ifstream; - using std::ofstream; - using std::fstream; -# endif /* ! ACE_USES_OLD_IOSTREAMS */ - -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - -#else /* ! ACE_HAS_STANDARD_CPP_LIBRARY */ - - class ios; - class streambuf; - class istream; - class ostream; - class iostream; - class filebuf; - class ifstream; - class ofstream; - class fstream; - -# endif /* ! ACE_HAS_STANDARD_CPP_LIBRARY */ +#endif /* ! ACE_USES_OLD_IOSTREAMS */ + +#if !defined (ACE_USES_OLD_IOSTREAMS) + // Make these available in the global name space + using std::ios; + using std::streambuf; + using std::istream; + using std::ostream; + using std::iostream; + using std::filebuf; + using std::ifstream; + using std::ofstream; + using std::fstream; +#endif /* ! ACE_USES_OLD_IOSTREAMS */ #include /**/ "ace/post.h" diff --git a/ACE/ace/os_include/os_intrin.h b/ACE/ace/os_include/os_intrin.h index 9f31f1c09c6..62e52b58aaa 100644 --- a/ACE/ace/os_include/os_intrin.h +++ b/ACE/ace/os_include/os_intrin.h @@ -33,23 +33,5 @@ # include /**/ <ia32intrin.h> #endif /* !ACE_HAS_IA32INTRIN_H */ -// Place all additions (especially function declarations) within extern "C" {} -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -#if defined (_MSC_VER) && (_MSC_VER < 1400) && !(defined (__INTEL_COMPILER) && (__INTEL_COMPILER == 900)) -// See http://msdn2.microsoft.com/en-us/library/f24ya7ct(VS.71).aspx -LONG __cdecl _InterlockedIncrement (LONG volatile *Addend); -LONG __cdecl _InterlockedDecrement (LONG volatile *Addend); -LONG __cdecl _InterlockedExchange (LONG volatile *Target, LONG Value); -LONG __cdecl _InterlockedExchangeAdd (LONG volatile *Addend, LONG Value); -#endif //_MSC_VER - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_INTRIN_H */ diff --git a/ACE/ace/post.h b/ACE/ace/post.h index bea9b56ef59..67049ff8354 100644 --- a/ACE/ace/post.h +++ b/ACE/ace/post.h @@ -15,7 +15,7 @@ # pragma pack (pop) #elif defined (__BORLANDC__) # pragma option pop -# if (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x730) +# if (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) # pragma option pop # endif # pragma nopushoptwarn diff --git a/ACE/ace/pre.h b/ACE/ace/pre.h index ccb8c553bd5..0b5f37caa16 100644 --- a/ACE/ace/pre.h +++ b/ACE/ace/pre.h @@ -17,7 +17,7 @@ # pragma pack (push, 8) #elif defined (__BORLANDC__) # pragma option push -a8 -b -Ve- -Vx- -w-rvl -w-rch -w-ccc -w-obs -w-aus -w-pia -w-inl -w-sig -# if (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x730) +# if (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) // False warning: Function defined with different linkage, reported to // Embarcadero as QC 117740 # pragma option push -w-8127 diff --git a/ACE/ace/streams.h b/ACE/ace/streams.h index 8a6577eebb3..d266c766c98 100644 --- a/ACE/ace/streams.h +++ b/ACE/ace/streams.h @@ -31,97 +31,69 @@ #pragma warning(push) #endif /* _MSC_VER*/ - #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - -# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \ - (ACE_HAS_STANDARD_CPP_LIBRARY != 0) - -# if defined (_MSC_VER) -# pragma warning(disable: 4018 4114 4146 4245) -# pragma warning(disable: 4663 4664 4665 4511 4512) -# endif /* _MSC_VER */ - -# if defined (ACE_USES_OLD_IOSTREAMS) -# include /**/ <iostream.h> -# include /**/ <fstream.h> +# if defined (_MSC_VER) +# pragma warning(disable: 4018 4114 4146 4245) +# pragma warning(disable: 4663 4664 4665 4511 4512) +# endif /* _MSC_VER */ + +# if defined (ACE_USES_OLD_IOSTREAMS) +# include /**/ <iostream.h> +# include /**/ <fstream.h> // This has been commented as it is not needed and causes problems with Qt. // (brunsch) But has been uncommented since it should be included. Qt // probably should have some sort of macro that will prevent including this // when it is used. -# include /**/ <iomanip.h> -# else -# include /**/ <iostream> -# include /**/ <fstream> -# include /**/ <istream> -# include /**/ <ostream> -# include /**/ <streambuf> -# include /**/ <iomanip> -# include /**/ <ios> -# endif /* ACE_USES_OLD_IOSTREAMS */ - -# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \ - (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0) - -# if !defined (ACE_USES_OLD_IOSTREAMS) - // Make these available in the global name space - using std::ios; - using std::ios_base; - using std::streambuf; - using std::istream; - using std::ostream; - using std::iostream; - using std::filebuf; - using std::ifstream; - using std::ofstream; - using std::fstream; - - using std::cin; - using std::cout; - using std::cerr; - using std::clog; - - using std::endl; - using std::ends; - using std::flush; - - using std::ws; - - using std::resetiosflags; - using std::setfill; - using std::setiosflags; - using std::setprecision; - using std::setw; - - using std::dec; - using std::hex; - using std::oct; -# endif /* ! ACE_USES_OLD_IOSTREAMS */ - -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ +# include /**/ <iomanip.h> +# else +# include /**/ <iostream> +# include /**/ <fstream> +# include /**/ <istream> +# include /**/ <ostream> +# include /**/ <streambuf> +# include /**/ <iomanip> +# include /**/ <ios> +# endif /* ACE_USES_OLD_IOSTREAMS */ + +# if !defined (ACE_USES_OLD_IOSTREAMS) + // Make these available in the global name space + using std::ios; + using std::ios_base; + using std::streambuf; + using std::istream; + using std::ostream; + using std::iostream; + using std::filebuf; + using std::ifstream; + using std::ofstream; + using std::fstream; + + using std::cin; + using std::cout; + using std::cerr; + using std::clog; + + using std::endl; + using std::ends; + using std::flush; + + using std::ws; + + using std::resetiosflags; + using std::setfill; + using std::setiosflags; + using std::setprecision; + using std::setw; + + using std::dec; + using std::hex; + using std::oct; +# endif /* ! ACE_USES_OLD_IOSTREAMS */ # if defined (_MSC_VER) # pragma warning(4: 4018 4114 4146 4245) # pragma warning(4: 4663 4664 4665 4512 4511) # endif /* _MSC_VER */ - -# else /* ! ACE_HAS_STANDARD_CPP_LIBRARY */ - -# include /**/ <fstream.h> -# include /**/ <iostream.h> -# include /**/ <iomanip.h> - -# if defined (ACE_WIN32) && !defined(__MINGW32__) -# if defined(_MSC_VER) // VSB -# include /**/ <ios.h> -# include /**/ <streamb.h> -# include /**/ <istream.h> -# include /**/ <ostream.h> -# endif /* _MSC_VER */ -# endif /* ACE_WIN32 && !__MINGW32__ */ - -# endif /* ! ACE_HAS_STANDARD_CPP_LIBRARY */ - #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ // Do this so the #pragma warning in the MSVC headers do not diff --git a/ACE/bin/ACE+TAO+CIAO+DAnCE.json b/ACE/bin/ACE+TAO+CIAO+DAnCE.json index a1126dea522..3e715a522be 100644 --- a/ACE/bin/ACE+TAO+CIAO+DAnCE.json +++ b/ACE/bin/ACE+TAO+CIAO+DAnCE.json @@ -57,30 +57,7 @@ { line_regex: "TAOLIB_DEBUG" }, { line_regex: "TAOLIB_ERROR" }, { line_regex: "TAOLIB_ERROR_RETURN" }, - { line_regex: "DANCE_DEBUG" }, - { line_regex: "DANCE_ERROR" }, - { line_regex: "DANCE_ERROR_RETURN" }, - { line_regex: "CIAO_DEBUG" }, - { line_regex: "CIAO_ERROR" }, - { line_regex: "CIAO_ERROR_RETURN" }, - { line_regex: "DDS4CCM_DEBUG" }, - { line_regex: "DDS4CCM_ERROR" }, - { line_regex: "DDS4CCM_ERROR_RETURN" }, - { line_regex: "DDS4CCM_PRINT_DEBUG_CORBA_EXCEPTION" }, - { line_regex: "DDS4CCM_PRINT_CORBA_EXCEPTION" }, - { line_regex: "DDS4CCM_debug_level" }, - { line_regex: "CIAO_debug_level" }, { line_regex: "TAO_debug_level" }, - { line_regex: "DAnCE_debug_level" }, - { line_regex: "DANCE_debug_level" }, - { line_regex: "DDS4CCM_DEBUG_LEVEL" }, - { line_regex: "CIAO_DEBUG_LEVEL" }, - { line_regex: "DAnCE_DEBUG_LEVEL" }, - { line_regex: "DANCE_DEBUG_LEVEL" }, - { line_regex: "DDS4CCM::debug_level" }, - { line_regex: "CIAO::debug_level" }, - { line_regex: "DAnCE::debug_level" }, - { line_regex: "DANCE::debug_level" }, { line_regex: "ORBSVCS_DEBUG" }, { line_regex: "ORBSVCS_ERROR" }, { line_regex: "ORBSVCS_ERROR_RETURN" }, @@ -129,13 +106,8 @@ { file_name_regex: ".*/TAO/tao/.*" }, { file_name_regex: ".*/TAO/orbsvcs/orbsvcs/Naming/.*" }, { file_name_regex: ".*/TAO/orbsvcs/orbsvcs/Notify/.*" }, - { file_name_regex: ".*/TAO/orbsvcs/orbsvcs/Event/.*" }, - { file_name_regex: ".*/CIAO/ciao/.*" }, - { file_name_regex: ".*/CIAO/connectors/dds4ccm/impl/.*" }, - { file_name_regex: ".*/DAnCE/dance/LocalityManager.*" }, - { file_name_regex: ".*/DAnCE/tools/Config_Handlers/DynAny_Handler.*" } - ] }, - { not: { file_name_regex: "CIAO/connectors/dds4ccm/impl/ndds" }} + { file_name_regex: ".*/TAO/orbsvcs/orbsvcs/Event/.*" } + ] } ] } ] diff --git a/ACE/bin/MakeProjectCreator/config/MPC.cfg b/ACE/bin/MakeProjectCreator/config/MPC.cfg index 04f2c9a5439..13cdf74da4b 100644 --- a/ACE/bin/MakeProjectCreator/config/MPC.cfg +++ b/ACE/bin/MakeProjectCreator/config/MPC.cfg @@ -1,3 +1,2 @@ -includes = $CIAO_ROOT/MPC/config, $DANCE_ROOT/MPC/config dynamic_types = $ACE_ROOT/bin/MakeProjectCreator, $?DDS_ROOT/MPC, $?TAO_ROOT/MPC main_functions = cplusplus:ACE_TMAIN diff --git a/ACE/bin/MakeProjectCreator/docs/templates/gnu.txt b/ACE/bin/MakeProjectCreator/docs/templates/gnu.txt index f3d4d334b78..e7ebdbc0ef9 100644 --- a/ACE/bin/MakeProjectCreator/docs/templates/gnu.txt +++ b/ACE/bin/MakeProjectCreator/docs/templates/gnu.txt @@ -4,7 +4,6 @@ // Please try to keep this alphabetically sorted. // build_dir_per_project = Specifies to use per project object file output dirs (VDIR and VSHDIR) if set to '1'. -ciao = Indicates whether or not this project contains CIAO code. idl_files = When a Define_Custom(IDL) is used, they will be accessible through this variable name. install = This is a synonym for exeout. linkflags = Platform specific flags passed during the linking of dynamic libraries and executables. diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index b91bd7af6e3..527828a8739 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -51,15 +51,9 @@ static_libs_only = 1 SHLIB_UNCHECKED = $(LIB_PREFIX)<%libname_prefix%><%sharedname%>.$(SOEXT) SHLIB = $(SHLIB_UNCHECKED) <%endif%> -<%if(tao || ciao || dance)%> +<%if(tao)%> TAO_ROOT ?= $(ACE_ROOT)/TAO -<%if(ciao)%> -CIAO_ROOT ?= $(TAO_ROOT)/CIAO -<%endif%> -<%if(dance)%> -DANCE_ROOT ?= $(TAO_ROOT)/DAnCE -<%endif%> <%endif%> <%if(grouped_source_files)%> diff --git a/ACE/bin/PerlACE/Process_Unix.pm b/ACE/bin/PerlACE/Process_Unix.pm index 73b2b706665..d6896698de4 100644 --- a/ACE/bin/PerlACE/Process_Unix.pm +++ b/ACE/bin/PerlACE/Process_Unix.pm @@ -311,10 +311,6 @@ sub CommandLine () "export LIBPATH=$libpath:.:\$LIBPATH\n". "export SHLIB_PATH=$libpath:.:\$SHLIB_PATH\n". "export PATH=\$PATH:$root/bin:$root/lib:$libpath:.\n"; - if (defined $self->{TARGET}->{dance_root}) { - $run_script .= - "export DANCE_ROOT=$self->{TARGET}->{dance_root}\n"; - } if (defined $self->{TARGET}->{ace_root}) { $run_script .= "export ACE_ROOT=$self->{TARGET}->{ace_root}\n"; @@ -323,10 +319,6 @@ sub CommandLine () $run_script .= "export TAO_ROOT=$self->{TARGET}->{tao_root}\n"; } - if (defined $self->{TARGET}->{ciao_root}) { - $run_script .= - "export CIAO_ROOT=$self->{TARGET}->{ciao_root}\n"; - } while ( my ($env_key, $env_value) = each(%$x_env_ref) ) { $run_script .= diff --git a/ACE/bin/PerlACE/Run_Test.pm b/ACE/bin/PerlACE/Run_Test.pm index 124fd111a0e..165a3149be2 100644 --- a/ACE/bin/PerlACE/Run_Test.pm +++ b/ACE/bin/PerlACE/Run_Test.pm @@ -16,11 +16,6 @@ if(exists $ENV{TAO_ROOT}) { } else { $PerlACE::TAO_ROOT = "$PerlACE::ACE_ROOT/TAO"; } -if(exists $ENV{CIAO_ROOT}) { - $PerlACE::CIAO_ROOT = $ENV{CIAO_ROOT}; -} else { - $PerlACE::CIAO_ROOT = "$PerlACE::TAO_ROOT/CIAO"; -} my $config = new PerlACE::ConfigList; $PerlACE::TestConfig = $config; diff --git a/ACE/bin/PerlACE/TestTarget.pm b/ACE/bin/PerlACE/TestTarget.pm index 347c6cf3a2f..54e0dfc3872 100644 --- a/ACE/bin/PerlACE/TestTarget.pm +++ b/ACE/bin/PerlACE/TestTarget.pm @@ -145,47 +145,6 @@ sub GetConfigSettings ($) # fall back to assuming classic hierarchical structure $self->{tao_root} = "$self->{ace_root}/TAO"; } - $env_name = $env_prefix.'CIAO_ROOT'; - if (exists $ENV{$env_name}) { - $self->{ciao_root} = $ENV{$env_name}; - } elsif ($fs_root ne $tgt_fs_root && -d "$fs_root/CIAO") { - # flat directory structure - $self->{ciao_root} = "$tgt_fs_root/CIAO"; - } elsif ($fs_root ne $tgt_fs_root && -d "$fs_root/ACE/TAO/CIAO") { - # hierarchical struture - $self->{ciao_root} = "$self->{tao_root}/CIAO"; - } elsif (exists $ENV{'CIAO_ROOT'}) { - if ($fs_root ne $tgt_fs_root) { - $self->{ciao_root} = - PerlACE::rebase_path ($ENV{'CIAO_ROOT'}, $fs_root, $tgt_fs_root); - } else { - $self->{ciao_root} = $ENV{'CIAO_ROOT'}; - } - } else { - # fall back to assuming classic hierarchical structure - $self->{ciao_root} = "$self->{tao_root}/CIAO"; - } - - $env_name = $env_prefix.'DANCE_ROOT'; - if (exists $ENV{$env_name}) { - $self->{dance_root} = $ENV{$env_name}; - } elsif ($fs_root ne $tgt_fs_root && -d "$fs_root/DAnCE") { - # flat directory structure - $self->{dance_root} = "$tgt_fs_root/DAnCE"; - } elsif ($fs_root ne $tgt_fs_root && -d "$fs_root/ACE/TAO/DAnCE") { - # hierarchical struture - $self->{dance_root} = "$self->{tao_root}/DAnCE"; - } elsif (exists $ENV{'DANCE_ROOT'}) { - if ($fs_root ne $tgt_fs_root) { - $self->{dance_root} = - PerlACE::rebase_path ($ENV{'DANCE_ROOT'}, $fs_root, $tgt_fs_root); - } else { - $self->{dance_root} = $ENV{'DANCE_ROOT'}; - } - } else { - # fall back to assuming classic hierarchical structure - $self->{dance_root} = "$self->{tao_root}/DAnCE"; - } $env_name = $env_prefix.'TEST_ROOT'; if (exists $ENV{$env_name}) { @@ -370,18 +329,6 @@ sub TAO_ROOT ($) return $self->{tao_root}; } -sub CIAO_ROOT ($) -{ - my $self = shift; - return $self->{ciao_root}; -} - -sub DANCE_ROOT ($) -{ - my $self = shift; - return $self->{dance_root}; -} - sub HostName ($) { my $self = shift; diff --git a/ACE/bin/auto_run_tests.pl b/ACE/bin/auto_run_tests.pl index 02ea8326d74..36c0748f2c6 100755 --- a/ACE/bin/auto_run_tests.pl +++ b/ACE/bin/auto_run_tests.pl @@ -17,17 +17,11 @@ use PerlACE::Run_Test; use Getopt::Long; use Cwd; -use Env qw(ACE_ROOT PATH TAO_ROOT CIAO_ROOT DANCE_ROOT); +use Env qw(ACE_ROOT PATH TAO_ROOT); if (!defined $TAO_ROOT && -d "$ACE_ROOT/TAO") { $TAO_ROOT = "$ACE_ROOT/TAO"; } -if (!defined $CIAO_ROOT && -d "$ACE_ROOT/TAO/CIAO") { - $CIAO_ROOT = "$ACE_ROOT/TAO/CIAO"; -} -if (!defined $DANCE_ROOT && -d "$ACE_ROOT/TAO/DAnCE") { - $DANCE_ROOT = "$ACE_ROOT/TAO/DAnCE"; -} sub run_command { my $test = shift; @@ -77,7 +71,6 @@ sub print_help { " --ace | -a Include the ACE tests\n" . " --orb | -o Include the TAO ORB tests\n" . " --tao | -t Include the TAO non-ORB tests\n" . - " --ciao-dance | -C Include the CIAO and DAnCE tests\n" . " -l <list_file> Include the tests from <list_file>\n" . @@ -101,7 +94,6 @@ my $help = 0; my $ace_tests = 0; my $tao_orb_tests = 0; my $tao_tests = 0; -my $ciao_dance_tests = 0; my @l_options = (); my $sandbox = ''; my $dry_run = 0; @@ -113,7 +105,6 @@ my $invalid_arguments = !GetOptions( 'ace|a' => \$ace_tests, 'orb|o' => \$tao_orb_tests, 'tao|t' => \$tao_tests, - 'ciao-dance|C' => \$ciao_dance_tests, 'l=s' => \@l_options, 'sandbox|s=s' => \$sandbox, 'dry-run|z' => \$dry_run, @@ -130,8 +121,6 @@ my @main_test_lists = ( [\$ace_tests, $ACE_ROOT, "bin/ace_tests.lst", "ACE"], [\$tao_orb_tests, $TAO_ROOT, "bin/tao_orb_tests.lst", "TAO ORB"], [\$tao_tests, $TAO_ROOT, "bin/tao_other_tests.lst", "TAO non-ORB"], - [\$ciao_dance_tests, $CIAO_ROOT, "bin/ciao_tests.lst", "CIAO"], - [\$ciao_dance_tests, $DANCE_ROOT, "bin/dance_tests.lst", "DANCE"], ); my @file_list = (); my $list_error = 0; @@ -234,18 +223,9 @@ foreach my $test_lst (@file_list) { if ($directory =~ m:^TAO/(.*):) { $directory = $1; } - if ($directory =~ m:^CIAO/(.*):) { - $directory = $1; - } - if ($directory =~ m:^DAnCE/(.*):) { - $directory = $1; - } - my $status; my @dirlist = ($ACE_ROOT."/$directory", - $TAO_ROOT."/$directory", - $CIAO_ROOT."/$directory", - $DANCE_ROOT."/$directory"); + $TAO_ROOT."/$directory"); # make sure to *first* check the explicitly specified directory and # only when nothing found there check the default dirs if ($explicit_startdir) { diff --git a/ACE/bin/cleanbuilds.sh b/ACE/bin/cleanbuilds.sh index 13bf730d66c..a1af92396d2 100755 --- a/ACE/bin/cleanbuilds.sh +++ b/ACE/bin/cleanbuilds.sh @@ -4,7 +4,7 @@ if test -z $1; then CURRENTDATE=YYYY_MM_DD; else CURRENTDATE=$1; fi wget http://teststat.remedy.nl/teststat/cleanbuild_testfails-$CURRENTDATE.txt -O cleanbuild.txt # -grep -h \!FIXED_BUGS_ONLY ${ACE_ROOT}/tests/*.lst ${ACE_ROOT}/bin/*.lst ${TAO_ROOT}/bin/*.lst ${CIAO_ROOT}/bin/*.lst ${DANCE_ROOT}/bin/*.lst | sed -e "s/^\([^\:]*\).*/\1/" | sed -e "s/\(\/run_test.pl\)\?\s*$//" > Ignore.txt +grep -h \!FIXED_BUGS_ONLY ${ACE_ROOT}/tests/*.lst ${ACE_ROOT}/bin/*.lst ${TAO_ROOT}/bin/*.lst | sed -e "s/^\([^\:]*\).*/\1/" | sed -e "s/\(\/run_test.pl\)\?\s*$//" > Ignore.txt # cat cleanbuild.txt | grep -v -f Ignore.txt | tee cleanbuildresults.txt diff --git a/ACE/bin/depgen.pl b/ACE/bin/depgen.pl index 59a5dd05e82..1c68102e082 100755 --- a/ACE/bin/depgen.pl +++ b/ACE/bin/depgen.pl @@ -52,6 +52,6 @@ require Driver; # ************************************************************ my($driver) = new Driver('UNIX=gnu', - 'automatic=ACE_ROOT,TAO_ROOT,CIAO_ROOT,' . + 'automatic=ACE_ROOT,TAO_ROOT,' . 'DDS_ROOT,ACE_PLATFORM_CONFIG'); exit($driver->run(\@ARGV)); diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl index 7cadf939bf1..f75c1b6d325 100755 --- a/ACE/bin/fuzz.pl +++ b/ACE/bin/fuzz.pl @@ -2,7 +2,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; -# Fuzz is a script whose purpose is to check through ACE/TAO/CIAO files for +# Fuzz is a script whose purpose is to check through ACE/TAO files for # easy to spot (by a perl script, at least) problems. use lib "$ENV{ACE_ROOT}/bin"; @@ -407,7 +407,7 @@ sub check_for_noncvs_files () } } -# This test checks for the use of ACE_SYNCH_MUTEX in TAO/CIAO, +# This test checks for the use of ACE_SYNCH_MUTEX in TAO, # TAO_SYNCH_MUTEX should used instead. sub check_for_ACE_SYNCH_MUTEX () @@ -430,7 +430,7 @@ sub check_for_ACE_SYNCH_MUTEX () if ($disable == 0 and /ACE_SYNCH_MUTEX/) { # It is okay to use ACE_SYNCH_MUTEX in ACE # so don't check the ACE directory. The below - # will check it for TAO and CIAO. + # will check it for TAO if (($file !~ /.*TAO.*/)) { next ITERATION; } @@ -452,34 +452,7 @@ sub check_for_ACE_SYNCH_MUTEX () } } -# This test checks for not having export files in CIAO, all have to be --- -# generated using TAO_IDL. If you have a file that must be in the repository -# remove the generated automatically by line -sub check_for_export_file () -{ - return if is_suppressed (); - - print "Running export file check\n"; - ITERATION: foreach $file (@files_h) { - if (($file =~ /.*CIAO.*export.h/) || ($file =~ /.*DAnCE.*export.h/)) { - if (open (FILE, $file)) { - print "Looking at file $file\n" if $opt_d; - while (<FILE>) { - if (/generated automatically by/) { - print_error ("$file:$.: file should be generated by TAO_IDL, check -Gxh** option"); - } - } - close (FILE); - } - else { - print STDERR "Error: Could not open $file\n"; - } - } - } -} - - -# This test checks for the use of ACE_Thread_Mutex in TAO/CIAO, +# This test checks for the use of ACE_Thread_Mutex in TAO, # TAO_SYNCH_MUTEX should used instead to make the code build # in single-threaded builds. sub check_for_ACE_Thread_Mutex () @@ -502,7 +475,7 @@ sub check_for_ACE_Thread_Mutex () if ($disable == 0 and /ACE_Thread_Mutex/) { # It is okay to use ACE_Thread_Mutex in ACE # so don't check the ACE directory. The below - # will check it for TAO and CIAO. + # will check it for TAO if (($file !~ /.*TAO.*/)) { next ITERATION; } @@ -1762,41 +1735,6 @@ sub check_for_generated_headers() } } -sub check_for_numeric_log() -{ - return if is_suppressed (); - - print "Running check for numeric flags in DAnCE and DDS4CCM\n"; - - foreach $file (@files_inl, @files_cpp, @files_h) { - if (open (FILE, $file)) { - while (<FILE>) { - # look for debug statements - if (m/DANCE_DEBUG\s*\(\s*\d*\s*,/) { - print_warning ("$file:$.: Found numeric log level in debug statement"); - } - if (m/DANCE_ERROR\s*\(\s*\d\s*,/) { - print_warning ("$file:$.: Found numeric log level in error statement"); - } - if (m/DANCE_TRACE_LOG\s*\(\s*\d\s*,/) { - print_warning ("$file:$.: Found numeric log level in trace log statement"); - } - if (m/DDS4CCM_DEBUG\s*\(\s*\d*\s*,/) { - print_warning ("$file:$.: Found numeric log level in debug statement"); - } - if (m/DDS4CCM_ERROR\s*\(\s*\d\s*,/) { - print_warning ("$file:$.: Found numeric log level in error statement"); - } - } - - close (FILE); - } - else { - print STDERR "Error: Could not open $file\n"; - } - } -} - # Make sure ACE_[OS_]TRACE matches the function/method sub check_for_bad_ace_trace() { @@ -1837,10 +1775,7 @@ sub check_for_bad_ace_trace() # Look for TRACE statements if (m/ACE_OS_TRACE\s*\(\s*\"(.*)\"/ - || m/ACE_TRACE\s*\(\s*\"(.*)\"/ - || m/CIAO_TRACE\s*\(\s*\"(.*)\"/ - || m/DANCE_TRACE\s*\(\s*\"(.*)\"/ - || m/DDS4CCM_TRACE\s*\(\s*\"(.*)\"/) { + || m/ACE_TRACE\s*\(\s*\"(.*)\"/) { my $trace = $1; # reduce the classname @@ -1892,8 +1827,8 @@ sub check_for_deprecated_macros () print "Looking at file $file\n" if $opt_d; while (<FILE>) { if (/ACE_THROW_SPEC/) { - ## Do not use ACE_THROW_SPEC in TAO or CIAO. - if ($file =~ /TAO|CIAO/i || $cwd =~ /TAO|CIAO/i) { + ## Do not use ACE_THROW_SPEC in TAO. + if ($file =~ /TAO/i || $cwd =~ /TAO/i) { print_error ("$file:$.: ACE_THROW_SPEC found."); } } @@ -1958,7 +1893,7 @@ sub check_for_include () $disable = 0; } if ($disable == 0) { - if (/^\s*#\s*include\s*<[(ace)|(TAO)|(CIAO)]\/.*>/) { + if (/^\s*#\s*include\s*<[(ace)|(TAO)]\/.*>/) { print_error ("$file:$.: include <ace\/..> used"); ++$bad_occurance; } @@ -1966,16 +1901,12 @@ sub check_for_include () print_error ("$file:$.: include <tao\/..> used"); ++$bad_occurance; } - if (/^\s*#\s*include\s*<ciao\/.*>/) { - print_error ("$file:$.: include <ciao\/..> used"); - ++$bad_occurance; - } } } close (FILE); if ($disable == 0 && $bad_occurance > 0 ) { - print_error ("$file:1: found $bad_occurance usage(s) of #include <> of ace\/tao\/ciao."); + print_error ("$file:1: found $bad_occurance usage(s) of #include <> of ace\/tao."); } } else { @@ -2267,7 +2198,7 @@ sub check_for_include_OS_h () $disable = 0; next; } - elsif ($disable == 0 and /^\s*#\s*include\s*<[(ace)|(TAO)|(CIAO)]\/.*>/) { + elsif ($disable == 0 and /^\s*#\s*include\s*<[(ace)|(TAO)]\/.*>/) { print_error ("$file:$.: include <ace\/..> used"); } else { @@ -2306,9 +2237,6 @@ sub check_for_ace_log_categories () elsif ($f =~ /\/orbsvcs\// && $f !~ /tests|examples/i) { $cat = 'ORBSVCS'; } - elsif ($f =~ /CIAO\// || $f =~ /DAnCE\//) { - next; - } elsif ($f =~ /tests\/Log_Msg_Test\.cpp/) { next; } @@ -2399,7 +2327,6 @@ if (!getopts ('cdx:hl:t:s:mv') || $opt_h) { check_for_ORB_init check_for_trailing_whitespace check_for_include_OS_h - check_for_numeric_log check_for_ORB_init check_for_old_documentation_style check_for_ace_log_categories @@ -2450,7 +2377,6 @@ if ($opt_s) { print "--------------------Configuration: Fuzz - Level ",$opt_l, "--------------------\n"; -check_for_export_file () if ($opt_l >= 4); check_for_trailing_whitespace () if ($opt_l >= 4); check_for_lack_ACE_OS () if ($opt_l >= 6); check_for_ACE_Guard () if ($opt_l >= 1); @@ -2490,7 +2416,6 @@ check_for_long_file_names () if ($opt_l >= 1); check_for_improper_main_declaration () if ($opt_l >= 1); check_for_TAO_Local_RefCounted_Object () if ($opt_l >= 1); check_for_include_OS_h () if ($opt_l >= 1); -check_for_numeric_log () if ($opt_l >= 3); check_for_ORB_init () if ($opt_l >= 1); check_for_old_documentation_style () if ($opt_l >= 6); check_for_ace_log_categories () if ($opt_l >= 5); diff --git a/ACE/bin/generate_compile_stats.sh b/ACE/bin/generate_compile_stats.sh index 921119ca869..2df63c4a89c 100755 --- a/ACE/bin/generate_compile_stats.sh +++ b/ACE/bin/generate_compile_stats.sh @@ -33,7 +33,7 @@ usage () echo "--base This option can be used to set the base root directory to" echo " something other than the default \$ACE_ROOT." echo "--name This option can be used to set the software title to something" - echo " other than the default ACE+TAO+CIAO+DAnCE." + echo " other than the default ACE+TAO." echo "--compiler This option can be used to set the compiler to something" echo " other than the default gcc." echo "input_file This is the compilation log file." @@ -737,7 +737,7 @@ create_index_page () echo '<body text = "#000000" link="#000fff" vlink="#ff0f0f" bgcolor="#ffffff">' echo "<br><center><h1>$TITLE</h1></center><br><hr>" if [ $BASE_TITLE = $DEFAULT_TITLE ]; then - echo '<p>We are measuring ACE+TAO+CIAO+DAnCE metrics daily.' + echo '<p>We are measuring ACE+TAO metrics daily.' else echo '<p>' fi @@ -747,8 +747,6 @@ create_index_page () if [ $BASE_TITLE = $DEFAULT_TITLE ]; then echo "<li><a href=\"ace_${TYPE}.html\">ACE</a>" echo "<li><a href=\"tao_${TYPE}.html\">TAO</a>" - echo "<li><a href=\"ciao_${TYPE}.html\">CIAO</a>" - echo "<li><a href=\"dance_${TYPE}.html\">DAnCE</a>" else echo "<li><a href=\"all_${TYPE}.html\">ALL</a>" fi @@ -788,7 +786,7 @@ create_index_page () echo '<TABLE border="2"><TBODY>' for cfg_file in $CFG_FILES; do if [ -r $cfg_file ]; then - echo "<TR><TD>ACE+TAO+CIAO+DAnCE Configuration</TD><TD>`basename $cfg_file`</TD></TR>" + echo "<TR><TD>ACE+TAO Configuration</TD><TD>`basename $cfg_file`</TD></TR>" echo '<TR><TD colspan="2"><PRE>' cat $cfg_file echo '</PRE></TD></TR>' @@ -834,14 +832,12 @@ create_index_page () ############################################################################### create_page () { - # always strip off "ACE___" / "TAO___" / "CIAO___" + # always strip off "ACE___" / "TAO___" local BASE=$1 local TYPE=$2 local EXT="" local BASE_NAME=${BASE#ACE___} local BASE_NAME=${BASE#TAO___} - local BASE_NAME=${BASE#CIAO___} - local BASE_NAME=${BASE#DAnCE___} local TITLE="${TYPE} metrics for ${BASE_NAME//___//}" if [ "$TYPE" = "Compilation" ]; then @@ -885,10 +881,6 @@ create_page () NAME=${i#ACE___} # strip off "TAO___" if it exists NAME=${i#TAO___} - # strip off "CIAO___" if it exists - NAME=${i#CIAO___} - # strip off "DAnCE___" if it exists - NAME=${i#DAnCE___} echo "<a href=\"${i}_${TYPE}.html\">${NAME//___//}</a>" elif [ -e "${DEST}/images/${i}_${TYPE}.png" ]; then # since you'll only have images if it's a composite, strip off the @@ -975,19 +967,13 @@ create_html () local ALL_OBJS="" local ACE_OBJS="" local TAO_OBJS="" - local CIAO_OBJS="" - local DAnCE_OBJS="" while read base colon files; do # create individual page for app/lib sort_list ${files} | create_page ${base} ${TYPE} \ > ${DEST}/${base}_${TYPE}.html - if [ "${base}" != "${base#DAnCE}" ]; then - DAnCE_OBJS="${DAnCE_OBJS} ${base}" - elif [ "${base}" != "${base#CIAO}" ]; then - CIAO_OBJS="${CIAO_OBJS} ${base}" - elif [ "${base}" != "${base#TAO}" ]; then + if [ "${base}" != "${base#TAO}" ]; then TAO_OBJS="${TAO_OBJS} ${base}" elif [ "${base}" != "${base#ACE}" ]; then ACE_OBJS="${ACE_OBJS} ${base}" @@ -1005,12 +991,6 @@ create_html () name="tao_${TYPE}.html" sort_list ${TAO_OBJS} | create_page "TAO" ${TYPE} > ${DEST}/${name} - - name="ciao_${TYPE}.html" - sort_list ${CIAO_OBJS} | create_page "CIAO" ${TYPE} > ${DEST}/${name} - - name="dance_${TYPE}.html" - sort_list ${DAnCE_OBJS} | create_page "DAnCE" ${TYPE} > ${DEST}/${name} else name="all_${TYPE}.html" sort_list ${ALL_OBJS} | create_page $BASE_TITLE ${TYPE} > ${DEST}/${name} @@ -1031,7 +1011,7 @@ DATE="" METRIC="Compilation" FUDGE_FACTOR=0 BASE_ROOT=$ACE_ROOT -DEFAULT_TITLE=ACE+TAO+CIAO+DAnCE +DEFAULT_TITLE=ACE+TAO BASE_TITLE=$DEFAULT_TITLE COMPILER="gcc" diff --git a/ACE/bin/generate_doxygen.pl b/ACE/bin/generate_doxygen.pl index 3827290f7d2..cbe340dc191 100755 --- a/ACE/bin/generate_doxygen.pl +++ b/ACE/bin/generate_doxygen.pl @@ -11,25 +11,17 @@ require File::Path; use Cwd; use File::Spec; use File::Temp qw/ tempfile tempdir /; -use Env qw(ACE_ROOT TAO_ROOT CIAO_ROOT DDS_ROOT); +use Env qw(ACE_ROOT TAO_ROOT DDS_ROOT); # Configuration and default values if (!defined $TAO_ROOT) { $TAO_ROOT = "$ACE_ROOT/TAO"; } -if (!defined $CIAO_ROOT) { - $CIAO_ROOT = "$TAO_ROOT/CIAO"; -} -if (!defined $DANCE_ROOT) { - $DANCE_ROOT = "$TAO_ROOT/DAnCE"; -} $is_release = 0; $exclude_ace = 0; $exclude_tao = !-r "$TAO_ROOT/VERSION.txt"; -$exclude_ciao = !-r "$CIAO_ROOT/VERSION"; -$exclude_dance = !-r "$DANCE_ROOT/VERSION"; $verbose = 0; $perl_path = '/usr/bin/perl'; $html_output_dir = '.'; @@ -40,7 +32,7 @@ if (defined $DDS_ROOT && -r "$DDS_ROOT/VERSION.txt") { $dds_path = Cwd::abs_path($DDS_ROOT); $cwd_path = Cwd::abs_path(getcwd()); if ($dds_path eq $cwd_path) { - $dds = $exclude_ace = $exclude_tao = $exclude_ciao = 1; + $dds = $exclude_ace = $exclude_tao = 1; } } @@ -79,9 +71,6 @@ if (defined $DDS_ROOT && -r "$DDS_ROOT/VERSION.txt") { ,'tao_costrader' ,'tao_portablegroup' ,'tao_ifr'); -@CIAO_DOCS = ('ciao_dds4ccm' - ,'ciao'); -@DANCE_DOCS = ('DAnCE'); @DDS_DOCS = ('dds'); # Modify defaults using the command line arguments @@ -98,8 +87,6 @@ if (!-r "$ACE_ROOT/ace/config.h") { &generate_doxy_files ('ACE', " $ACE_ROOT", " $ACE_ROOT/VERSION.txt", @ACE_DOCS) if (!$exclude_ace); &generate_doxy_files ('TAO', " $TAO_ROOT", " $TAO_ROOT/VERSION.txt", @TAO_DOCS) if (!$exclude_tao); -&generate_doxy_files ('CIAO', " $CIAO_ROOT", " $CIAO_ROOT/VERSION", @CIAO_DOCS) if (!$exclude_ciao); -&generate_doxy_files ('DANCE'," $DANCE_ROOT", " $DANCE_ROOT/VERSION", @DANCE_DOCS) if (!$exclude_dance); &generate_doxy_files ('DDS', "$DDS_ROOT", " $DDS_ROOT/VERSION.txt", @DDS_DOCS) if $dds; unlink "$ACE_ROOT/ace/config.h" if $wrote_configh; @@ -117,10 +104,6 @@ sub parse_args { $exclude_ace = 1; } elsif ($ARGV[0] eq "-exclude_tao") { $exclude_tao = 1; - } elsif ($ARGV[0] eq "-exclude_ciao") { - $exclude_ciao = 1; - } elsif ($ARGV[0] eq "-exclude_dance") { - $exclude_dance = 1; } elsif ($ARGV[0] eq "-include_dds") { $dds = 1; } elsif ($ARGV[0] eq "-verbose") { @@ -162,10 +145,9 @@ sub generate_doxy_files { POSIX::strftime("%Y/%m/%d-%H:%M", localtime) .')'; - my $KIT_path = ($KIT eq 'CIAO') ? 'TAO/CIAO' : $KIT; + my $KIT_path = $KIT; my $translate_paths = - ($KIT eq 'TAO' && !same_dir($TAO_ROOT, $ACE_ROOT, 'TAO')) || - ($KIT eq 'CIAO' && !same_dir($CIAO_ROOT, $TAO_ROOT, 'CIAO')); + ($KIT eq 'TAO' && !same_dir($TAO_ROOT, $ACE_ROOT, 'TAO')))); foreach my $i (@DOCS) { if ($is_release) { diff --git a/ACE/bin/libsize.pl b/ACE/bin/libsize.pl index 0e80cf07994..7b9b4834092 100755 --- a/ACE/bin/libsize.pl +++ b/ACE/bin/libsize.pl @@ -105,8 +105,6 @@ if ($ACE_ROOT =~ /vxworks/) { $size = '/usr/lynx/3.0.0/ppc/cdk/sunos-xcoff-ppc/bin/size'; } elsif ($ACE_ROOT =~ /lynx/) { $size = '/usr/lynx/3.0.0/x86/cdk/sunos-coff-x86/bin/size'; -} elsif ($ACE_ROOT =~ /chorus/) { - $size = '/project/doc/mvme/green68k/gnu/bin/size'; } else { $size = 'size'; } diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py index ed91e30d0ce..525c0002290 100755 --- a/ACE/bin/make_release.py +++ b/ACE/bin/make_release.py @@ -755,8 +755,6 @@ def generate_workspaces (stage_dir): os.putenv ("ACE_ROOT", os.path.join (stage_dir, "ACE_wrappers")) os.putenv ("MPC_ROOT", os.path.join (stage_dir, "ACE_wrappers", "MPC")) os.putenv ("TAO_ROOT", os.path.join (stage_dir, "ACE_wrappers", "TAO")) - os.putenv ("CIAO_ROOT", "") - os.putenv ("DANCE_ROOT", "") os.putenv ("DDS_ROOT", "") # Create option strings diff --git a/ACE/bin/msvc_mpc_auto_compile.pl b/ACE/bin/msvc_mpc_auto_compile.pl index feb843353c6..8afe428f20d 100755 --- a/ACE/bin/msvc_mpc_auto_compile.pl +++ b/ACE/bin/msvc_mpc_auto_compile.pl @@ -14,8 +14,6 @@ if (!$ENV{ACE_ROOT}) { else { $ACE_ROOT = $ENV{ACE_ROOT}; $TAO_ROOT = $ENV{TAO_ROOT}; - $CIAO_ROOT = $ENV{CIAO_ROOT}; - $DANCE_ROOT = $ENV{DANCE_ROOT}; } @directories = (); @@ -34,10 +32,6 @@ else { @orbsvcs_core_dirs = ("$TAO_ROOT\\orbsvcs\\orbsvcs"); -@dance_core_dirs = ("$DANCE_ROOT"); - -@ciao_core_dirs = ("$CIAO_ROOT"); - $debug = 0; $verbose = 0; $print_status = 0; @@ -164,8 +158,6 @@ sub Build_All () push @directories, @ace_core_dirs; push @directories, @tao_core_dirs; push @directories, @orbsvcs_core_dirs; - push @directories, @dance_core_dirs; - push @directories, @ciao_core_dirs; print STDERR "First pass (libraries)\n" if ($print_status == 1); print "\nmsvc_mpc_auto_compile: First Pass CORE (libraries)\n"; @@ -226,8 +218,6 @@ sub Build_All_VC7 () push @directories, @ace_core_dirs; push @directories, @tao_core_dirs; push @directories, @orbsvcs_core_dirs; - push @directories, @dance_core_dirs; - push @directories, @ciao_core_dirs; print STDERR "First pass (libraries)\n" if ($print_status == 1); print "\nmsvc_mpc_auto_compile: First Pass CORE (libraries)\n"; @@ -304,18 +294,7 @@ while ( $#ARGV >= 0 && $ARGV[0] =~ /^(-|\/)/ ) push @directories, @tao_core_dirs; push @directories, @orbsvcs_core_dirs; } - elsif ($ARGV[0] =~ '-CIAO') {# Build the CIAO and related - # libraries - print "Building only CIAO\n" if ( $verbose ); - $use_custom_dir = 1; - push @directories, @ace_core_dirs; - push @directories, @tao_core_dirs; - push @directories, @orbsvcs_core_dirs; - push @directories, @dance_core_dirs; - push @directories, @ciao_core_dirs; - } - elsif ($ARGV[0] =~ '-ALL') {# Build the CIAO and related - # libraries + elsif ($ARGV[0] =~ '-ALL') {# Build all print "Building ALL \n" if ( $verbose ); $build_all = 1; } @@ -360,7 +339,6 @@ while ( $#ARGV >= 0 && $ARGV[0] =~ /^(-|\/)/ ) print "-ACE = Build ACE and its tests\n"; print "-TAO = Build ACE+TAO and its tests\n"; print "-ORBSVCS = Build ACE+TAO+ORBSVCS and its tests\n"; - print "-CIAO = Build ACE+TAO+ORBSVCS+CIAO and its tests\n"; print "-dir <dir> = Compile custom directories\n"; print "-project_root <dir> = Use different root directory than ACE_ROOT\n"; print "\n"; diff --git a/ACE/bin/msvc_static_order.lst b/ACE/bin/msvc_static_order.lst index d109bab0a5b..336ee94c6ab 100644 --- a/ACE/bin/msvc_static_order.lst +++ b/ACE/bin/msvc_static_order.lst @@ -153,250 +153,3 @@ websvcs/lib/websvcs protocols/ace/HTBP/HTBP protocols/ace/RMCast/RMCast protocols/ace/TMCast/TMCast -TAO/CIAO/CCF/CCF/CIDL/CIDL -TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit -TAO/CIAO/CCF/CCF/CompilerElements/CompilerElements -TAO/CIAO/CCF/CCF/IDL2/IDL2 -TAO/CIAO/CCF/CCF/IDL3/IDL3 -TAO/CIAO/CIDLC/CIDLC -TAO/CIAO/ciao/CIAO_Client -TAO/CIAO/ciao/CIAO_Container -TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base -TAO/DAnCE/Deployment/Deployment_stub -TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent -TAO/CIAO/ciaosvcs/Events/CIAO_Events -TAO/DAnCE/Deployment/Deployment_svnt -TAO/DAnCE/Interfaces/ExecutionManager_stub -TAO/DAnCE/DomainApplicationManager/DomainApplicationManager -TAO/CIAO/ciao/CIAO_Server -TAO/DAnCE/ExecutionManager/ExecutionManager -TAO/DAnCE/Interfaces/NodeManager_stub -TAO/DAnCE/NodeApplication/Config_Manager -TAO/DAnCE/NodeApplication/NodeApp_Configurator -TAO/DAnCE/NodeApplication/NA_Configurator -TAO/DAnCE/NodeApplication/NoOp_Configurator -TAO/DAnCE/NodeApplication/NodeApplicationLib -TAO/DAnCE/NodeApplication/NodeApplication -TAO/DAnCE/NodeApplication/RTNA_Configurator -TAO/DAnCE/TargetManager/CIAO_TargetManager_stub -TAO/DAnCE/NodeApplicationManager/NodeApplicationManager -TAO/DAnCE/NodeManager/Monitor_Monitorlib -TAO/DAnCE/NodeManager/NodeManager_svnt -TAO/DAnCE/NodeManager/NodeManager -TAO/CIAO/tools/Config_Handlers/XSC_XML_Generation -TAO/CIAO/tools/Config_Handlers/XSC_XML_Handlers -TAO/CIAO/tools/Config_Handlers/Utils/CIAO_XML_Utils -TAO/CIAO/tools/Config_Handlers/XSC_DynAny_Handler -TAO/CIAO/tools/Config_Handlers/XSC_Config_Handlers_Common -TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_XML_Generation -TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers -TAO/CIAO/tools/Config_Handlers/RT-CCM/RT_CCM_XML_Generation -TAO/CIAO/tools/Config_Handlers/RT-CCM/RT_CCM_Config_Handlers -TAO/CIAO/tools/Config_Handlers/XSC_Config_Handlers -TAO/CIAO/tools/Config_Handlers/Package_Handlers/Package_Config_Handlers -TAO/DAnCE/RepositoryManager/RepositoryManager -TAO/DAnCE/Plan_Generator/Plan_Generator -TAO/DAnCE/Utils/DAnCE_Utils -TAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl -TAO/DAnCE/Plan_Launcher/Plan_Launcher -TAO/DAnCE/RepositoryManager/RMAdmin -TAO/DAnCE/StaticConfigurator/StaticDAnCEParser -TAO/DAnCE/TargetManager/CIAO_TargetManager_svnt -TAO/DAnCE/TargetManager/CIAO_TargetManager_exec -TAO/DAnCE/TargetManager/TMClient -TAO/DAnCE/tests/NodeApplicationTest/NodeAppTest_RoundTrip_stub -TAO/DAnCE/tests/NodeApplicationTest/NodeAppTest_RoundTrip_svnt -TAO/DAnCE/tests/NodeApplicationTest/NodeAppTest_RoundTrip_exec -TAO/DAnCE/tests/NodeApplicationTest/NodeAppTest_client -TAO/DAnCE/tests/NodeApplicationTest/NodeAppTest_client_dynamic -TAO/DAnCE/tests/NodeApplicationTest/NodeAppTest_client_ex -TAO/DAnCE/tests/NodeApplicationTest/NodeAppTest_client_simple -TAO/bin/PerlCIAO/PerlCIAO -TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_idl_gen -TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_stub -TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_skel -TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_StockBroker_idl_gen -TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_StockBroker_cidl_gen -TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_StockBroker_stub -TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_StockBroker_exec -TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_StockBroker_svnt -TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_StockBrokerDriver -TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_StockDistributor_idl_gen -TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_StockDistributor_cidl_gen -TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_StockDistributor_stub -TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_StockDistributor_exec -TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_StockDistributor_svnt -TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_StockDistributorDriver -TAO/CIAO/examples/BasicSP/BasicSP_lem_gen -TAO/CIAO/examples/BasicSP/BasicSP_stub_gen -TAO/CIAO/examples/BasicSP/BasicSP_stub -TAO/CIAO/examples/BasicSP/BasicSP_exec -TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED_lem_gen -TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED_stub_gen -TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED_stub -TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec -TAO/CIAO/examples/BasicSP/BasicSP_svnt -TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED_svnt -TAO/CIAO/examples/BasicSP/BMDevice/BMDevice_lem_gen -TAO/CIAO/examples/BasicSP/BMDevice/BMDevice_stub_gen -TAO/CIAO/examples/BasicSP/BMDevice/BMDevice_stub -TAO/CIAO/examples/BasicSP/BMDevice/BMDevice_exec -TAO/CIAO/examples/BasicSP/BMDevice/BMDevice_svnt -TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay_lem_gen -TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay_stub_gen -TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay_stub -TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec -TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay_svnt -TAO/CIAO/examples/BasicSP/EC/EC_stub_gen -TAO/CIAO/examples/BasicSP/EC/EC_stub -TAO/CIAO/examples/BasicSP/EC/EC_client -TAO/CIAO/examples/BasicSP/EC/EC_controller -TAO/CIAO/examples/BasicSP/EC/EC_lem_gen -TAO/CIAO/examples/BasicSP/EC/EC_exec -TAO/CIAO/examples/BasicSP/EC/EC_svnt -TAO/CIAO/examples/Display/Display_Base/Display_Base_idl_gen -TAO/CIAO/examples/Display/Display_Base/Display_Base_stub -TAO/CIAO/examples/Display/Display_Base/Display_Base_skel -TAO/CIAO/examples/Display/GPS/Display_GPS_idl_gen -TAO/CIAO/examples/Display/GPS/Display_GPS_cidl_gen -TAO/CIAO/examples/Display/GPS/Display_GPS_stub -TAO/CIAO/examples/Display/GPS/Display_GPS_exec -TAO/CIAO/examples/Display/GPS/Display_GPS_svnt -TAO/CIAO/examples/Display/NavDisplay/Display_NavDisplay_idl_gen -TAO/CIAO/examples/Display/NavDisplay/Display_NavDisplay_cidl_gen -TAO/CIAO/examples/Display/NavDisplay/Display_NavDisplay_stub -TAO/CIAO/examples/Display/NavDisplay/Display_NavDisplay_exec -TAO/CIAO/examples/Display/NavDisplay/Display_NavDisplay_svnt -TAO/CIAO/examples/Display/NavDisplayGUI_exec/Display_NavDisplayGUI_exec -TAO/CIAO/examples/Display/NavDisplayGUI_exec/Display_NavDisplayGUI_svnt -TAO/CIAO/examples/Display/RateGen/Display_RateGen_idl_gen -TAO/CIAO/examples/Display/RateGen/Display_RateGen_cidl_gen -TAO/CIAO/examples/Display/RateGen/Display_RateGen_stub -TAO/CIAO/examples/Display/RateGen/Display_RateGen_exec -TAO/CIAO/examples/Display/RateGen/Display_RateGen_svnt -TAO/CIAO/examples/Display/RateGen/Display_controller -TAO/CIAO/examples/Hello/Hello_Base/Hello_Base_idl_gen -TAO/CIAO/examples/Hello/Hello_Base/Hello_Base_stub -TAO/CIAO/examples/Hello/Hello_Base/Hello_Base_skel -TAO/CIAO/examples/Hello/Receiver/Hello_Receiver_idl_gen -TAO/CIAO/examples/Hello/Receiver/Hello_Receiver_cidl_gen -TAO/CIAO/examples/Hello/Receiver/Hello_Receiver_stub -TAO/CIAO/examples/Hello/Receiver/Hello_Receiver_exec -TAO/CIAO/examples/Hello/Receiver/Hello_Receiver_svnt -TAO/CIAO/examples/Hello/Sender/Hello_Sender_idl_gen -TAO/CIAO/examples/Hello/Sender/Hello_Sender_cidl_gen -TAO/CIAO/examples/Hello/Sender/Hello_Sender_stub -TAO/CIAO/examples/Hello/Sender/Hello_Sender_exec -TAO/CIAO/examples/Hello/Sender/Hello_Sender_svnt -TAO/CIAO/examples/Hello/Sender/Hello_starter -TAO/CIAO/examples/Null_Component/Null_Interface_idl_gen -TAO/CIAO/examples/Null_Component/Null_Interface_stub -TAO/CIAO/examples/Null_Component/Null_Interface_skel -TAO/CIAO/examples/Null_Component/Null_Component_idl_gen -TAO/CIAO/examples/Null_Component/Null_Component_cidl_gen -TAO/CIAO/examples/Null_Component/Null_Component_stub -TAO/CIAO/examples/Null_Component/Null_Component_exec -TAO/CIAO/examples/Null_Component/Null_Component_svnt -TAO/CIAO/examples/Null_Component/Null_Component_StaticDAnCEApp -TAO/CIAO/examples/Swapping/Hello_Base/Swapping_Hello_Base_idl_gen -TAO/CIAO/examples/Swapping/Hello_Base/Swapping_Hello_Base_stub -TAO/CIAO/examples/Swapping/Hello_Base/Swapping_Hello_Base_skel -TAO/CIAO/examples/Swapping/Receiver/Swapping_Hello_Receiver_idl_gen -TAO/CIAO/examples/Swapping/Receiver/Swapping_Hello_Receiver_cidl_gen -TAO/CIAO/examples/Swapping/Receiver/Swapping_Hello_Receiver_stub -TAO/CIAO/examples/Swapping/Receiver/Swapping_Hello_Receiver_exec -TAO/CIAO/examples/Swapping/Receiver/Swapping_Hello_Receiver_svnt -TAO/CIAO/examples/Swapping/Sender/Swapping_Hello_Sender_idl_gen -TAO/CIAO/examples/Swapping/Sender/Swapping_Hello_Sender_cidl_gen -TAO/CIAO/examples/Swapping/Sender/Swapping_Hello_Sender_stub -TAO/CIAO/examples/Swapping/Sender/Swapping_Hello_Sender_exec -TAO/CIAO/examples/Swapping/Sender/Swapping_Hello_Sender_exec_1 -TAO/CIAO/examples/Swapping/Sender/Swapping_Hello_Sender_exec_2 -TAO/CIAO/examples/Swapping/Sender/Swapping_Hello_Sender_svnt -TAO/CIAO/examples/Swapping/Sender/Swapping_Hello_Starter -TAO/CIAO/performance-tests/Benchmark/Benchmark_idl_gen -TAO/CIAO/performance-tests/Benchmark/Benchmark_stub -TAO/CIAO/performance-tests/Benchmark/Benchmark_skel -TAO/CIAO/performance-tests/Benchmark/Benchmark_server -TAO/CIAO/performance-tests/Benchmark/RoundTripClient/Benchmark_RoundTripClient_idl_gen -TAO/CIAO/performance-tests/Benchmark/RoundTripClient/Benchmark_RoundTripClient_cidl_gen -TAO/CIAO/performance-tests/Benchmark/RoundTripClient/Benchmark_RoundTripClient_stub -TAO/CIAO/performance-tests/Benchmark/RoundTripClient/Benchmark_RoundTripClient_exec -TAO/CIAO/performance-tests/Benchmark/RoundTripClient/Benchmark_RoundTripClient_svnt -TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_client -TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded_client -TAO/CIAO/performance-tests/Benchmark/RoundTrip/Benchmark_RoundTrip_idl_gen -TAO/CIAO/performance-tests/Benchmark/RoundTrip/Benchmark_RoundTrip_cidl_gen -TAO/CIAO/performance-tests/Benchmark/RoundTrip/Benchmark_RoundTrip_stub -TAO/CIAO/performance-tests/Benchmark/RoundTrip/Benchmark_RoundTrip_exec -TAO/CIAO/performance-tests/Benchmark/RoundTrip/Benchmark_RoundTrip_svnt -TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_client -TAO/CIAO/performance-tests/Benchmark/RoundTripServer/RoundTrip_server -TAO/CIAO/performance-tests/Protocols/common/Protocols_idl_gen -TAO/CIAO/performance-tests/Protocols/common/Protocols_stub -TAO/CIAO/performance-tests/Protocols/common/Protocols_skel -TAO/CIAO/performance-tests/Protocols/Receiver/Protocols_Receiver_idl_gen -TAO/CIAO/performance-tests/Protocols/Receiver/Protocols_Receiver_cidl_gen -TAO/CIAO/performance-tests/Protocols/Receiver/Protocols_Receiver_stub -TAO/CIAO/performance-tests/Protocols/Receiver/Protocols_Receiver_exec -TAO/CIAO/performance-tests/Protocols/Receiver/Protocols_Receiver_svnt -TAO/CIAO/performance-tests/Protocols/Sender/Protocols_Sender_idl_gen -TAO/CIAO/performance-tests/Protocols/Sender/Protocols_Sender_cidl_gen -TAO/CIAO/performance-tests/Protocols/Sender/Protocols_Sender_stub -TAO/CIAO/performance-tests/Protocols/Sender/Protocols_Sender_exec -TAO/CIAO/performance-tests/Protocols/Sender/Protocols_Sender_svnt -TAO/CIAO/performance-tests/Protocols/Controller/Protocols_Controller -TAO/CIAO/tests/Bug_2130_Regression/interfaces/ENW_stub -TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_stub -TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_controller -TAO/CIAO/tests/Bug_2130_Regression/interfaces/ENW_skel -TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_svnt -TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec -TAO/CIAO/tests/CIDL/CodeGen/Basic_idl_gen -TAO/CIAO/tests/CIDL/CodeGen/Basic_stub -TAO/CIAO/tests/CIDL/CodeGen/Basic_skel -TAO/CIAO/tests/CIDL/CodeGen/Basic_CodeGen_idl_gen -TAO/CIAO/tests/CIDL/CodeGen/Basic_CodeGen_cidl_gen -TAO/CIAO/tests/CIDL/CodeGen/Basic_CodeGen_stub -TAO/CIAO/tests/CIDL/CodeGen/Basic_CodeGen_exec -TAO/CIAO/tests/CIDL/CodeGen/Basic_CodeGen_svnt -TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_stub -TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_stub -TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_stub -TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_stub -TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_stub -TAO/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_stub -TAO/CIAO/tests/IDL3/Events/Abstract/Abstract_stub -TAO/CIAO/tests/IDL3/Events/Any/EventAny_local -TAO/CIAO/tests/IDL3/Events/Regular/Regular_stub -TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_stub -TAO/CIAO/tests/IDL3/Homes/Basic/IDL3_Basic_stub -TAO/CIAO/tests/IDL3/Homes/Factory/Factory_stub -TAO/CIAO/tests/IDL3/Homes/Finder/Finder_stub -TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_stub -TAO/CIAO/tools/IDL3_to_IDL2/TAO_IDL3_TO_IDL2_BE -TAO/CIAO/tools/IDL3_to_IDL2/TAO_IDL3_TO_IDL2_EXE -TAO/CIAO/tests/IDL3/ImpliedIDL/All/ConvertIDL3 -TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_stub -TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_stub -TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_stub -TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_stub -TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events_stub -TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_stub -TAO/CIAO/tests/IDL3/Lookup/LookupTest_stub -TAO/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_idl_gen -TAO/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_stub -TAO/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_skel -TAO/CIAO/tests/Minimum/Receiver/Minimum_Base_Receiver_idl_gen -TAO/CIAO/tests/Minimum/Receiver/Minimum_Base_Receiver_cidl_gen -TAO/CIAO/tests/Minimum/Receiver/Minimum_Base_Receiver_stub -TAO/CIAO/tests/Minimum/Receiver/Minimum_Base_Receiver_exec -TAO/CIAO/tests/Minimum/Receiver/Minimum_Base_Receiver_svnt -TAO/CIAO/tests/Minimum/Sender/Minimum_Base_Sender_idl_gen -TAO/CIAO/tests/Minimum/Sender/Minimum_Base_Sender_cidl_gen -TAO/CIAO/tests/Minimum/Sender/Minimum_Base_Sender_stub -TAO/CIAO/tests/Minimum/Sender/Minimum_Base_Sender_exec -TAO/CIAO/tests/Minimum/Sender/Minimum_Base_Sender_svnt -TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers_Tests -TAO/CIAO/tools/Config_Handlers/XSC_Config_Handlers_Tests -TAO/CIAO/tools/Config_Handlers/Package_Handlers/Package_Config_Handlers_Tests diff --git a/ACE/docs/ACE-development-process.html b/ACE/docs/ACE-development-process.html index fa1f6cb500a..87d5d0409d6 100644 --- a/ACE/docs/ACE-development-process.html +++ b/ACE/docs/ACE-development-process.html @@ -12,14 +12,14 @@ vlink="#ff0f0f" bgcolor="#ffffff"> <hr> -<h3>The ACE+TAO+CIAO+DAnCE Development and Release Process</h3> +<h3>The ACE+TAO Development and Release Process</h3> To improve the quality of our software and minimize development effort, we try to follow the structured development and release process described below.<p> An important concept to keep in mind is <em>risk</em>. Before you -commit <em>any</em> change to ACE+TAO+CIAO+DAnCE, please consider the effects +commit <em>any</em> change to ACE+TAO, please consider the effects that it will have. Could it possibly cause a build failure, on any platform? Could it possibly cause different run-time behavior? And so on. If so, it is your responsibility to adequately build and test @@ -35,11 +35,11 @@ blocked for the duration of the broken build, the fix, and the rebuild.<p> <hr> -<h3>The ACE+TAO+CIAO+DAnCE Development Process</h3> +<h3>The ACE+TAO Development Process</h3> -The ACE+TAO+CIAO+DAnCE development process looks like:<p> +The ACE+TAO development process looks like:<p> <ol> - <li>Every change to ACE+TAO+CIAO+DAnCE must have a bug report. <em>Change</em> + <li>Every change to ACE+TAO must have a bug report. <em>Change</em> includes fixes, enhancements, updates, and so on. <li><a href="https://github.com/DOCGroup/ACE_TAO/issues">Create a an issue</a>. @@ -49,9 +49,9 @@ an issue</a>. changelog <li>Test the change sufficiently to demonstrate that it both does what is intended, and doesn't break anything. The test may be - as simple as building and running the ACE+TAO+CIAO+DAnCE tests on at least two + as simple as building and running the ACE+TAO tests on at least two platforms. - Or as complicated as rebuilding and test all of ACE+TAO+CIAO+DAnCE on + Or as complicated as rebuilding and test all of ACE+TAO on all platforms that we have. <li>Merge the changes only to master when you are available the next 3 days to resolve any issues. @@ -102,7 +102,7 @@ A bug should typically follow this life cycle:<p> At all times, we'll have a build czar. The role may be shared by multiple people. The build czar is responsible for ensuring that the next kits are clean, <em>i.e.</em>, it builds and runs cleanly on all -platforms. The status of all ACE+TAO+CIAO+DAnCE builds is tracked automatically +platforms. The status of all ACE+TAO builds is tracked automatically <A HREF="http://www.dre.vanderbilt.edu/scoreboard"</A>online</A>.<p> A comprehensive summary of the build czar's role is available <A HREF="bczar/bczar.html">here</A>. @@ -132,22 +132,22 @@ violator. This is also intentional, desirable, beneficial, and the Right Thing[TM] to do.<p> <p><hr> -<H3>The ACE+TAO+CIAO+DAnCE Release Process</H3> +<H3>The ACE+TAO Release Process</H3> <P> -Minor releases of ACE+TAO+CIAO+DAnCE occur periodically, typically twice a +Minor releases of ACE+TAO occur periodically, typically twice a year. Minor releases have two-digit numbers, <EM>e.g.,</EM> 5.3. Major releases are released infrequently, typically once a year. Major releases are 1-digit numbers, <EM>e.g.,</EM>5, that include substantially new functionality. Both major and minor releases are carefully tested on all platforms the ACE+TAO run on. In particular, -we do not put out major or minor releases of ACE+TAO+CIAO+DAnCE until all the +we do not put out major or minor releases of ACE+TAO until all the compilations and regression tests work successful on all the platform we support. <P> Between major/minor releases, we release micro releases periodically, -<EM>e.g.,</EM> 3-4 times per year, so that ACE+TAO+CIAO+DAnCE users can -download and test our latest work in progress. ACE+TAO+CIAO+DAnCE micro +<EM>e.g.,</EM> 3-4 times per year, so that ACE+TAO users can +download and test our latest work in progress. ACE+TAO micro release kits have three-digit numbers, <EM>e.g.,</EM> 5.3.1. Micro releases often contain important fixes that aren't in the major/minor releases and will compile cleanly and pass most tests on most @@ -159,7 +159,7 @@ features may be changed or removed between the micro releases. <P> <H3>Contributions from the Open-Source Community</H3> <P> -Over the years, ACE+TAO+CIAO have benefited significantly from +Over the years, ACE+TAO have benefited significantly from contributions by <A HREF="http://www.dre.vanderbilt.edu/~schmidt/ACE-members.html">thousands</A> of developers in the open-source community. To avoid fragmentation of diff --git a/ACE/docs/ACE-guidelines.html b/ACE/docs/ACE-guidelines.html index ac29d568514..9dcb91359ce 100644 --- a/ACE/docs/ACE-guidelines.html +++ b/ACE/docs/ACE-guidelines.html @@ -128,7 +128,7 @@ bgcolor="#ffffff"> .<p> <li> Never use <CODE>assert()</CODE> macros or related constructs - (such as abort()) calls in core ACE, TAO, and CIAO + (such as abort()) calls in core ACE and TAO library/framework code. These macros are a major problem for production software that uses this code since the error-handling strategy (i.e., abort the process) is @@ -139,13 +139,13 @@ bgcolor="#ffffff"> conditions/invariants via exceptions or error return values. It's fine to use <CODE>assert()</CODE> macros et al. in test programs, but make sure these tests never find their way into - the core ACE, TAO, and CIAO library/framework code base. <P> + the core ACE and TAO library/framework code base. <P> </ul> <li><strong>Coding Style</strong><p> <ul> - <LI> When writing ACE, TAO, and CIAO class and method names make sure to use underscores ('_') to separate the parts of a name rather than intercaps. For example, use + <LI> When writing ACE and TAO class and method names make sure to use underscores ('_') to separate the parts of a name rather than intercaps. For example, use <pre> class ACE_Monitor_Control diff --git a/ACE/docs/ACE-porting.html b/ACE/docs/ACE-porting.html index 18d1799164b..ead06da4ffe 100644 --- a/ACE/docs/ACE-porting.html +++ b/ACE/docs/ACE-porting.html @@ -11,26 +11,25 @@ </HEAD> <BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#0000FF" VLINK="#FF0000"> -<HR><P> <H3>Porting ACE, TAO, and CIAO to a New OS Platform</H3><P> +<HR><P> <H3>Porting ACE and TAO to a New OS Platform</H3><P> -<A HREF="https://www.dre.vanderbilt.edu/ACE">ACE</A>, <A -HREF="https://www.dre.vanderbilt.edu/TAO">TAO</A>, and <A -HREF="https://www.dre.vanderbilt.edu/CIAO">CIAO</A> have been +<A HREF="https://www.dre.vanderbilt.edu/ACE">ACE</A> and <A +HREF="https://www.dre.vanderbilt.edu/TAO">TAO</A> have been ported to <A HREF="https://www.dre.vanderbilt.edu/versions.html">many -OS platforms</A>. Porting ACE, TAO, and CIAO to new platforms is +OS platforms</A>. Porting ACE and TAO to new platforms is fairly easy. The following document describes the step-by-step process to use when porting the various <A HREF="https://www.dre.vanderbilt.edu/~schmidt/ACE-overview.html">components and layers</A> in ACE to a new OS platform. Once ACE is ported, it is -straightforward to port TAO and CIAO, as well.<P> +straightforward to port TAO as well.<P> Before starting a port that you plan to contribute back to the -ACE+TAO+CIAO open-source community, we recommend that you do the +ACE+TAO open-source community, we recommend that you do the following: <UL> <LI> Read and follow the <A HREF="ACE-guidelines.html">programming style - guidelines</A> we use when writing ACE, TAO, and CIAO code, + guidelines</A> we use when writing ACE and TAO code, which will make it much easier to integrate and maintain your port in the source tree. <P> @@ -120,20 +119,19 @@ be relatively easy to port the rest of ACE because most of the platform-dependent code is localized in the lower layers of ACE. <P> <hr align=left width="50%"><P> -<H4>Port TAO and CIAO</H4> +<H4>Port TAO</H4> After porting and successfully testing all the ACE framework components, it should be straightforward to port and <A -HREF="../TAO/TAO-INSTALL.html">install</A> TAO and <A -HREF="../TAO/CIAO/CIAO-INSTALL.html">install</A> CIAO because the bulk +HREF="../TAO/TAO-INSTALL.html">install</A> TAO because the bulk of their platform-dependent code is localized in ACE. Typically, the -only problems that arise when porting TAO and CIAO is bugs and +only problems that arise when porting TAO is bugs and limitations with C++ compilers. <P> <HR><P> -<H3>C++ Features Required to Port ACE, TAO, and CIAO</H3> +<H3>C++ Features Required to Port ACE and TAO</H3> -ACE, TAO, and CIAO have been ported to most C++ compilers. The +ACE and TAO have been ported to most C++ compilers. The following is a list of which C++ features a compiler must support in order to compile ACE and TAO: @@ -147,16 +145,16 @@ order to compile ACE and TAO: compiler must support multiple inheritance and dynamic binding. <P> -<LI> <B>Namespaces</B> -- ACE+TAO+CIAO utilizes C++ namespaces, so the +<LI> <B>Namespaces</B> -- ACE+TAO utilizes C++ namespaces, so the C++ compiler must support them.<P> -<LI> <B>ANSI casts and RTTI</B> -- ACE+TAO+CIAO uses the ANSI C++ +<LI> <B>ANSI casts and RTTI</B> -- ACE+TAO uses the ANSI C++ casts, so the C++ compiler must support them, which implies support for RTTI.<P> </UL> -The following is a list of which C++ features that ACE, TAO, CIAO can +The following is a list of which C++ features that ACE and TAO can take advantage of if a compiler supports them: <UL> @@ -173,14 +171,14 @@ take advantage of if a compiler supports them: of STL behave differently. ACE therefore does not depends on STL and does not use it internally. If your target platform(s) support STL you should be able to - use it with ACE, TAO, and CIAO without problems, though your C++ + use it with ACE and TAO without problems, though your C++ compiler may have problems with it (this is beyond the scope of ACE, however). <P> If you are considering STL, you might consider <A HREF="http://www.stlport.org/">STLport</a>, - which is a port of the SGI STL to numerous platforms that ACE, - TAO, and CIAO also support. <P> + which is a port of the SGI STL to numerous platforms that ACE and + TAO also support. <P> </UL> diff --git a/ACE/docs/run_test.txt b/ACE/docs/run_test.txt index 5e7e089f2a4..3aef95935b9 100644 --- a/ACE/docs/run_test.txt +++ b/ACE/docs/run_test.txt @@ -140,7 +140,7 @@ $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); @endverbatim -Because of the way tests work on chorus, we need to have a fully +We need to have a fully qualified path to all *.ior and *.conf files. We unlink the file immediately because we use WaitForFileTimed later. diff --git a/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp b/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp index a3d57985f87..8b3a254bf9e 100644 --- a/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp +++ b/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp @@ -153,9 +153,9 @@ int processWin32Record (ALLOCATOR *shmem_allocator) { return processRecord (shmem_allocator); } - ACE_SEH_EXCEPT (handle_remap (GetExceptionInformation ())) - { } + { + } return 0; } diff --git a/ACE/examples/C++NPv1/Logging_Client.cpp b/ACE/examples/C++NPv1/Logging_Client.cpp index 87b793c4ea3..c752b33e286 100644 --- a/ACE/examples/C++NPv1/Logging_Client.cpp +++ b/ACE/examples/C++NPv1/Logging_Client.cpp @@ -16,9 +16,7 @@ // FUZZ: disable check_for_streams_include #include "ace/streams.h" -#if defined (ACE_WIN32) && (!defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \ - (ACE_HAS_STANDARD_CPP_LIBRARY == 0) || \ - defined (ACE_USES_OLD_IOSTREAMS)) +#if defined (ACE_WIN32) && defined (ACE_USES_OLD_IOSTREAMS) # include <stdio.h> #else # include <string> @@ -99,9 +97,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (connector.connect (logging_client.peer (), server_addr) < 0) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "connect()"), 1); -#if defined (ACE_WIN32) && (!defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \ - (ACE_HAS_STANDARD_CPP_LIBRARY == 0) || \ - defined (ACE_USES_OLD_IOSTREAMS)) +#if defined (ACE_WIN32) && defined (ACE_USES_OLD_IOSTREAMS) for (;;) { char user_input[ACE_Log_Record::MAXLOGMSGLEN]; if (!gets (user_input)) @@ -115,21 +111,13 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) "%p\n", "logging_client.send()"), 1); } #else - // Limit the number of characters read on each record cin.width (ACE_Log_Record::MAXLOGMSGLEN); for (;;) { - -#if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB == 0) - string user_input; - getline (cin, user_input, '\n'); -#else std::string user_input; std::getline (cin, user_input, '\n'); -#endif - if (!cin || cin.eof ()) break; ACE_Time_Value now (ACE_OS::gettimeofday ()); diff --git a/ACE/examples/C++NPv2/Select_Reactor_Logging_Server.cpp b/ACE/examples/C++NPv2/Select_Reactor_Logging_Server.cpp index 275e4de8420..cc3a1ae9b36 100644 --- a/ACE/examples/C++NPv2/Select_Reactor_Logging_Server.cpp +++ b/ACE/examples/C++NPv2/Select_Reactor_Logging_Server.cpp @@ -9,9 +9,7 @@ #include "ace/Select_Reactor.h" #include "ace/Thread_Manager.h" -#if defined (ACE_WIN32) && (!defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \ - (ACE_HAS_STANDARD_CPP_LIBRARY == 0) || \ - defined (ACE_USES_OLD_IOSTREAMS)) +#if defined (ACE_WIN32) && defined (ACE_USES_OLD_IOSTREAMS) # include <stdio.h> #else # include <string> @@ -58,9 +56,7 @@ static ACE_THR_FUNC_RETURN controller (void *arg) { Quit_Handler *quit_handler = 0; ACE_NEW_RETURN (quit_handler, Quit_Handler (reactor), 0); -#if defined (ACE_WIN32) && (!defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \ - (ACE_HAS_STANDARD_CPP_LIBRARY == 0) || \ - defined (ACE_USES_OLD_IOSTREAMS)) +#if defined (ACE_WIN32) && defined (ACE_USES_OLD_IOSTREAMS) for (;;) { char user_input[80]; ACE_OS::fgets (user_input, sizeof (user_input), stdin); diff --git a/ACE/examples/C++NPv2/Server_Shutdown.cpp b/ACE/examples/C++NPv2/Server_Shutdown.cpp index ce5fae2f8fb..5e9f7cfec4a 100644 --- a/ACE/examples/C++NPv2/Server_Shutdown.cpp +++ b/ACE/examples/C++NPv2/Server_Shutdown.cpp @@ -11,9 +11,7 @@ // FUZZ: disable check_for_streams_include #include "ace/streams.h" -#if defined (ACE_WIN32) && (!defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \ - (ACE_HAS_STANDARD_CPP_LIBRARY == 0) || \ - defined (ACE_USES_OLD_IOSTREAMS)) +#if defined (ACE_WIN32) && defined (ACE_USES_OLD_IOSTREAMS) # include <stdio.h> #else # include <string> @@ -47,9 +45,7 @@ static ACE_THR_FUNC_RETURN controller (void *arg) { Quit_Handler *quit_handler = 0; ACE_NEW_RETURN (quit_handler, Quit_Handler (reactor), 0); -#if defined (ACE_WIN32) && (!defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \ - (ACE_HAS_STANDARD_CPP_LIBRARY == 0) || \ - defined (ACE_USES_OLD_IOSTREAMS)) +#if defined (ACE_WIN32) && defined (ACE_USES_OLD_IOSTREAMS) for (;;) { char user_input[80]; ACE_OS::fgets (user_input, sizeof (user_input), stdin); diff --git a/ACE/examples/C++NPv2/TP_Reactor_Logging_Server.cpp b/ACE/examples/C++NPv2/TP_Reactor_Logging_Server.cpp index 5b3e73b1d68..0695e751c8e 100644 --- a/ACE/examples/C++NPv2/TP_Reactor_Logging_Server.cpp +++ b/ACE/examples/C++NPv2/TP_Reactor_Logging_Server.cpp @@ -9,9 +9,7 @@ #include "ace/TP_Reactor.h" #include "ace/Thread_Manager.h" -#if defined (ACE_WIN32) && (!defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \ - (ACE_HAS_STANDARD_CPP_LIBRARY == 0) || \ - defined (ACE_USES_OLD_IOSTREAMS)) +#if defined (ACE_WIN32) && defined (ACE_USES_OLD_IOSTREAMS) # include <stdio.h> #else # include <string> @@ -59,9 +57,7 @@ static ACE_THR_FUNC_RETURN controller (void *arg) { Quit_Handler *quit_handler = 0; ACE_NEW_RETURN (quit_handler, Quit_Handler (reactor), 0); -#if defined (ACE_WIN32) && (!defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \ - (ACE_HAS_STANDARD_CPP_LIBRARY == 0) || \ - defined (ACE_USES_OLD_IOSTREAMS)) +#if defined (ACE_WIN32) && defined (ACE_USES_OLD_IOSTREAMS) for (;;) { char user_input[80]; ACE_OS::fgets (user_input, sizeof (user_input), stdin); @@ -72,13 +68,9 @@ static ACE_THR_FUNC_RETURN controller (void *arg) { } #else for (;;) { -#if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB == 0) - string user_input; - getline (cin, user_input, '\n'); -#else std::string user_input; std::getline (cin, user_input, '\n'); -#endif + if (user_input == "quit") { reactor->notify (quit_handler); break; diff --git a/ACE/examples/IOStream/client/iostream_client.cpp b/ACE/examples/IOStream/client/iostream_client.cpp index e454440ed0b..3d71a72bde5 100644 --- a/ACE/examples/IOStream/client/iostream_client.cpp +++ b/ACE/examples/IOStream/client/iostream_client.cpp @@ -32,7 +32,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) int i; float f; -#if defined (ACE_HAS_STRING_CLASS) ACE_IOStream_String s1; ACE_IOStream_String s2; server >> s1 >> i >> f >> s2; @@ -42,13 +41,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) cerr << i << " "; cerr << f << " "; cerr << s2 << endl; -#else - server >> i >> f; - - cerr << "(" << ACE_OS::getpid () << ") Server sent:\n\t"; - cerr << "(" << i << ") "; - cerr << "(" << f << ")" << endl; -#endif /* ACE_HAS_STRING_CLASS */ if (server.close () == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/ACE/examples/IOStream/server/iostream_server.cpp b/ACE/examples/IOStream/server/iostream_server.cpp index 4ef4a6d3026..f658f703bad 100644 --- a/ACE/examples/IOStream/server/iostream_server.cpp +++ b/ACE/examples/IOStream/server/iostream_server.cpp @@ -45,7 +45,6 @@ Handler::handle_input (ACE_HANDLE) if (this->peer ().eof ()) ACE_ERROR_RETURN ((LM_ERROR, "(%P) connection closed\n"), -1); -#if defined (ACE_HAS_STRING_CLASS) ACE_IOStream_String s; if (!(this->peer () >> i >> f >> s)) @@ -57,17 +56,6 @@ Handler::handle_input (ACE_HANDLE) if (!(this->peer () << "Received: " << i << " " << f << " " << s << endl)) ACE_ERROR_RETURN ((LM_ERROR, "(%P) %p\n", "error sending data"), -1); -#else - if (!(this->peer () >> i >> f)) - ACE_ERROR_RETURN ((LM_ERROR, "(%P) %p\n", "error getting data"), -1); - - cerr << "(" << ACE_OS::getpid () << ") Client sent:\n\t"; - cerr << "(" << i << ") (" << f << ")" << endl; - - if (!(this->peer () << i << " " << f << endl)) - ACE_ERROR_RETURN ((LM_ERROR, "(%P) %p\n", "error sending data"), -1); -#endif /* ACE_HAS_STRING_CLASS */ - // In order to flush the output to the peer, we have to use the sync // () function. Some iostreams implementations let us use a 'flush' // function much like the 'endl' function. diff --git a/ACE/include/makeinclude/platform_aix_g++.GNU b/ACE/include/makeinclude/platform_aix_g++.GNU index a5f876e3bf5..0ec6775e370 100644 --- a/ACE/include/makeinclude/platform_aix_g++.GNU +++ b/ACE/include/makeinclude/platform_aix_g++.GNU @@ -57,6 +57,7 @@ ifeq ($(buildbits),64) ARFLAGS += -X64 endif DCFLAGS += -g +DCCFLAGS += -g DLD = $(CXX) LD = $(CXX) # Linking TAO_IDL runs out of TOC space unless -bbigtoc is given to ld. diff --git a/ACE/include/makeinclude/platform_hpux_gcc.GNU b/ACE/include/makeinclude/platform_hpux_gcc.GNU index 2a812d8cd00..f6b754aa32a 100644 --- a/ACE/include/makeinclude/platform_hpux_gcc.GNU +++ b/ACE/include/makeinclude/platform_hpux_gcc.GNU @@ -44,6 +44,7 @@ endif #CCFLAGS += -fstrict-prototype #endif DCFLAGS += -g +DCCFLAGS += -g DLD = $(CXX) LD = $(CXX) OCFLAGS += -O2 diff --git a/ACE/include/makeinclude/platform_vxworks6.2.GNU b/ACE/include/makeinclude/platform_vxworks6.2.GNU index 8ab8fd3707d..235d685c575 100644 --- a/ACE/include/makeinclude/platform_vxworks6.2.GNU +++ b/ACE/include/makeinclude/platform_vxworks6.2.GNU @@ -58,7 +58,6 @@ ifeq ("$(WIND_HOST_TYPE)","x86-win32") PWD=$(subst \,/,$(shell pwd)) ACE_ROOT:=$(subst \,/,$(ACE_ROOT)) TAO_ROOT:=$(subst \,/,$(TAO_ROOT)) - CIAO_ROOT:=$(subst \,/,$(CIAO_ROOT)) HOST_ROOT:=$(subst \,/,$(HOST_ROOT)) override RM=rm -f endif # x86-win32 diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU index d6d047ca3f7..28f2591eef5 100644 --- a/ACE/include/makeinclude/platform_vxworks6.3.GNU +++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU @@ -59,7 +59,6 @@ ifeq ("$(WIND_HOST_TYPE)","x86-win32") PWD=$(subst \,/,$(shell pwd)) ACE_ROOT:=$(subst \,/,$(ACE_ROOT)) TAO_ROOT:=$(subst \,/,$(TAO_ROOT)) - CIAO_ROOT:=$(subst \,/,$(CIAO_ROOT)) HOST_ROOT:=$(subst \,/,$(HOST_ROOT)) override RM=rm -f HOST_EXE_EXT = .exe diff --git a/ACE/include/makeinclude/platform_vxworks7.0.GNU b/ACE/include/makeinclude/platform_vxworks7.0.GNU index ababc0ae6f0..6ab9dd59abd 100644 --- a/ACE/include/makeinclude/platform_vxworks7.0.GNU +++ b/ACE/include/makeinclude/platform_vxworks7.0.GNU @@ -56,7 +56,6 @@ ifeq ($(WIND_HOST_TYPE),x86-win32) PWD = $(subst \,/,$(shell pwd)) ACE_ROOT := $(subst \,/,$(ACE_ROOT)) TAO_ROOT := $(subst \,/,$(TAO_ROOT)) - CIAO_ROOT := $(subst \,/,$(CIAO_ROOT)) HOST_ROOT := $(subst \,/,$(HOST_ROOT)) override RM = rm -f HOST_EXE_EXT = .exe diff --git a/ACE/include/makeinclude/platform_win32_msvc.GNU b/ACE/include/makeinclude/platform_win32_msvc.GNU index 3a073de9951..afae982419e 100644 --- a/ACE/include/makeinclude/platform_win32_msvc.GNU +++ b/ACE/include/makeinclude/platform_win32_msvc.GNU @@ -10,7 +10,7 @@ # Assuming the msysCORE archive is extracted to c:\msys... # Start the Visual C++ Command Prompt -# Set ACE_ROOT (TAO_ROOT, CIAO_ROOT, DDS_ROOT) +# Set ACE_ROOT (TAO_ROOT, DDS_ROOT) # Add C:\msys\bin to PATH along with %ACE_ROOT%\lib and %ACE_ROOT%\bin # If necessary, generate GNUmakefiles with MPC (set MPC_ROOT, use -type gnuace) # Run "make" diff --git a/ACE/performance-tests/Misc/childbirth_time.cpp b/ACE/performance-tests/Misc/childbirth_time.cpp index cfbdf1f0561..09177e6cdf6 100644 --- a/ACE/performance-tests/Misc/childbirth_time.cpp +++ b/ACE/performance-tests/Misc/childbirth_time.cpp @@ -1,4 +1,3 @@ - //============================================================================= /** * @file childbirth_time.cpp @@ -46,16 +45,11 @@ * -e: Exec a program after fork (). This option has no * effect on NT. * - * = CREATION DATE - * June 29, 1997 - * * @author Nanbor Wang */ //============================================================================= - // Process Creation profiling - #include "ace/OS_NS_unistd.h" #include "ace/OS_main.h" #include "ace/Get_Opt.h" @@ -74,13 +68,20 @@ size_t MULTIPLY_FACTOR = 10; typedef double (*Profiler)(size_t); -static int do_exec_after_fork = 0; +static bool do_exec_after_fork = false; /// do nothing thread function +#if defined (ACE_HAS_WTHREADS) +DWORD WINAPI ace_empty (LPVOID) +{ + return 0; +} +#else extern "C" void *ace_empty (void*) { return 0; } +#endif static double prof_ace_process (size_t iteration) @@ -94,7 +95,7 @@ prof_ace_process (size_t iteration) iteration *= MULTIPLY_FACTOR; - if (do_exec_after_fork == 0) + if (!do_exec_after_fork) popt.creation_flags (ACE_Process_Options::NO_EXEC); ACE_Profile_Timer ptimer; @@ -111,7 +112,7 @@ prof_ace_process (size_t iteration) if (result == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "process.spawn"), -1); - else if (do_exec_after_fork == 0 && result == 0) + else if (!do_exec_after_fork && result == 0) ACE_OS::exit (0) ; else { @@ -334,7 +335,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) int c; size_t iteration = 10; Profiler profiler = 0; - const char *profile_name = 0 ; + const char *profile_name = 0; while ((c=get_opt ()) != -1) { @@ -374,7 +375,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) ACE_High_Res_Timer::get_env_global_scale_factor (); break; case 'e': - do_exec_after_fork = 1; + do_exec_after_fork = true; break; default: break; @@ -388,7 +389,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) double time = profiler (iteration); if (time > 0) ACE_DEBUG ((LM_DEBUG, - "Average performance of %d iterations of %s: %.0f usec\n", + "Average performance of %d iterations of %C: %.0f usec\n", iteration * MULTIPLY_FACTOR, profile_name, time * 1e6)); } return 0; diff --git a/ACE/tests/Based_Pointer_Test.cpp b/ACE/tests/Based_Pointer_Test.cpp index 93888ff3741..875bb70d188 100644 --- a/ACE/tests/Based_Pointer_Test.cpp +++ b/ACE/tests/Based_Pointer_Test.cpp @@ -79,7 +79,6 @@ int singleton_test () // Protection against this test being run on platforms not supporting Dlls. #if defined(ACE_HAS_DYNAMIC_LINKING) - ACE_TString dll_file; const char *subdir_env = ACE_OS::getenv ("ACE_EXE_SUB_DIR"); if (subdir_env) diff --git a/ACE/tests/Basic_Types_Test.cpp b/ACE/tests/Basic_Types_Test.cpp index b02e691577f..57d7d388026 100644 --- a/ACE/tests/Basic_Types_Test.cpp +++ b/ACE/tests/Basic_Types_Test.cpp @@ -8,7 +8,6 @@ */ //============================================================================= - #include "ace/config-all.h" // Don't use the ACE version accessors in class ACE, so that we can // support this test cleanly with the OS component, only. @@ -157,7 +156,6 @@ run_main (int, ACE_TCHAR *[]) (int) ACE_OS::sysconf (_SC_CLK_TCK))); #endif /* _SC_CLK_TCK */ - ACE_END_TEST; return errors == 0 ? 0 : 1; } diff --git a/ACE/tests/Bound_Ptr_Test.cpp b/ACE/tests/Bound_Ptr_Test.cpp index a3eb060ebe5..6f0c2ede69e 100644 --- a/ACE/tests/Bound_Ptr_Test.cpp +++ b/ACE/tests/Bound_Ptr_Test.cpp @@ -18,12 +18,9 @@ #include "Bound_Ptr_Test.h" #include "ace/Task.h" - - // The following Parent and Child classes illustrate how you might use the // ACE_Strong_Bound_Ptr and ACE_Weak_Bound_Ptr together in cyclic // relationships. - struct Child_Base { virtual ~Child_Base (); @@ -32,7 +29,6 @@ struct Child_Base virtual void do_something () = 0; }; - // This class should only be created on the heap. Normally it would be an // abstract class, and the implementation would be elsewhere. struct Parent @@ -75,7 +71,6 @@ Child_Base::~Child_Base () { } - size_t Parent::instance_count_ = 0; Parent::Parent () diff --git a/ACE/tests/Bound_Ptr_Test.h b/ACE/tests/Bound_Ptr_Test.h index 326fc2e8ae0..cad39282236 100644 --- a/ACE/tests/Bound_Ptr_Test.h +++ b/ACE/tests/Bound_Ptr_Test.h @@ -22,9 +22,9 @@ struct Printer { Printer (const char *message); - ~Printer (void) ; + ~Printer () ; - void print (void); + void print (); const char *message_; static size_t instance_count_; diff --git a/ACE/tests/Bug_2820_Regression_Test.cpp b/ACE/tests/Bug_2820_Regression_Test.cpp index 9e61081c0e3..1dde2f92aed 100644 --- a/ACE/tests/Bug_2820_Regression_Test.cpp +++ b/ACE/tests/Bug_2820_Regression_Test.cpp @@ -68,7 +68,7 @@ run_main (int, ACE_TCHAR *[]) notify_count, pre_notify_count, pos_notify_count)); } - ACE_auto_ptr_reset(reactor, (ACE_Reactor*)0); + reactor.reset (); // Reset the reactor in the event handler, since it is gone.p v->reactor(0); diff --git a/ACE/tests/Bug_3709_Regression_Test.cpp b/ACE/tests/Bug_3709_Regression_Test.cpp index f902a4bfbc3..ab2166e5099 100644 --- a/ACE/tests/Bug_3709_Regression_Test.cpp +++ b/ACE/tests/Bug_3709_Regression_Test.cpp @@ -12,21 +12,6 @@ using namespace std; -// MSVC_71_OR_OLDER -#if defined(_MSC_VER) && _MSC_VER < 1400 -#define BROKEN_TEMPLATE_TEMPLATE -#endif - -#ifdef __SUNPRO_CC -#define BROKEN_TEMPLATE_TEMPLATE -#endif - -// HP aC++ 03.x fails this -#if defined(__HP_aCC) && (__HP_aCC < 40000) -#define BROKEN_TEMPLATE_TEMPLATE -#endif - -#ifndef BROKEN_TEMPLATE_TEMPLATE template<template<typename U, typename = std::allocator<U> > class container, typename DT> container<DT> initializer(const DT &d) { @@ -34,17 +19,14 @@ container<DT> initializer(const DT &d) t.insert(t.end(), d); return t; } -#endif int run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("Bug_3709_Regression_Test")); -#ifndef BROKEN_TEMPLATE_TEMPLATE vector<int> v = initializer<vector>(5); v.clear (); -#endif ACE_END_TEST; diff --git a/ACE/tests/Compiler_Features_12_Test.cpp b/ACE/tests/Compiler_Features_12_Test.cpp index eef58bdd24a..12c7c0a30c3 100644 --- a/ACE/tests/Compiler_Features_12_Test.cpp +++ b/ACE/tests/Compiler_Features_12_Test.cpp @@ -13,13 +13,6 @@ // Similar to Bug_3709_Regression_Test.cpp... -// HP aC++ 03.x fails this -#if defined(__HP_aCC) && (__HP_aCC < 40000) -#define BROKEN_TEMPLATE_TEMPLATE -#endif - -#ifndef BROKEN_TEMPLATE_TEMPLATE - template<typename T> struct Pair { @@ -41,8 +34,6 @@ struct Array Tuple<T> array[5]; }; -#endif /* BROKEN_TEMPLATE_TEMPLATE */ - int run_main (int, ACE_TCHAR *[]) { @@ -52,8 +43,6 @@ run_main (int, ACE_TCHAR *[]) // failure int status = 0; -#ifndef BROKEN_TEMPLATE_TEMPLATE - Array<int, Pair> pairs; pairs.array[0].x1 = 0; ACE_UNUSED_ARG (pairs); @@ -62,8 +51,6 @@ run_main (int, ACE_TCHAR *[]) triples.array[1].t3 = 0; ACE_UNUSED_ARG (triples); -#endif /* BROKEN_TEMPLATE_TEMPLATE */ - ACE_END_TEST; return status; } diff --git a/ACE/tests/Compiler_Features_20_DLL.h b/ACE/tests/Compiler_Features_20_DLL.h index 4dfc196d115..73a51bc4c97 100644 --- a/ACE/tests/Compiler_Features_20_DLL.h +++ b/ACE/tests/Compiler_Features_20_DLL.h @@ -7,18 +7,16 @@ */ //============================================================================= - #ifndef ACE_TESTS_COMPILER_FEATURES_20_DLL_H #define ACE_TESTS_COMPILER_FEATURES_20_DLL_H #include "test_config.h" - #include "Compiler_Features_20_DLL_Export.h" class COMPILER_FEATURES_20_DLL_Export UtcT { public: - ~UtcT (void) = default; + ~UtcT () = default; }; #endif /* ACE_TESTS_COMPILER_FEATURES_20_DLL_H */ diff --git a/ACE/tests/Compiler_Features_39_Test.cpp b/ACE/tests/Compiler_Features_39_Test.cpp new file mode 100644 index 00000000000..64c7dbc21cb --- /dev/null +++ b/ACE/tests/Compiler_Features_39_Test.cpp @@ -0,0 +1,71 @@ +/** + * This program checks if the compiler/RTL does have correct support + * for structured exception handling + */ + +#include "test_config.h" + +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) +int ExFilter(EXCEPTION_POINTERS *ep, DWORD code_arg) +{ + ACE_DEBUG ((LM_INFO,("In SEH Filter\n"))); + ACE_DEBUG ((LM_INFO,("Code param=%d\n"), code_arg)); + ACE_DEBUG ((LM_INFO,("\tep->ExceptionRecord->ExceptionCode =%d\n"), ep->ExceptionRecord->ExceptionCode)); + ACE_DEBUG ((LM_INFO,("\tep->ExceptionRecord->ExceptionAddress =%@\n"), ep->ExceptionRecord->ExceptionAddress)); + if (ep->ExceptionRecord->NumberParameters >= 1) + ACE_DEBUG ((LM_INFO,("\tep->ExceptionRecord->ExceptionInformation[0]=%@\n"), ep->ExceptionRecord->ExceptionInformation[0])); + if (ep->ExceptionRecord->NumberParameters == 2) + ACE_DEBUG ((LM_INFO,("\tep->ExceptionRecord->ExceptionInformation[1]=%@\n"), ep->ExceptionRecord->ExceptionInformation[1])); + return 1; +} + +void test() +{ + volatile int* pInt = 0x0000000; + *pInt = 20; +} + +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ + +int +run_main (int, ACE_TCHAR *[]) +{ + ACE_START_TEST (ACE_TEXT("Compiler_Features_39_Test")); + +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) + ACE_DEBUG ((LM_DEBUG,("Testing call SEH\n"))); + + ACE_SEH_TRY + { + test(); + } + ACE_SEH_EXCEPT (ExFilter(GetExceptionInformation(), GetExceptionCode())) + { + ACE_DEBUG ((LM_DEBUG,("In SEH call\n"))); + } + + ACE_DEBUG ((LM_DEBUG,("SEH call worked\n"))); + + ACE_DEBUG ((LM_DEBUG,("Testing non-call SEH\n"))); + + ACE_SEH_TRY + { + volatile int* pInt = 0x0000000; + *pInt = 20; + } + ACE_SEH_EXCEPT (ExFilter(GetExceptionInformation(), GetExceptionCode())) + { + ACE_DEBUG ((LM_DEBUG,("In SEH non-call\n"))); + } + + ACE_DEBUG ((LM_DEBUG,("SEH non-call worked\n"))); +#else + ACE_DEBUG ((LM_INFO, + ACE_TEXT ("Platform lacks ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS\n"))); +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ + + ACE_END_TEST; + + return 0; +} + diff --git a/ACE/tests/DLL_Test.cpp b/ACE/tests/DLL_Test.cpp index 25d4212468e..43facd7d8f4 100644 --- a/ACE/tests/DLL_Test.cpp +++ b/ACE/tests/DLL_Test.cpp @@ -55,7 +55,6 @@ int handle_test (ACE_DLL &dll) int basic_test (ACE_DLL &dll) { - ACE_TString dll_file; const char *subdir_env = ACE_OS::getenv ("ACE_EXE_SUB_DIR"); if (subdir_env) @@ -138,7 +137,6 @@ int dynamic_cast_test (ACE_DLL &dll) return 0; } - int run_main (int, ACE_TCHAR *[]) { @@ -165,7 +163,16 @@ run_main (int, ACE_TCHAR *[]) ACE_TEXT ("Dynamically Linkable Libraries not supported on this platform\n"))); #endif /* ACE_HAS_DYNAMIC_LINKING */ - ACE_TEST_ASSERT (ACE_OS::dlsym (ACE_SHLIB_INVALID_HANDLE, ACE_TEXT ("open"))); + void* invalid_handle = ACE_OS::dlsym (ACE_SHLIB_INVALID_HANDLE, ACE_TEXT ("open")); + if (invalid_handle != nullptr) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_OS::dlsym using invalid handle should be nullptr and not %@\n"))); + ++retval; + } + else + { + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("dlsym on invalid handle returned nullptr\n"))); + } ACE_END_TEST; return retval == 0 ? 0 : 1; diff --git a/ACE/tests/DLL_Test.h b/ACE/tests/DLL_Test.h index 3165b3075e4..faf68657512 100644 --- a/ACE/tests/DLL_Test.h +++ b/ACE/tests/DLL_Test.h @@ -8,7 +8,6 @@ */ // ================================================================ - #ifndef ACE_TESTS_DLL_TEST_H #define ACE_TESTS_DLL_TEST_H @@ -31,7 +30,7 @@ class Hello { public: /// Destructor - virtual ~Hello (void) + virtual ~Hello () { ACE_TRACE ("Hello::~Hello"); } @@ -43,31 +42,29 @@ public: * methods implemented in the shared library. */ //@{ - void say_hello (void) + void say_hello () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Hello\n"))); } - virtual void say_next (void) = 0; + virtual void say_next () = 0; - virtual ACE_TCHAR *new_info (void) = 0; + virtual ACE_TCHAR *new_info () = 0; - virtual ACE_TCHAR *malloc_info (void) = 0; + virtual ACE_TCHAR *malloc_info () = 0; //@} }; - // Used to test dynamic_cast<> in shared libraries. class ACE_Svc_Export Child : public Parent { public: - Child (void); - - virtual ~Child (void); + Child (); - virtual void test (void); + virtual ~Child (); + virtual void test (); }; #endif /* ACE_TESTS_DLL_TEST_H */ diff --git a/ACE/tests/DLL_Test_Impl.cpp b/ACE/tests/DLL_Test_Impl.cpp index 8457a82623f..d91abff98f7 100644 --- a/ACE/tests/DLL_Test_Impl.cpp +++ b/ACE/tests/DLL_Test_Impl.cpp @@ -9,12 +9,13 @@ */ //============================================================================= - #include "DLL_Test_Impl.h" #include "ace/ACE.h" #include "ace/OS_Errno.h" #include "ace/svc_export.h" #include "ace/OS_NS_string.h" +#include <utility> +#include <memory> Hello_Impl::Hello_Impl () { @@ -77,11 +78,11 @@ Hello_Impl::operator delete (void *ptr) extern "C" ACE_Svc_Export Hello * get_hello (void) { - Hello *hello = 0; + Hello *hello {}; ACE_NEW_RETURN (hello, Hello_Impl, - 0); + nullptr); return hello; } @@ -116,17 +117,59 @@ Child::~Child () void Child::test () { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("child called\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("child test called\n"))); + + Data d; + Data f(d); + Data g; + g = d; + g = std::move(d); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("testing base exception\n"))); + + std::unique_ptr<Base> base_excep (new Base ()); + try + { + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("throwing base exception\n"))); + base_excep->_raise(); + } + catch (const Base&) + { + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("caught base\n"))); + } + + std::unique_ptr<Derived> derived_excep (new Derived ()); + try + { + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("throwing derived exception\n"))); + derived_excep->_raise(); + } + catch (const Derived&) + { + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("caught derived\n"))); + } + + std::unique_ptr<Derived> derived_excep_base (new Derived ()); + try + { + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("throwing derived exception\n"))); + derived_excep_base->_raise(); + } + catch (const Base&) + { + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("caught derived as base\n"))); + } + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("testing exceptions finished\n"))); } // -------------------------------------------------------- - // Test dynamic cast extern "C" ACE_Svc_Export int dynamic_cast_test (Parent *target) { - Child *c = 0; + Child *c {}; c = dynamic_cast<Child*> (target); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("dynamic_cast_test: parent %@; child %@\n"), target, c)); diff --git a/ACE/tests/DLL_Test_Impl.h b/ACE/tests/DLL_Test_Impl.h index 97db4904e42..8c3633e4f90 100644 --- a/ACE/tests/DLL_Test_Impl.h +++ b/ACE/tests/DLL_Test_Impl.h @@ -31,19 +31,19 @@ class Hello_Impl : public Hello { public: /// Constructor - Hello_Impl (void); + Hello_Impl (); /// Destructor - ~Hello_Impl (void); + ~Hello_Impl (); /// See the documentation in the base class - void say_next (void); + void say_next () override; /// Uses ACE::strnew() to allocate the returned string. - ACE_TCHAR *new_info (void); + ACE_TCHAR *new_info () override; /// Uses ACE_OS::malloc() to allocate the returned string. - ACE_TCHAR *malloc_info (void); + ACE_TCHAR *malloc_info () override; // Overload the new/delete opertors so the object will be // created/deleted using the memory allocator associated with the diff --git a/ACE/tests/DLL_Test_Parent.cpp b/ACE/tests/DLL_Test_Parent.cpp index 4788c88f868..4f2e4aacac8 100644 --- a/ACE/tests/DLL_Test_Parent.cpp +++ b/ACE/tests/DLL_Test_Parent.cpp @@ -10,3 +10,28 @@ Parent::test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("parent called\n"))); } + +Data::~Data () +{ +} + +Base::Base () +{ +} + +void +Base::_raise () const +{ + throw *this; +} + +Derived::Derived () +{ +} + +void +Derived::_raise () const +{ + throw *this; +} + diff --git a/ACE/tests/DLL_Test_Parent.h b/ACE/tests/DLL_Test_Parent.h index d45dc64bf62..c9c36b95b7f 100644 --- a/ACE/tests/DLL_Test_Parent.h +++ b/ACE/tests/DLL_Test_Parent.h @@ -18,15 +18,43 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include <cstdint> class DLL_Test_Parent_Export Parent { public: + virtual ~Parent (); - virtual ~Parent (void); + virtual void test (); +}; + +class DLL_Test_Parent_Export Data +{ +public: + Data () = default; + Data (const Data&) = default; + Data (Data&&) = default; + Data& operator= (const Data&) = default; + Data& operator= (Data&&) = default; + virtual ~Data(); +private: + int8_t i {}; +}; - virtual void test (void); +class DLL_Test_Parent_Export Base +{ +public: + virtual void _raise () const; + Base (); + virtual ~Base() = default; +}; +class DLL_Test_Parent_Export Derived : public Base +{ +public: + Derived (); + void _raise () const override; + ~Derived () override = default; }; #endif /* ACE_TESTS_DLL_TEST_PARENT_H */ diff --git a/ACE/tests/FIFO_Test.cpp b/ACE/tests/FIFO_Test.cpp index ec9853d34ef..c5f665a4fdc 100644 --- a/ACE/tests/FIFO_Test.cpp +++ b/ACE/tests/FIFO_Test.cpp @@ -12,7 +12,6 @@ */ //============================================================================= - #include "test_config.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_sys_stat.h" @@ -26,8 +25,6 @@ #include "ace/Thread.h" #include "ace/Thread_Manager.h" - - #if !defined (ACE_LACKS_MKFIFO) static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; diff --git a/ACE/tests/Framework_Component_DLL.h b/ACE/tests/Framework_Component_DLL.h index 56a3cd2bf8a..91deea999cb 100644 --- a/ACE/tests/Framework_Component_DLL.h +++ b/ACE/tests/Framework_Component_DLL.h @@ -23,14 +23,11 @@ class Simple_Service { public: - Simple_Service (void); + Simple_Service (); - virtual ~Simple_Service (void); - - //virtual const ACE_TCHAR *dll_name (void); - - virtual const ACE_TCHAR *name (void); + virtual ~Simple_Service (); + virtual const ACE_TCHAR *name (); }; // Adapter that contains the required dll_name() method and @@ -39,7 +36,7 @@ template <class TYPE> class FWCT_DLL_Singleton_Adapter_T : public TYPE { public: - const ACE_TCHAR *dll_name (void) + const ACE_TCHAR *dll_name () { FRAMEWORK_COMPONENT_DLL_TRACE ("FWCT_DLL_Singleton_Adapter_T::dll_name"); return ACE_TEXT("Framework_Component_DLL"); diff --git a/ACE/tests/Framework_Component_Test.cpp b/ACE/tests/Framework_Component_Test.cpp index 407d225bd15..595e4a3ba9c 100644 --- a/ACE/tests/Framework_Component_Test.cpp +++ b/ACE/tests/Framework_Component_Test.cpp @@ -21,8 +21,6 @@ #include "ace/ARGV.h" #include "ace/DLL_Manager.h" - - // Define a few macros--because they're so much fun, and keep the // code below a little cleaner... #if (ACE_USES_CLASSIC_SVC_CONF == 1) diff --git a/ACE/tests/Future_Set_Test.cpp b/ACE/tests/Future_Set_Test.cpp index 3648646a703..bf57e1f05b5 100644 --- a/ACE/tests/Future_Set_Test.cpp +++ b/ACE/tests/Future_Set_Test.cpp @@ -15,7 +15,6 @@ */ //============================================================================= - #include "test_config.h" #include "ace/OS_NS_string.h" #include "ace/ACE.h" @@ -29,8 +28,6 @@ #include "ace/Atomic_Op.h" #include "ace/Null_Mutex.h" - - #if defined (ACE_HAS_THREADS) using ATOMIC_INT = ACE_Atomic_Op<ACE_Thread_Mutex, int>; diff --git a/ACE/tests/IOStream_Test.cpp b/ACE/tests/IOStream_Test.cpp index da0b5331324..a9c51dfe39f 100644 --- a/ACE/tests/IOStream_Test.cpp +++ b/ACE/tests/IOStream_Test.cpp @@ -316,7 +316,6 @@ server (void *arg = 0) // Compared to the method above, this is quite messy. Notice also // that whitespace is lost. -#if defined (ACE_HAS_STRING_CLASS) && defined (ACE_HAS_STANDARD_CPP_LIBRARY) ACE_IOStream_String buf; ACE_DEBUG ((LM_DEBUG, " (%P|%t) Server Received: (")); @@ -335,25 +334,6 @@ server (void *arg = 0) ACE_DEBUG ((LM_DEBUG, ")\n")); -#else - char buf[BUFSIZ]; - ACE_OS::memset (buf, 0, sizeof buf); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (" (%P|%t) Server Received: ("))); - - while (ACE_OS::strlen (buf) == 0 - || buf[ACE_OS::strlen (buf) - 1] != '"') - { - if (! (client_handler >> buf)) - break; - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%C "), - buf)); - } - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (")\n"))); -#endif /* ACE_HAS_STRING_CLASS */ // Send some non-textual data to the client. We use a single // character to separate the fields but we could have used any valid diff --git a/ACE/tests/Log_Msg_Test.cpp b/ACE/tests/Log_Msg_Test.cpp index 66f725a61b6..96262570a46 100644 --- a/ACE/tests/Log_Msg_Test.cpp +++ b/ACE/tests/Log_Msg_Test.cpp @@ -12,7 +12,6 @@ */ //============================================================================= - #include "test_config.h" // FUZZ: disable check_for_streams_include diff --git a/ACE/tests/Logging_Strategy_Test.cpp b/ACE/tests/Logging_Strategy_Test.cpp index 7cf9d41bc17..273dbcadf48 100644 --- a/ACE/tests/Logging_Strategy_Test.cpp +++ b/ACE/tests/Logging_Strategy_Test.cpp @@ -25,7 +25,6 @@ */ //============================================================================= - #include "test_config.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp index 430e23c74f7..037e5744ddb 100644 --- a/ACE/tests/Malloc_Test.cpp +++ b/ACE/tests/Malloc_Test.cpp @@ -109,7 +109,7 @@ myallocator (const void *base_addr = 0) MALLOC *ptr = new MALLOC (MMAP_FILENAME, MUTEX_NAME, &options); - ACE_auto_ptr_reset (static_allocator, ptr); + static_allocator.reset (ptr); } return static_allocator.get (); } diff --git a/ACE/tests/Max_Default_Port_Test_IPV6.cpp b/ACE/tests/Max_Default_Port_Test_IPV6.cpp index 1be7e0e8ab9..22ae15ea6ee 100644 --- a/ACE/tests/Max_Default_Port_Test_IPV6.cpp +++ b/ACE/tests/Max_Default_Port_Test_IPV6.cpp @@ -35,13 +35,11 @@ My_Accept_Handler::My_Accept_Handler (ACE_INET_Addr &addr) this->open (addr); } - My_Accept_Handler::~My_Accept_Handler () { this->peer_acceptor_.close (); // Prevent handle leaks } - int My_Accept_Handler::open (ACE_INET_Addr &addr) { diff --git a/ACE/tests/Naming_Test.cpp b/ACE/tests/Naming_Test.cpp index 42a825ed381..b365debb2bd 100644 --- a/ACE/tests/Naming_Test.cpp +++ b/ACE/tests/Naming_Test.cpp @@ -11,7 +11,6 @@ */ //============================================================================= - #include "test_config.h" #include "randomize.h" #include "ace/Lib_Find.h" @@ -22,7 +21,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" - #if !defined ACE_LACKS_FCNTL || defined ACE_WIN32 static char name[BUFSIZ]; diff --git a/ACE/tests/Process_Env_Test.cpp b/ACE/tests/Process_Env_Test.cpp index ca8acbf66ce..559ef8fef19 100644 --- a/ACE/tests/Process_Env_Test.cpp +++ b/ACE/tests/Process_Env_Test.cpp @@ -114,8 +114,8 @@ run_main (int, ACE_TCHAR*[]) process2.wait (&status); if (status != 1) { - ACE_ERROR ((LM_ERROR, - "ERROR: process2 did not inherit env var Z.\n")); + ACE_ERROR ((LM_ERROR, + "ERROR: process2 did not inherit env var Z, wait returned %d.\n", status)); test_status = 1; } diff --git a/ACE/tests/SOCK_Acceptor_Test.cpp b/ACE/tests/SOCK_Acceptor_Test.cpp index a8791bc9d9f..c433656c803 100644 --- a/ACE/tests/SOCK_Acceptor_Test.cpp +++ b/ACE/tests/SOCK_Acceptor_Test.cpp @@ -9,7 +9,6 @@ */ //============================================================================= - #include "test_config.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_wait.h" @@ -17,7 +16,6 @@ #include "ace/SOCK_Connector.h" #include "ace/SOCK_Acceptor.h" - static int test_accept (ACE_Addr listen_addr, int v6_only) { diff --git a/ACE/tests/Time_Value_Test.cpp b/ACE/tests/Time_Value_Test.cpp index 70f281382f5..2698a6994c1 100644 --- a/ACE/tests/Time_Value_Test.cpp +++ b/ACE/tests/Time_Value_Test.cpp @@ -19,9 +19,7 @@ #include "ace/Numeric_Limits.h" -#ifdef ACE_HAS_CPP98_IOSTREAMS #include <sstream> -#endif int run_main (int, ACE_TCHAR *[]) @@ -175,7 +173,6 @@ run_main (int, ACE_TCHAR *[]) ACE_TEXT ("set_msec test failed: %d usecs should be 555000\n"), msec_test3.usec ())); -#ifdef ACE_HAS_CPP98_IOSTREAMS std::ostringstream ost; ost << ACE_Time_Value(1); ACE_TEST_ASSERT( ost.str() == "1" ); @@ -194,7 +191,6 @@ run_main (int, ACE_TCHAR *[]) ost.str(""); ost << ACE_Time_Value(); ACE_TEST_ASSERT( ost.str() == "0" ); -#endif ACE_END_TEST; diff --git a/ACE/tests/Unbounded_Set_Test.cpp b/ACE/tests/Unbounded_Set_Test.cpp index 8c9e18875f8..4d1b7b1adb3 100644 --- a/ACE/tests/Unbounded_Set_Test.cpp +++ b/ACE/tests/Unbounded_Set_Test.cpp @@ -11,21 +11,21 @@ */ //============================================================================= - #include "test_config.h" #include <ace/Unbounded_Set.h> -#include <ace/Auto_Ptr.h> #include <ace/SString.h> - - struct MyNode { unsigned k; MyNode () : k (0) {} MyNode (int pk) : k (pk) {} MyNode (const MyNode& o) : k (o.k) {} + MyNode (MyNode&& o) : k(o.k) {} + MyNode& operator=(const MyNode& o) { k = o.k; return *this; } + MyNode& operator=(MyNode&& o) { k = o.k; return *this; } bool operator== (const MyNode& o) const { return (k == o.k); } + bool operator!= (const MyNode& o) const { return (k != o.k); } }; size_t count_const_set (const ACE_Unbounded_Set<MyNode>& cubs) diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst index 7277368fffb..94ddd6c01e2 100644 --- a/ACE/tests/run_test.lst +++ b/ACE/tests/run_test.lst @@ -109,9 +109,10 @@ Compiler_Features_35_Test Compiler_Features_36_Test Compiler_Features_37_Test Compiler_Features_38_Test +Compiler_Features_39_Test Config_Test: !LynxOS !VxWorks !ACE_FOR_TAO Conn_Test: !ACE_FOR_TAO -DLL_Test: !STATIC Linux +DLL_Test: !STATIC DLList_Test: !ACE_FOR_TAO Date_Time_Test: !ACE_FOR_TAO Dev_Poll_Reactor_Test: !nsk !ST @@ -190,7 +191,7 @@ Proactor_Test: !VxWorks !LynxOS !nsk !ACE_FOR_TAO !BAD_AIO Proactor_Timer_Test: !VxWorks !nsk !ACE_FOR_TAO Proactor_UDP_Test: !VxWorks !LynxOS !nsk !ACE_FOR_TAO !BAD_AIO Process_Env_Test: !VxWorks !PHARLAP -Process_Test: !VxWorks !ACE_FOR_TAO !PHARLAP !Win32 +Process_Test: !VxWorks !ACE_FOR_TAO !PHARLAP Process_Manager_Test: !VxWorks !ACE_FOR_TAO !PHARLAP Process_Manual_Event_Test: !HPUX !VxWorks !ACE_FOR_TAO !PHARLAP Process_Mutex_Test: !VxWorks !ACE_FOR_TAO !PHARLAP diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc index 35feb43db0f..bce99b2dd5e 100644 --- a/ACE/tests/tests.mpc +++ b/ACE/tests/tests.mpc @@ -842,6 +842,13 @@ project(Compiler_Features_38_Test) : acetest { } } +project(Compiler_Features_39_Test) : acetest { + exename = Compiler_Features_39_Test + Source_Files { + Compiler_Features_39_Test.cpp + } +} + project(Config Test) : acetest { avoids += ace_for_tao exename = Config_Test diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp index 170f0499f31..3842ab53dc2 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp @@ -5,14 +5,10 @@ // Distributed Object Computing at Washington University, St. Louis. // // Information about TAO is available at: -// http://www.dre.vanderbilt.edu/~schmidt/TAO.html +// https://www.dre.vanderbilt.edu/~schmidt/TAO.html #include "Messenger_i.h" -#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY == 1) #include <iostream> -#else -#include <iostream.h> -#endif // Implementation skeleton constructor Messenger_i::Messenger_i (void) diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp index 15c6a26e26f..056363d73fe 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp @@ -1,11 +1,7 @@ #include "ServerInitializer.h" #include "ServerInterceptor.h" -#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY == 1) #include <iostream> -#else -#include <iostream.h> -#endif ServerInitializer::ServerInitializer () { diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp index 2a0088f5f8f..6cb15bed351 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp @@ -1,11 +1,7 @@ #include "ServerInterceptor.h" #include "tao/PI_Server/ServerRequestInfoA.h" #include "ace/OS_NS_string.h" -#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY == 1) #include <iostream> -#else -#include <iostream.h> -#endif const IOP::ServiceId service_id = 0xdeed; const unsigned int num_allowed_users = 4; diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp index eb6e11477fe..7bfb4963b32 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp @@ -9,11 +9,7 @@ #include "Messenger_i.h" #include "ace/OS_NS_time.h" -#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY == 1) #include <iostream> -#else -#include <iostream.h> -#endif // Implementation skeleton constructor Messenger_i::Messenger_i (void) diff --git a/TAO/TAO_IDL/ast/ast_union_branch.cpp b/TAO/TAO_IDL/ast/ast_union_branch.cpp index e3748740404..5732ee012b1 100644 --- a/TAO/TAO_IDL/ast/ast_union_branch.cpp +++ b/TAO/TAO_IDL/ast/ast_union_branch.cpp @@ -181,22 +181,16 @@ AST_UnionBranch::label_list_length () void AST_UnionBranch::add_labels (AST_Union *u) { + const bool enum_labels = (u->udisc_type () == AST_Expression::EV_enum); for (UTL_LabellistActiveIterator i (this->pd_ll); !i.is_done (); i.next ()) { if (AST_UnionLabel::UL_default == i.item ()->label_kind ()) { - return; + continue; } - } - const bool enum_labels = (u->udisc_type () == AST_Expression::EV_enum); - - for (UTL_LabellistActiveIterator i (this->pd_ll); - !i.is_done (); - i.next ()) - { AST_Expression *ex = i.item ()->label_val (); UTL_ScopedName *n = ex->n (); @@ -212,6 +206,12 @@ AST_UnionBranch::add_labels (AST_Union *u) { ex->ev ()->et = AST_Expression::EV_enum; AST_Enum *disc = dynamic_cast<AST_Enum*> (u->disc_type ()); + if (disc == nullptr) + { + // this is strictly to mollycoddle the Coverity null pointer + // dereference check. The enum labels ensures consistency here. + return; + } AST_EnumVal *dval = disc->lookup_by_value (ex); if (dval == nullptr) diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 34150c8bd95..b94578fc1a9 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -1588,8 +1588,7 @@ TAO_CodeGen::start_implementation_header (const char *fname) -1); if (this->implementation_header_->open (fname, - TAO_OutStream::TAO_IMPL_HDR) - == -1) + TAO_OutStream::TAO_IMPL_HDR) == -1) { return -1; } diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp index 1f8ca4e0121..274da06bb2e 100644 --- a/TAO/TAO_IDL/be/be_helper.cpp +++ b/TAO/TAO_IDL/be/be_helper.cpp @@ -305,7 +305,6 @@ TAO_OutStream::print (const char *format, ...) format, ap), int, - -1, result); va_end (ap); diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 87b89971113..09379c3b6ee 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -788,17 +788,15 @@ be_interface::gen_var_out_seq_decls () *os << be_nl_2 << "class " << lname << ";" << be_nl - << "typedef " << lname << " *" << lname << "_ptr;"; + << "using " << lname << "_ptr = " << lname << "*;"; *os << be_nl - << "typedef TAO_Objref_Var_T<" + << "using " << lname << "_var = TAO_Objref_Var_T<" << lname - << "> " - << lname << "_var;" << be_nl - << "typedef TAO_Objref_Out_T<" + << ">;" << be_nl + << "using " << lname << "_out = TAO_Objref_Out_T<" << lname - << "> " - << lname << "_out;" << be_nl; + << ">;"; os->gen_endif (); @@ -807,8 +805,7 @@ be_interface::gen_var_out_seq_decls () // **************************************************************** -TAO_IDL_Inheritance_Hierarchy_Worker::~TAO_IDL_Inheritance_Hierarchy_Worker ( - ) +TAO_IDL_Inheritance_Hierarchy_Worker::~TAO_IDL_Inheritance_Hierarchy_Worker () { } diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp index dcc4bf6f369..6308a89c696 100644 --- a/TAO/TAO_IDL/be/be_type.cpp +++ b/TAO/TAO_IDL/be/be_type.cpp @@ -264,28 +264,23 @@ be_type::gen_common_varout (TAO_OutStream *os) : "class ") << this->local_name () << ";"; - *os << be_nl_2 - << "typedef" << be_idt_nl + *os << be_nl + << "using " << this->local_name () << "_var = " << (st == AST_Type::FIXED ? "::TAO_Fixed_Var_T<" : "::TAO_Var_Var_T<") - << be_idt << be_idt_nl - << this->local_name () << be_uidt_nl - << ">" << be_uidt_nl - << this->local_name () << "_var;" << be_uidt << be_nl_2; + << this->local_name () << ">;" << be_nl; if (st == AST_Type::FIXED) { - *os << "typedef" << be_idt_nl - << this->local_name () << " &" << be_nl - << this->local_name () << "_out;" << be_uidt; + *os << "using " << this->local_name () << "_out = " + << this->local_name () << "&;"; } else { - *os << "typedef" << be_idt_nl - << "::TAO_Out_T<" << be_idt << be_idt_nl - << this->local_name () << be_uidt_nl - << ">" << be_uidt_nl - << this->local_name () << "_out;" << be_uidt; + *os << "using " << this->local_name () + << "_out = ::TAO_Out_T<" + << this->local_name () + << ">;"; } this->common_varout_gen_ = true; @@ -308,8 +303,8 @@ be_type::gen_stub_decls (TAO_OutStream *os) if (i != nullptr) { - *os << "typedef " << this->local_name () - << (v == nullptr ? "_ptr" : " *") << " _ptr_type;"; + *os << "using _ptr_type = " << this->local_name () + << (v == nullptr ? "_ptr" : "*") << ";"; } bool skip_varout = false; @@ -327,10 +322,8 @@ be_type::gen_stub_decls (TAO_OutStream *os) if (!skip_varout) { *os << be_nl - << "typedef " << this->local_name () - << "_var _var_type;" << be_nl - << "typedef " << this->local_name () - << "_out _out_type;"; + << "using _var_type = " << this->local_name () << "_var;" << be_nl + << "using _out_type = " << this->local_name () << "_out;"; } bool gen_any_destructor = diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp index 02dcf8f8228..c5955d0024f 100644 --- a/TAO/TAO_IDL/be/be_valuetype.cpp +++ b/TAO/TAO_IDL/be/be_valuetype.cpp @@ -571,16 +571,8 @@ be_valuetype::gen_var_out_seq_decls () *os << be_nl_2 << "class " << lname << ";" << be_nl - << "typedef" << be_idt_nl - << "TAO_Value_Var_T<" << be_idt << be_idt_nl - << lname << be_uidt_nl - << ">" << be_uidt_nl - << lname << "_var;" << be_uidt_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Value_Out_T<" << be_idt << be_idt_nl - << lname << be_uidt_nl - << ">" << be_uidt_nl - << lname << "_out;" << be_uidt; + << "using " << lname << "_var = TAO_Value_Var_T<" << lname << ">;" << be_nl + << "using " << lname << "_out = TAO_Value_Out_T<" << lname << ">;"; os->gen_endif (); diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp index df353da2a53..5904cbcf719 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp @@ -98,14 +98,12 @@ int be_visitor_array_cs::visit_array (be_array *node) << fname << "_dup (const " << fname << "_slice *_tao_src_array)" << be_nl; *os << "{" << be_idt_nl; - *os << fname << "_slice *_tao_dup_array =" << be_idt_nl - << fname << "_alloc ();" << be_uidt_nl << be_nl; - *os << "if (!_tao_dup_array)" << be_idt_nl - << "{" << be_idt_nl - << "return static_cast <" << fname - << "_slice *> (0);" << be_uidt_nl + *os << fname << "_slice *_tao_dup_array = " + << fname << "_alloc ();" << be_nl << be_nl; + *os << "if (_tao_dup_array)" << be_idt_nl + << "{" << be_idt_nl; + *os << fname << "_copy (_tao_dup_array, _tao_src_array);" << be_uidt_nl << "}" << be_uidt_nl << be_nl; - *os << fname << "_copy (_tao_dup_array, _tao_src_array);" << be_nl; *os << "return _tao_dup_array;" << be_uidt_nl; *os << "}" << be_nl_2; @@ -113,7 +111,7 @@ int be_visitor_array_cs::visit_array (be_array *node) *os << fname << "_slice *" << be_nl; *os << fname << "_alloc ()" << be_nl; *os << "{" << be_idt_nl; - *os << fname << "_slice *retval = 0;" << be_nl; + *os << fname << "_slice *retval {};" << be_nl; *os << "ACE_NEW_RETURN (retval, "; if (bt->accept (this) == -1) @@ -134,15 +132,14 @@ int be_visitor_array_cs::visit_array (be_array *node) -1); } - *os << ", 0);" << be_nl; + *os << ", nullptr);" << be_nl; *os << "return retval;" << be_uidt_nl; *os << "}" << be_nl_2; // free method. *os << "void" << be_nl - << fname << "_free (" << be_idt << be_idt_nl - << fname << "_slice *_tao_slice)" << be_uidt - << be_uidt_nl; + << fname << "_free (" << fname << "_slice *_tao_slice)" + << be_nl; *os << "{" << be_idt_nl; *os << "delete [] _tao_slice;" << be_uidt_nl; *os << "}" << be_nl_2; diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp index c66e3219503..aabe94ec294 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp @@ -300,8 +300,7 @@ be_visitor_array_cdr_op_cs::visit_predefined_type ( // We generate optimized code based on an optimized interface available from // the CDR class. These optimizations are applicable only to primitive // types. - *os << "return" << be_idt_nl - << "strm."; + *os << "return strm."; // Based on our substate, we may be reading from a stream or writing into a // stream. @@ -468,7 +467,7 @@ be_visitor_array_cdr_op_cs::visit_predefined_type ( -1); } - unsigned long ndims = array->n_dims (); + unsigned long const ndims = array->n_dims (); // Generate a product of all the dimensions. This will be the total length // of the "unfolded" single dimensional array. @@ -507,7 +506,7 @@ be_visitor_array_cdr_op_cs::visit_predefined_type ( } } - *os << ");" << be_uidt + *os << ");" << be_uidt << be_uidt << be_uidt_nl; return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp index 74a665c0482..995e7365f0d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp @@ -349,9 +349,9 @@ be_visitor_amh_interface_sh::create_amh_class (ACE_CString name) be_interface *amh_class = nullptr; ACE_NEW_RETURN (amh_class, be_interface (amh_class_name, // name - nullptr, // list of inherited + nullptr, // list of inherited 0, // number of inherited - nullptr, // list of ancestors + nullptr, // list of ancestors 0, // number of ancestors 0, // non-local 0), // non-abstract diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp index 9e72f70475d..c00fd1c8413 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp @@ -18,8 +18,7 @@ // ************************************************************ be_visitor_operation_arglist::be_visitor_operation_arglist ( - be_visitor_context *ctx - ) + be_visitor_context *ctx) : be_visitor_operation (ctx), unused_ (false) { @@ -33,14 +32,14 @@ int be_visitor_operation_arglist::visit_operation (be_operation *node) { TAO_OutStream *os = this->ctx_->stream (); - bool has_args = node->argument_count () > 0; + bool const has_args = node->argument_count () > 0; - *os << " (" << be_idt_nl; + *os << " ("; switch (this->ctx_->state ()) { case TAO_CodeGen::TAO_OPERATION_ARGLIST_PROXY_IMPL_XS: - *os << "::CORBA::Object *_collocated_tao_target_"; + *os << be_idt_nl << "::CORBA::Object *_collocated_tao_target_"; if (has_args) { @@ -49,6 +48,14 @@ be_visitor_operation_arglist::visit_operation (be_operation *node) break; default: + if (has_args) + { + *os << be_idt_nl; + } + else + { + *os << be_idt; + } break; } @@ -62,11 +69,6 @@ be_visitor_operation_arglist::visit_operation (be_operation *node) -1); } - if (!has_args) - { - *os << "void"; - } - *os << ")" << be_uidt; switch (this->ctx_->state ()) diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp index 06420943760..91d897f3cd4 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp @@ -56,9 +56,8 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) *os << be_nl_2 << "void" << be_nl << "TAO::Value_Traits<" << node->name () << ">::add_ref (" - << be_idt << be_idt_nl - << node->name () << " * p" << be_uidt_nl - << ")" << be_uidt_nl + << node->name () << " * p)" + << be_nl << "{" << be_idt_nl << "::CORBA::add_ref (p);" << be_uidt_nl << "}"; @@ -66,9 +65,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) *os << be_nl_2 << "void" << be_nl << "TAO::Value_Traits<" << node->name () << ">::remove_ref (" - << be_idt << be_idt_nl - << node->name () << " * p" << be_uidt_nl - << ")" << be_uidt_nl + << node->name () << " * p)" << be_nl << "{" << be_idt_nl << "::CORBA::remove_ref (p);" << be_uidt_nl << "}"; @@ -76,9 +73,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) *os << be_nl_2 << "void" << be_nl << "TAO::Value_Traits<" << node->name () << ">::release (" - << be_idt << be_idt_nl - << node->name () << " * p" << be_uidt_nl - << ")" << be_uidt_nl + << node->name () << " * p)" << be_nl << "{" << be_idt_nl << "::CORBA::remove_ref (p);" << be_uidt_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp index 19f77f7a4be..1bdeee1b047 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp @@ -48,7 +48,7 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node) if (node->is_amh_excep_holder ()) { - *os << " : exception (0)" << be_nl; + *os << " : exception (nullptr)" << be_nl; } if (node->truncatable()) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp index 5814e1c120e..aef3ecbd8c3 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -57,9 +57,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) *os << be_nl_2 << "void" << be_nl << "TAO::Value_Traits<" << node->name () << ">::add_ref (" - << be_idt << be_idt_nl - << node->name () << " * p)" << be_uidt - << be_uidt_nl + << node->name () << " * p)" << be_nl << "{" << be_idt_nl << "::CORBA::add_ref (p);" << be_uidt_nl << "}"; @@ -67,9 +65,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) *os << be_nl_2 << "void" << be_nl << "TAO::Value_Traits<" << node->name () << ">::remove_ref (" - << be_idt << be_idt_nl - << node->name () << " * p)" << be_uidt - << be_uidt_nl + << node->name () << " * p)" << be_nl << "{" << be_idt_nl << "::CORBA::remove_ref (p);" << be_uidt_nl << "}"; @@ -77,9 +73,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) *os << be_nl_2 << "void" << be_nl << "TAO::Value_Traits<" << node->name () << ">::release (" - << be_idt << be_idt_nl - << node->name () << " * p)" << be_uidt - << be_uidt_nl + << node->name () << " * p)" << be_nl << "{" << be_idt_nl << "::CORBA::remove_ref (p);" << be_uidt_nl << "}"; @@ -245,7 +239,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) *os << "::CORBA::ValueBase *" << be_nl << node->name () << "::_copy_value ()" << be_nl << "{" << be_idt_nl - << "::CORBA::ValueBase *ret_val = 0;" << be_nl + << "::CORBA::ValueBase *ret_val {};" << be_nl << "ACE_NEW_THROW_EX (" << be_idt_nl << "ret_val," << be_nl << node->local_name () << " ()," << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp index 2f5c07dc02b..99b203c0540 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp @@ -92,14 +92,12 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node) //@@ Boris: create_for_unmarshal is still public... // generate create_for_unmarshal os << be_nl_2 - << "virtual ::CORBA::ValueBase *" << be_nl - << "create_for_unmarshal ();"; + << "virtual ::CORBA::ValueBase *create_for_unmarshal ();"; if (node->supports_abstract ()) { os << be_nl_2 - << "virtual ::CORBA::AbstractBase_ptr" << be_nl - << "create_for_unmarshal_abstract ();" << be_uidt; + << "virtual ::CORBA::AbstractBase_ptr create_for_unmarshal_abstract ();" << be_uidt; } } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp index 4ddab60b5af..ade6488acd2 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp @@ -102,7 +102,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node) << "::CORBA::ValueBase *" << be_nl << node->full_obv_skel_name () << "::_copy_value ()" << be_nl << "{" << be_idt_nl - << "::CORBA::ValueBase *ret_val = 0;" << be_nl + << "::CORBA::ValueBase *ret_val {};" << be_nl << "ACE_NEW_THROW_EX (" << be_idt_nl << "ret_val," << be_nl; if (! node->is_nested ()) diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll index 56ad0cbd63f..7b3dbdfa9fb 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -1316,33 +1316,29 @@ idl_get_pragma_string (char *pragma) // Get pointers to each end of the substring between the quotes. const char *firstquote = ACE_OS::strchr (pragma, '"'); - if (firstquote == 0) + if (!firstquote) { - idl_global->err ()->syntax_error ( - IDL_GlobalData::PS_PragmaPrefixSyntax - ); + idl_global->err ()->syntax_error (IDL_GlobalData::PS_PragmaPrefixSyntax); - return 0; + return nullptr; } const char *start = firstquote + 1; const char *end = ACE_OS::strchr (start, '"'); - if (end == 0) + if (!end) { - idl_global->err ()->syntax_error ( - IDL_GlobalData::PS_PragmaPrefixSyntax - ); + idl_global->err ()->syntax_error (IDL_GlobalData::PS_PragmaPrefixSyntax); - return 0; + return nullptr; } - int len = static_cast<int> (end - start); - char *retval = 0; + size_t const len = end - start; + char *retval {}; ACE_NEW_RETURN (retval, char[len + 1], - 0); + nullptr); ACE_OS::strncpy (retval, start, diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp index 9c7808d96cf..b4759822f45 100644 --- a/TAO/TAO_IDL/fe/idl.yy.cpp +++ b/TAO/TAO_IDL/fe/idl.yy.cpp @@ -4389,33 +4389,29 @@ idl_get_pragma_string (char *pragma) // Get pointers to each end of the substring between the quotes. const char *firstquote = ACE_OS::strchr (pragma, '"'); - if (firstquote == 0) + if (!firstquote) { - idl_global->err ()->syntax_error ( - IDL_GlobalData::PS_PragmaPrefixSyntax - ); + idl_global->err ()->syntax_error (IDL_GlobalData::PS_PragmaPrefixSyntax); - return 0; + return nullptr; } const char *start = firstquote + 1; const char *end = ACE_OS::strchr (start, '"'); - if (end == 0) + if (!end) { - idl_global->err ()->syntax_error ( - IDL_GlobalData::PS_PragmaPrefixSyntax - ); + idl_global->err ()->syntax_error ( IDL_GlobalData::PS_PragmaPrefixSyntax); - return 0; + return nullptr; } - int len = static_cast<int> (end - start); - char *retval = 0; + size_t const len = end - start; + char *retval {}; ACE_NEW_RETURN (retval, char[len + 1], - 0); + nullptr); ACE_OS::strncpy (retval, start, diff --git a/TAO/docs/tutorials/Quoter/AMI/Stock_i.h b/TAO/docs/tutorials/Quoter/AMI/Stock_i.h index 9efd6065891..8036ce54dec 100644 --- a/TAO/docs/tutorials/Quoter/AMI/Stock_i.h +++ b/TAO/docs/tutorials/Quoter/AMI/Stock_i.h @@ -18,13 +18,8 @@ public: CORBA::String_out full_name); private: -#if defined (HPUX) && (ACE_HAS_STANDARD_CPP_LIBRARY == 0) - string symbol_; - string full_name_; -#else std::string symbol_; std::string full_name_; -#endif /* HPUX */ CORBA::Double price_; }; diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.h index 189c8f618c9..36d27191194 100644 --- a/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.h +++ b/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.h @@ -16,13 +16,8 @@ public: CORBA::Double price (); private: -#if defined (HPUX) && (ACE_HAS_STANDARD_CPP_LIBRARY == 0) - string symbol_; - string full_name_; -#else std::string symbol_; std::string full_name_; -#endif /* HPUX */ CORBA::Double price_; }; diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.h index 9efd6065891..8036ce54dec 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.h +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.h @@ -18,13 +18,8 @@ public: CORBA::String_out full_name); private: -#if defined (HPUX) && (ACE_HAS_STANDARD_CPP_LIBRARY == 0) - string symbol_; - string full_name_; -#else std::string symbol_; std::string full_name_; -#endif /* HPUX */ CORBA::Double price_; }; diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.h b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.h index b4167e8a95a..26896bb685a 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.h +++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.h @@ -16,13 +16,8 @@ public: CORBA::Double price (); private: -#if defined (HPUX) && (ACE_HAS_STANDARD_CPP_LIBRARY == 0) - string symbol_; - string full_name_; -#else std::string symbol_; std::string full_name_; -#endif /* HPUX */ CORBA::Double price_; }; diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h index 54b4b27e7ab..5740df81434 100644 --- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h +++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h @@ -23,13 +23,8 @@ public: CORBA::Double price (); private: -#if defined (HPUX) && (ACE_HAS_STANDARD_CPP_LIBRARY == 0) - string symbol_; - string full_name_; -#else std::string symbol_; std::string full_name_; -#endif /* HPUX */ CORBA::Double price_; }; diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.h b/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.h index b4167e8a95a..26896bb685a 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.h +++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.h @@ -16,13 +16,8 @@ public: CORBA::Double price (); private: -#if defined (HPUX) && (ACE_HAS_STANDARD_CPP_LIBRARY == 0) - string symbol_; - string full_name_; -#else std::string symbol_; std::string full_name_; -#endif /* HPUX */ CORBA::Double price_; }; diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.h b/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.h index 804b893172f..203b001bcc4 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.h +++ b/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.h @@ -16,13 +16,8 @@ public: CORBA::Double price (); private: -#if defined (HPUX) && (ACE_HAS_STANDARD_CPP_LIBRARY == 0) - string symbol_; - string full_name_; -#else std::string symbol_; std::string full_name_; -#endif /* HPUX */ CORBA::Double price_; }; diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp index d4db921fbe6..4cbb4f32191 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp @@ -9,11 +9,7 @@ #include "Messenger_i.h" #include "ace/OS_NS_time.h" -#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY == 1) #include <iostream> -#else -#include <iostream.h> -#endif // Implementation skeleton constructor Messenger_i::Messenger_i (void) diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp index 43b7c26e659..b3139b404ba 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp @@ -13,10 +13,11 @@ #include "Fault_Detector_i.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -#include "ace/Auto_Ptr.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/PortableGroup/PG_Property_Set.h" +#include <memory> + // Use this macro at the beginning of CORBA methods // to aid in debugging. #define METHOD_ENTRY(name) \ @@ -601,7 +602,7 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object ( )); throw PortableGroup::ObjectNotCreated(); } - auto_ptr<TAO::Fault_Detector_i> detector(pFD); + std::unique_ptr<TAO::Fault_Detector_i> detector(pFD); ACE_NEW_NORETURN ( factory_creation_id, PortableGroup::GenericFactory::FactoryCreationId); diff --git a/TAO/orbsvcs/examples/LoadBalancing/Stock.h b/TAO/orbsvcs/examples/LoadBalancing/Stock.h index b348be6e4c2..42fea7f5ac8 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/Stock.h +++ b/TAO/orbsvcs/examples/LoadBalancing/Stock.h @@ -18,13 +18,8 @@ public: CORBA::Double price (); private: -#if defined (HPUX) && (ACE_HAS_STANDARD_CPP_LIBRARY == 0) - string symbol_; - string full_name_; -#else std::string symbol_; std::string full_name_; -#endif /* HPUX */ CORBA::Double price_; }; diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp index 6f17d1db0f0..462361e5aa3 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp @@ -184,7 +184,7 @@ TAO_AV_Connector_Registry::close_all () { (*i)->close (); - this->close (*i); + delete *i; } } diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index e2e805fb8eb..d320d327028 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -565,17 +565,19 @@ TAO_AV_UDP_Acceptor::close () //------------------------------------------------------------ TAO_AV_UDP_Connector::TAO_AV_UDP_Connector () : control_inet_address_ (0) + , delete_control_inet_address_ (false) { } TAO_AV_UDP_Connector::~TAO_AV_UDP_Connector () { - if (this->flow_component_ == TAO_AV_Core::TAO_AV_CONTROL) + if (this->entry_ && this->flow_component_ == TAO_AV_Core::TAO_AV_CONTROL) { delete this->entry_->control_handler (); + this->entry_->control_handler (nullptr); } - if (this->control_inet_address_ != 0) + if (this->delete_control_inet_address_) delete this->control_inet_address_; } @@ -691,9 +693,12 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, if (entry->control_address () == 0) - ACE_NEW_RETURN (this->control_inet_address_, - ACE_INET_Addr ("0"), - -1); + { + ACE_NEW_RETURN (this->control_inet_address_, + ACE_INET_Addr ("0"), + -1); + delete_control_inet_address_ = true; + } else control_inet_address_ = dynamic_cast<ACE_INET_Addr*> (entry->control_address ()); } diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h index 79f981d4071..7b482492ebc 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h @@ -192,6 +192,7 @@ public: virtual int close (void); protected: ACE_INET_Addr *control_inet_address_; + bool delete_control_inet_address_; TAO_Base_StreamEndPoint *endpoint_; TAO_AV_Core *av_core_; TAO_FlowSpec_Entry *entry_; diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp index 74d4a7e7cff..8df70ab7176 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp @@ -560,6 +560,7 @@ TAO_FT_Naming_Server::parse_args (int argc, } } case '?': + // fallthrough default: ORBSVCS_ERROR ((LM_ERROR,ACE_TEXT ("Unknown arg %c\n"), c )); ORBSVCS_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index d71070a501c..59e27d91b76 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -260,6 +260,7 @@ TAO_Naming_Server::parse_args (int argc, this->round_trip_timeout_ = (int)1.0e7 * ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': + // fallthrough default: #if !defined (ACE_NLOGGING) const ACE_TCHAR *reqNonMinCorba= diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp index 6590858dfe5..2f20367d331 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp @@ -136,11 +136,6 @@ TAO::Security::AccessDecision::map_key_from_objref (CORBA::Object_ptr /*obj */) ORBSVCS_ERROR ((LM_ERROR, "map_key_from_objref is currently not implemented\n")); throw CORBA::NO_IMPLEMENT(); - -#if defined (__HP_aCC) - OBJECT_KEY key; - return key; -#endif /* __HP_aCC */ } CORBA::Boolean diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp index c2fdf77cc4a..b2d7abaab8c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp @@ -15,6 +15,7 @@ #include "ace/Sample_History.h" #include "ace/Basic_Stats.h" #include "ace/Auto_Ptr.h" +#include <memory> Control::Control (size_t peers_expected, size_t iterations, @@ -91,8 +92,8 @@ Control::join (Federated_Test::Peer_ptr peer) /// ... and automatically disconnect the loopbacks ... typedef Auto_Disconnect<Federated_Test::Loopback> Loopback_Disconnect; - ACE_Auto_Basic_Array_Ptr<auto_ptr<Loopback_Disconnect> > disconnects ( - new auto_ptr<Loopback_Disconnect>[2*this->peers_count_] + ACE_Auto_Basic_Array_Ptr<std::unique_ptr<Loopback_Disconnect> > disconnects ( + new std::unique_ptr<Loopback_Disconnect>[2*this->peers_count_] ); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp index e037fbf7d54..7e4bce27d4e 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp @@ -23,9 +23,6 @@ RTClient_Setup::RTClient_Setup (int use_rt_corba, { if (use_rt_corba) { - ACE_auto_ptr_reset (this->rtcorba_setup_, - new RTCORBA_Setup (orb, - rt_class, - nthreads)); + this->rtcorba_setup_.reset (new RTCORBA_Setup (orb, rt_class, nthreads)); } } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h index 19aac261469..14a4131bfb2 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h @@ -11,7 +11,7 @@ #include "RTCORBA_Setup.h" #include "PriorityBand_Setup.h" #include "SyncScope_Setup.h" -#include "ace/Auto_Ptr.h" +#include <memory> #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -42,7 +42,7 @@ public: private: int use_rt_corba_; - auto_ptr<RTCORBA_Setup> rtcorba_setup_; + std::unique_ptr<RTCORBA_Setup> rtcorba_setup_; SyncScope_Setup syncscope_setup_; }; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp index 865bc73a6f2..b5eaf940bfc 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp @@ -29,12 +29,11 @@ RTEC_Initializer::create (PortableServer::POA_ptr consumer_poa, TAO_EC_Factory *body = ACE_Dynamic_Service<TAO_EC_Factory>::instance ("EC_Factory"); - auto_ptr<TAO_EC_Factory> factory ( + std::unique_ptr<TAO_EC_Factory> factory ( new TAO_EC_RTCORBA_Factory (body, rtcorba_setup->lanes ())); - TAO_EC_Event_Channel *ec = - new TAO_EC_Event_Channel (attr, factory.get (), 1); + TAO_EC_Event_Channel *ec = new TAO_EC_Event_Channel (attr, factory.get (), 1); factory.release (); return ec; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp index d0ce023fa6b..7bfbabe6592 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp @@ -23,20 +23,14 @@ RTServer_Setup::RTServer_Setup (int use_rt_corba, rt_class, nthreads) { - if (use_rt_corba) { - ACE_auto_ptr_reset (this->rtpoa_setup_, - new RTPOA_Setup (orb, - *this->rtcorba_setup ())); + this->rtpoa_setup_.reset (new RTPOA_Setup (orb, *this->rtcorba_setup ())); - this->poa_ = - this->rtpoa_setup_->poa (); + this->poa_ = this->rtpoa_setup_->poa (); } else { - this->poa_ = - RIR_Narrow<RTPortableServer::POA>::resolve (orb, - "RootPOA"); + this->poa_ = RIR_Narrow<RTPortableServer::POA>::resolve (orb, "RootPOA"); } } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h index 53f937119a0..e47418236c2 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h @@ -10,6 +10,7 @@ #include "RTClient_Setup.h" #include "RTPOA_Setup.h" +#include <memory> #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -35,7 +36,7 @@ public: private: PortableServer::POA_var poa_; - auto_ptr<RTPOA_Setup> rtpoa_setup_; + std::unique_ptr<RTPOA_Setup> rtpoa_setup_; }; #if defined(__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl index 554e85b8f78..c807fa81806 100755 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl @@ -15,7 +15,7 @@ my $server2 = PerlACE::TestTarget::create_target (2) || die "Create target 2 fai my $server3 = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; my $client = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; -$port = $server1->RandomPort () + 10001; # This can't be 10000 on Chorus 4.0 +$port = $server1->RandomPort () + 10001; $naming_ior = "NameService.ior"; diff --git a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp index 2e4da10e414..89ac54b9f05 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp @@ -3,7 +3,6 @@ #include "orbsvcs/Event_Utilities.h" #include "PushConsumer.h" #include "ace/Get_Opt.h" -#include "ace/Auto_Ptr.h" #include "orbsvcs/FtRtEvent/Utils/resolve_init.h" #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" @@ -12,9 +11,10 @@ /// include this file to statically linked with Transaction Depth #include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" +#include <memory> CORBA::ORB_var orb; -auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway; +std::unique_ptr<TAO_FTRTEC::FTEC_Gateway> gateway; RtecEventChannelAdmin::EventChannel_ptr get_event_channel(int argc, ACE_TCHAR** argv) @@ -49,7 +49,6 @@ get_event_channel(int argc, ACE_TCHAR** argv) } } - if (CORBA::is_nil(channel.in())) { CosNaming::Name name(1); @@ -65,7 +64,7 @@ get_event_channel(int argc, ACE_TCHAR** argv) if (use_gateway) { - ACE_auto_ptr_reset (gateway, new TAO_FTRTEC::FTEC_Gateway(orb.in(), channel.in())); + gateway.reset (new TAO_FTRTEC::FTEC_Gateway(orb.in(), channel.in())); return gateway->_this(); } else @@ -114,7 +113,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) qos); orb->run(); - } catch (const CORBA::Exception& ex){ ex._tao_print_exception ("A CORBA Exception occurred."); diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp index e1aac398307..27a190e1702 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp @@ -2,7 +2,6 @@ #include "orbsvcs/FtRtecEventChannelAdminC.h" #include "PushSupplier.h" #include "ace/Get_Opt.h" -#include "ace/Auto_Ptr.h" #include "ace/OS_NS_stdlib.h" #include "orbsvcs/FtRtEvent/Utils/resolve_init.h" #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" @@ -12,10 +11,11 @@ /// include this file to statically linked with Transaction Depth #include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h" +#include <memory> ACE_Time_Value timer_interval(1,0); CORBA::ORB_var orb; -auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway; +std::unique_ptr<TAO_FTRTEC::FTEC_Gateway> gateway; RtecEventChannelAdmin::EventChannel_ptr get_event_channel(int argc, ACE_TCHAR** argv) @@ -40,6 +40,7 @@ get_event_channel(int argc, ACE_TCHAR** argv) break; case 't': timer_interval.set(ACE_OS::atof(get_opt.opt_arg ())); + break; case 'h': case '?': ACE_DEBUG((LM_DEBUG, @@ -54,7 +55,6 @@ get_event_channel(int argc, ACE_TCHAR** argv) } } - if (CORBA::is_nil(channel.in())) { /// Find the FTRTEC from the Naming Service @@ -72,7 +72,7 @@ get_event_channel(int argc, ACE_TCHAR** argv) if (use_gateway) { // use local gateway to communicate with FTRTEC - ACE_auto_ptr_reset (gateway, new TAO_FTRTEC::FTEC_Gateway (orb.in (), channel.in ())); + gateway.reset (new TAO_FTRTEC::FTEC_Gateway (orb.in (), channel.in ())); return gateway->_this (); } else @@ -107,14 +107,11 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) RtecEventComm::PushSupplier_var supplier = push_supplier._this(); - orb->run(); - } catch (const CORBA::Exception& ex){ ex._tao_print_exception ("A CORBA Exception occurred."); } - return 0; } diff --git a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp index e4629650d00..13953088e6a 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp @@ -191,7 +191,7 @@ ExtendedFilter::add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin) constraint_list[0].event_types.length (0); constraint_list[0].constraint_expr = CORBA::string_dup (test_filter_string); - filter->add_constraints (constraint_list); + CosNotifyFilter::ConstraintInfoSeq_var cons_info = filter->add_constraints (constraint_list); CosNotifyFilter::FilterID id = filter_admin->add_filter (filter.in ()); diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp index 94410f0448c..6014d6c7aaf 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp @@ -145,7 +145,7 @@ Filter::add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin) constraint_list[0].event_types.length (0); constraint_list[0].constraint_expr = CORBA::string_dup (test_filter_string); - filter->add_constraints (constraint_list); + CosNotifyFilter::ConstraintInfoSeq_var cons_info = filter->add_constraints (constraint_list); CosNotifyFilter::FilterID id = filter_admin->add_filter (filter.in ()); diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp index 8390c42fd8c..e1b15e1fc3c 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp @@ -145,10 +145,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) constraints.length(1); constraints[0].event_types = event_types; - constraints[0].constraint_expr = CORBA::string_dup( - ""); + constraints[0].constraint_expr = CORBA::string_dup(""); - filter->add_constraints(constraints); + CosNotifyFilter::ConstraintInfoSeq_var cons_info = filter->add_constraints(constraints); pps->add_filter(filter.in()); diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp index 1ed574aff9d..f5939a0a146 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp @@ -82,7 +82,7 @@ create_proxyFilter (CosNotifyChannelAdmin::EventChannel_ptr ec) constraint_list[0].constraint_expr = CORBA::string_dup ("$.domain_name == 'domain1'"); - filter->add_constraints (constraint_list); + CosNotifyFilter::ConstraintInfoSeq_var cons_info = filter->add_constraints (constraint_list); } return filter._retn(); } diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp index 6acc045b104..67fcbe3c0f5 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp @@ -4,21 +4,17 @@ #include "ace/OS_NS_unistd.h" #include "tao/TAO_Singleton_Manager.h" - -DllOrb::DllOrb (void) - : - ma_barrier_(), +DllOrb::DllOrb () + : ma_barrier_(), mv_orb_ (), mv_rootPOA_ () { } - -DllOrb::~DllOrb (void) +DllOrb::~DllOrb () { } - int DllOrb::init (int argc, ACE_TCHAR *argv[]) { @@ -74,7 +70,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[]) return -1; } - ACE_auto_ptr_reset (ma_barrier_, new ACE_Thread_Barrier (threadCnt + 1)); + ma_barrier_.reset (new ACE_Thread_Barrier (threadCnt + 1)); this->activate( THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED, @@ -109,7 +105,7 @@ DllOrb::fini (void) wait(); ACE_DEBUG ((LM_ERROR, ACE_TEXT ("wait() done\n"))); - ACE_auto_ptr_reset (ma_barrier_, static_cast<ACE_Thread_Barrier *> (0)); + ma_barrier_.reset (); } catch (...) { @@ -131,7 +127,6 @@ DllOrb::fini (void) return 0; } - int DllOrb::svc (void) { ACE_DEBUG ((LM_INFO, ACE_TEXT ("svc mp_barrier->wait() ...\n"))); diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h index a4b708b86c0..a4900e8b420 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h +++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h @@ -3,13 +3,12 @@ #include "ace/Barrier.h" #include "ace/Task.h" -#include "ace/Auto_Ptr.h" #include "tao/ORB.h" +#include <memory> #include "tao/PortableServer/PortableServer.h" #include "bug_3252_export.h" - class bug_3252_Export DllOrb: public ACE_Task_Base { public: @@ -25,10 +24,10 @@ public: virtual int svc (); private: - auto_ptr < ACE_Thread_Barrier > ma_barrier_; - CORBA::ORB_var mv_orb_; - PortableServer::POA_var mv_rootPOA_; - PortableServer::POAManager_var mv_poaManager_; + std::unique_ptr <ACE_Thread_Barrier> ma_barrier_; + CORBA::ORB_var mv_orb_; + PortableServer::POA_var mv_rootPOA_; + PortableServer::POAManager_var mv_poaManager_; }; ACE_FACTORY_DECLARE (bug_3252, DllOrb) diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp index 126007ce526..bb3367c5605 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp @@ -147,7 +147,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) constraints[0].constraint_expr = CORBA::string_dup( "$data == 1 or $data == 2 or $data == 4"); - filter->add_constraints(constraints); + CosNotifyFilter::ConstraintInfoSeq_var cons_info = filter->add_constraints(constraints); pps->add_filter(filter.in()); diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp index 8a1fca47def..bd387c2fd5b 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp @@ -43,7 +43,7 @@ TestListener::TestListener( constraintSeq[0].event_types[0].type_name = "Data"; constraintSeq[0].constraint_expr = rc_filterExpression.c_str(); - v_filter->add_constraints (constraintSeq); + CosNotifyFilter::ConstraintInfoSeq_var cons_info = v_filter->add_constraints (constraintSeq); mv_consumerAdmin->add_filter(v_filter.in()); diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp index b07fb059aa8..34b575fe3b8 100644 --- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp @@ -341,7 +341,7 @@ FilterClient::create_supplieradmin () constraint_list[1].event_types[0].type_name = CORBA::string_dup(TYPE_NAME); constraint_list[1].constraint_expr = CORBA::string_dup (SA_FILTER); - sa_filter->add_constraints (constraint_list); + CosNotifyFilter::ConstraintInfoSeq_var cons_info = sa_filter->add_constraints (constraint_list); supplier_admin_->add_filter (sa_filter.in ()); } @@ -418,11 +418,10 @@ FilterClient::create_consumeradmin () constraint_list[1].event_types[0].type_name = CORBA::string_dup(TYPE_NAME); constraint_list[1].constraint_expr = CORBA::string_dup (CA_FILTER); - ca_filter_1->add_constraints (constraint_list); - ca_filter_2->add_constraints (constraint_list); + CosNotifyFilter::ConstraintInfoSeq_var cons_info1 = ca_filter_1->add_constraints (constraint_list); + CosNotifyFilter::ConstraintInfoSeq_var cons_info2 = ca_filter_2->add_constraints (constraint_list); consumer_admin_1_->add_filter (ca_filter_1.in ()); - consumer_admin_2_->add_filter (ca_filter_2.in ()); } diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp index aa51d70f020..b2fd42bbe1e 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp @@ -93,10 +93,9 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec) constraint_list.length(1); constraint_list[0].event_types.length (0); - constraint_list[0].constraint_expr = CORBA::string_dup ( - "$.enum < 0"); + constraint_list[0].constraint_expr = CORBA::string_dup ("$.enum < 0"); - filter->add_constraints (constraint_list); + CosNotifyFilter::ConstraintInfoSeq_var cons_info = filter->add_constraints (constraint_list); // apply filter admin->add_filter (filter.in ()); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp index 75489877c5b..102a6760b16 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp @@ -146,7 +146,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) constraint_list[0].event_types.length (0); constraint_list[0].constraint_expr = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (constraintString)); - filter->add_constraints (constraint_list); + CosNotifyFilter::ConstraintInfoSeq_var cons_info = filter->add_constraints (constraint_list); admin->add_filter(filter.in()); } diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp index 8a4a03bb408..51ddc643cc3 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp @@ -111,7 +111,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) "exist $.filterable_data(type) and " "$type != 1 and group != 0"); - filter->add_constraints (constraint_list); + CosNotifyFilter::ConstraintInfoSeq_var cons_info = filter->add_constraints (constraint_list); consumer_admin->add_filter (filter.in ()); } diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp index 6d3074d443b..a7f547c2259 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp @@ -102,7 +102,7 @@ Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consume constraint_list[0].event_types.length (0); constraint_list[0].constraint_expr = CORBA::string_dup ("$group != 1"); - filter->add_constraints (constraint_list); + CosNotifyFilter::ConstraintInfoSeq_var cons_info = filter->add_constraints (constraint_list); proxysupplier->add_filter (filter.in ()); } diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp index 38a2e127f44..bef3e4e6f8b 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp @@ -30,7 +30,7 @@ Notify_Push_Supplier::_connect ( constraint_list[0].event_types.length (0); constraint_list[0].constraint_expr = CORBA::string_dup ("group != 0"); - filter->add_constraints (constraint_list); + CosNotifyFilter::ConstraintInfoSeq_var cons_info = filter->add_constraints (constraint_list); proxyconsumer->add_filter (filter.in ()); } diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp index eab4576c4e5..afaedc73a36 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp @@ -131,7 +131,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) constraint_list[0].event_types.length (0); constraint_list[0].constraint_expr = CORBA::string_dup ("type != 1"); - filter->add_constraints (constraint_list); + CosNotifyFilter::ConstraintInfoSeq_var cons_info = filter->add_constraints (constraint_list); consumer_admin->add_filter (filter.in ()); } diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp index a1be7c03cad..37c90df467c 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp @@ -184,7 +184,7 @@ void add_admin_filter (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, constraint_list[0].event_types.length (0); constraint_list[0].constraint_expr = CORBA::string_dup ("type != 0"); - filter->add_constraints (constraint_list); + CosNotifyFilter::ConstraintInfoSeq_var cons_info = filter->add_constraints (constraint_list); admin->add_filter (filter.in ()); } diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp index 0135a6ce722..d0866878b38 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp @@ -1,7 +1,5 @@ #include "RT_Test_Filter.h" - - #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/RTCORBA/Thread_Pool.h" @@ -15,7 +13,6 @@ TAO_Notify_Tests_RT_Test_Filter::TAO_Notify_Tests_RT_Test_Filter (void) TAO_Notify_Tests_RT_Test_Filter::~TAO_Notify_Tests_RT_Test_Filter () { - } char* @@ -26,8 +23,7 @@ TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (void) CosNotifyFilter::ConstraintInfoSeq* -TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq& constraint_list - ) +TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq& constraint_list) { const char* PoolId_prefix = "PoolId = "; size_t poolId_index = ACE_OS::strlen (PoolId_prefix); @@ -75,15 +71,12 @@ TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::Constra void TAO_Notify_Tests_RT_Test_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDSeq & /*del_list*/, - const CosNotifyFilter::ConstraintInfoSeq & /*modify_list*/ - ) + const CosNotifyFilter::ConstraintInfoSeq & /*modify_list*/) { - } CosNotifyFilter::ConstraintInfoSeq* -TAO_Notify_Tests_RT_Test_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq & /*id_list*/ - ) +TAO_Notify_Tests_RT_Test_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq & /*id_list*/) { return 0; } @@ -91,13 +84,12 @@ TAO_Notify_Tests_RT_Test_Filter::get_constraints (const CosNotifyFilter::Constra CosNotifyFilter::ConstraintInfoSeq * TAO_Notify_Tests_RT_Test_Filter::get_all_constraints (void) { - return 0; + return 0; } void TAO_Notify_Tests_RT_Test_Filter::remove_all_constraints (void) { - } void @@ -115,14 +107,13 @@ TAO_Notify_Tests_RT_Test_Filter::destroy (void) CORBA::Boolean TAO_Notify_Tests_RT_Test_Filter::match (const CORBA::Any & /*filterable_data */ - ) + ) { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean -TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::StructuredEvent & notification - ) +TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::StructuredEvent & notification) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -216,8 +207,7 @@ TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::Struct CORBA::Boolean TAO_Notify_Tests_RT_Test_Filter::match_typed ( - const CosNotification::PropertySeq & /* filterable_data */ - ) + const CosNotification::PropertySeq & /* filterable_data */) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp index 27a24639088..c80efafa937 100644 --- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp +++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp @@ -242,9 +242,8 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[]) constraint_list[0].event_types.length(0); constraint_list[0].constraint_expr = CORBA::string_dup("Number == 100"); - filter1->add_constraints(constraint_list); - - filter2->add_constraints(constraint_list); + CosNotifyFilter::ConstraintInfoSeq_var cons_info1 = filter1->add_constraints(constraint_list); + CosNotifyFilter::ConstraintInfoSeq_var cons_info2 = filter2->add_constraints(constraint_list); ca->add_filter (filter1.in()); diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp index 289a53b161e..93fe8e5af33 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp @@ -135,7 +135,7 @@ TAO_Notify_Tests_Filter_Command::handle_add_constraint (void) constraint_list[0].constraint_expr = CORBA::string_dup (this->constraint_.c_str ()); ACE_DEBUG ((LM_DEBUG, "Adding constraint %s\n", this->constraint_.c_str ())); - filter->add_constraints (constraint_list); + CosNotifyFilter::ConstraintInfoSeq_var cons_info = filter->add_constraints (constraint_list); } void diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp index a8359d0a8eb..4851b4e8013 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp @@ -17,7 +17,7 @@ Notify_Test_Client::~Notify_Test_Client () { try { - root_poa_->destroy(1, 1); + root_poa_->destroy(true, true); orb_->destroy(); } catch (const CORBA::Exception& e) diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp index b6c264876fb..c7c018d66ed 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp @@ -103,7 +103,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec) constraint_list[0].constraint_expr = CORBA::string_dup ("type == 'even'"); - filter->add_constraints (constraint_list); + CosNotifyFilter::ConstraintInfoSeq_var cons_info = filter->add_constraints (constraint_list); admin->add_filter (filter.in ()); } diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp index 56e3fccb7f6..2fb227c9be3 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp @@ -101,7 +101,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec) constraint_list[0].constraint_expr = CORBA::string_dup ("type == 'even'"); - filter->add_constraints (constraint_list); + CosNotifyFilter::ConstraintInfoSeq_var cons_info = filter->add_constraints (constraint_list); admin->add_filter (filter.in ()); // End One Filter diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/README b/TAO/orbsvcs/tests/Security/Null_Cipher/README index 656b392abe1..bc74c23e7e8 100644 --- a/TAO/orbsvcs/tests/Security/Null_Cipher/README +++ b/TAO/orbsvcs/tests/Security/Null_Cipher/README @@ -1,5 +1,3 @@ - - This test verifies that a NULL cipher may be used. Sometime between openssl release 0.9.7a and 0.9.8g, openssl changed the way it evaluated cipher strings so that "DEFAULT:eNULL" no longer allowed use of a NULL diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl index dd74dc9300d..ec437b6d851 100755 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl @@ -44,7 +44,7 @@ while (my $argument = shift) { # Variables for command-line arguments to client and server # executables. -$ns_multicast_port = $ns->RandomPort (); # Can not be 10000 on Chorus 4.0 +$ns_multicast_port = $ns->RandomPort (); $ns_orb_port = 2000 + $ns->RandomPort (); $ns_ssl_port = 4000 + $ns->RandomPort (); $nsiorfile = "ns.ior"; diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl index 3b2bc6044b6..58c41e2ced3 100755 --- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl +++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl @@ -37,7 +37,7 @@ my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed # Variables for command-line arguments to client and server # executables. -$ns_multicast_port = 10001 + $test->RandomPort(); # Can not be 10000 on Chorus 4.0 +$ns_multicast_port = 10001 + $test->RandomPort(); $ns_orb_port = 12000 + $test->RandomPort(); $iorfile = "ns.ior"; diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl index 49299e5a180..894ff5e853a 100755 --- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl +++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl @@ -25,7 +25,7 @@ my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed # Variables for command-line arguments to client and server # executables. $multicast = '224.9.9.2'; -$ns_multicast_port = 10001 + $test->RandomPort(); # Can not be 10000 on Chorus 4.0 +$ns_multicast_port = 10001 + $test->RandomPort(); $ns_orb_port = 12000 + $test->RandomPort(); $iorfile = "ns.ior"; diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl index 3b4ce6bede2..a2755838966 100755 --- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl +++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl @@ -29,7 +29,7 @@ my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed # Variables for command-line arguments to client and server # executables. -$ns_multicast_port = 10001 + $test->RandomPort(); # Can not be 10000 on Chorus 4.0 +$ns_multicast_port = 10001 + $test->RandomPort(); $iorfile = "ns.ior"; $persistent_ior_file = "pns.ior"; diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl index 9dfb7c9f25d..fce4d76b5bb 100755 --- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl +++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl @@ -28,7 +28,7 @@ my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed # Variables for command-line arguments to client and server # executables. -$ns_multicast_port = 10001 + $test->RandomPort(); # Can not be 10000 on Chorus 4.0 +$ns_multicast_port = 10001 + $test->RandomPort(); $ns_orb_port = 12000 + $test->RandomPort(); $iorfile = "ns.ior"; diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index 7d5990210fa..7367ccf75f7 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -1,4 +1,3 @@ -#include "ace/Auto_Ptr.h" #include "ace/Get_Opt.h" #include "tao/Utils/ORB_Manager.h" #include "Offer_Exporter.h" @@ -6,6 +5,7 @@ #include "Service_Type_Exporter.h" #include "orbsvcs/Trader/Trader.h" #include "orbsvcs/Trader/Service_Type_Repository.h" +#include <memory> int parse_args (int argc, ACE_TCHAR *argv[], @@ -65,7 +65,7 @@ int failure = 0; // Start of Trading service scope. { TAO_Service_Type_Repository type_repos; - auto_ptr<TAO_Trader_Factory::TAO_TRADER> trader (TAO_Trader_Factory::create_trader (argc, argv)); + std::unique_ptr<TAO_Trader_Factory::TAO_TRADER> trader (TAO_Trader_Factory::create_trader (argc, argv)); TAO_Support_Attributes_i& sup_attr = trader->support_attributes (); TAO_Trading_Components_i& trd_comp = trader->trading_components (); diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/README b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/README index 56abcaafcd8..aa4453ddd7d 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/README +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/README @@ -188,37 +188,3 @@ javac *.java Run: java IDL_Cubit_Client - - -Running IDL_Cubit on CHORUS: --------------------------- - -1.You should make sure that you set the HOST environment variable on the -Chorus VME Board to the IP address of that Board before you run -MT_Cubit test. - -e.g., -$rsh tambora1 setenv HOST 128.252.165.82 - -2. You should make sure that the path to IOR file has write permission -for ALL. - -server: ------- -$rsh host_name arun path_to_server -f path_to_ior_file -ORBDottedDecimalAddresses 1 <server_options> - -You DONT have to use -ORBdotteddecimaladdresses 1 if you have -TAO_USE_DOTTED_DECIMAL_ADDRESSES defined in your config.h file. - -e.g., -$rsh tambora1 arun /IDL_Cubit/server -f /ior --ORBDottedDecimalAddresses 1 -ORBObjRefStyle URL - -client: -------- - -$rsh host_name arun path_to_client -f path_to_ior_file <client_options> - -e.g., - -$rsh tambora2 arun /IDL_Cubit/client -f /ior diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/README b/TAO/performance-tests/Cubit/TAO/MT_Cubit/README index 35ab6b1afe0..fe4c7c4b6c5 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/README +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/README @@ -175,41 +175,3 @@ RESULTS The client prints the latency observed by the high priority client, and the average latency observed by the low priority clients. Jitter (standard deviation of the latency) is also printed by the client. - - -Running MT_Cubit on CHORUS: --------------------------- - -1.You should make sure that you set the HOST environment variable on the -Chorus VME Board to the IP address of that Board before you run -MT_Cubit test. - -e.g -$rsh tambora1 setenv HOST 128.252.165.82 - -2. You should make sure that the path to IOR file has write permission -for ALL. - -server: ------- -$rsh host_name arun path_to_server -e iiop://DOTTED_DECIMAL_ADDRESS:0 - -f path_to_ior_file -ORBDottedDecimalAddresses 1 <server_options> - -Since Chorus doesn't support DNS, you should pass -dotted_decimal_address of the server machine to -e option. - -You DONT have to use -ORBDottedDecimalAddresses 1 if you have -TAO_USE_DOTTED_DECIMAL_ADDRESSES defined in your config.h file. - -e.g -$rsh tambora1 arun /MT_Cubit/server -e iiop://128.252.165.82:0 -f /ior --ORBDottedDecimalAddresses 1 -t 10 -ORBObjRefStyle url - -client: -------- - -$rsh host_name arun path_to_client -f path_to_ior_file <client_options> - -e.g - -$rsh tambora2 arun /MT_Cubit/client -f /ior -t 10 -n 300 diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h index 818ccc448f5..17f2d06f537 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h @@ -354,7 +354,7 @@ private: /// requests of this thread. JITTER_ARRAY *my_jitter_array_; - /// Timer using pccTimer for chorus and ACE_Timer for other platforms. + /// Timer using ACE_Timer MT_Cubit_Timer *timer_; /// frequency of CORBA requests. diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h index 36ed52485fb..f84b7499f28 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h @@ -25,8 +25,7 @@ /** * @class MT_Cubit_Timer * - * @brief A class that encapsulates the pccTimer for chorus and uses - * ACE Timer for other platforms. + * @brief A class that encapsulates the ACE timer */ class MT_Cubit_Timer { diff --git a/TAO/tao/Objref_VarOut_T.cpp b/TAO/tao/Objref_VarOut_T.cpp index 92a64351569..1ad6dfe1b25 100644 --- a/TAO/tao/Objref_VarOut_T.cpp +++ b/TAO/tao/Objref_VarOut_T.cpp @@ -9,9 +9,7 @@ #endif /* __ACE_INLINE__ */ template <typename T> -TAO_Objref_Var_T<T>::TAO_Objref_Var_T ( - const TAO_Objref_Var_T<T> & p - ) +TAO_Objref_Var_T<T>::TAO_Objref_Var_T (const TAO_Objref_Var_T<T> & p) : TAO_Base_var (), ptr_ (TAO::Objref_Traits<T>::duplicate (p.ptr ())) { @@ -28,9 +26,7 @@ TAO_Objref_Var_T<T>::operator= (T * p) template <typename T> TAO_Objref_Var_T<T> & -TAO_Objref_Var_T<T>::operator= ( - const TAO_Objref_Var_T<T> & p - ) +TAO_Objref_Var_T<T>::operator= (const TAO_Objref_Var_T<T> & p) { if (this != &p) { diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h index 3d31c1cc941..6f7595d1f1a 100644 --- a/TAO/tao/Objref_VarOut_T.h +++ b/TAO/tao/Objref_VarOut_T.h @@ -110,7 +110,6 @@ public: private: T *& ptr_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Objref_VarOut_T.inl b/TAO/tao/Objref_VarOut_T.inl index 36a0e5a0dcb..f57c2548630 100644 --- a/TAO/tao/Objref_VarOut_T.inl +++ b/TAO/tao/Objref_VarOut_T.inl @@ -3,14 +3,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename T> ACE_INLINE -TAO_Objref_Var_T<T>::TAO_Objref_Var_T (void) +TAO_Objref_Var_T<T>::TAO_Objref_Var_T () : ptr_ (TAO::Objref_Traits<T>::nil ()) { } template <typename T> ACE_INLINE -TAO_Objref_Var_T<T>::~TAO_Objref_Var_T (void) +TAO_Objref_Var_T<T>::~TAO_Objref_Var_T () { TAO::Objref_Traits<T>::release (this->ptr_); } @@ -48,7 +48,7 @@ TAO_Objref_Var_T<T>::in () const template <typename T> ACE_INLINE T *& -TAO_Objref_Var_T<T>::inout (void) +TAO_Objref_Var_T<T>::inout () { return this->ptr_; } @@ -56,7 +56,7 @@ TAO_Objref_Var_T<T>::inout (void) template <typename T> ACE_INLINE T *& -TAO_Objref_Var_T<T>::out (void) +TAO_Objref_Var_T<T>::out () { TAO::Objref_Traits<T>::release (this->ptr_); this->ptr_ = TAO::Objref_Traits<T>::nil (); @@ -66,7 +66,7 @@ TAO_Objref_Var_T<T>::out (void) template <typename T> ACE_INLINE T * -TAO_Objref_Var_T<T>::_retn (void) +TAO_Objref_Var_T<T>::_retn () { T * val = this->ptr_; this->ptr_ = TAO::Objref_Traits<T>::nil (); @@ -84,7 +84,7 @@ TAO_Objref_Var_T<T>::ptr () const template <typename T> ACE_INLINE void -TAO_Objref_Var_T<T>::free (void) +TAO_Objref_Var_T<T>::free () { TAO::Objref_Traits<T>::release (this->ptr_); } @@ -154,7 +154,7 @@ TAO_Objref_Out_T<T>::operator= (T * p) template <typename T> ACE_INLINE T *& -TAO_Objref_Out_T<T>::ptr (void) +TAO_Objref_Out_T<T>::ptr () { return this->ptr_; } @@ -169,7 +169,7 @@ TAO_Objref_Out_T<T>::operator T *& () template <typename T> ACE_INLINE T * -TAO_Objref_Out_T<T>::operator-> (void) +TAO_Objref_Out_T<T>::operator-> () { return this->ptr_; } diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h index 87959bbc07a..1361e14572a 100644 --- a/TAO/tao/RTScheduling/Current.h +++ b/TAO/tao/RTScheduling/Current.h @@ -146,7 +146,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current return nullptr; } - virtual const char* _interface_repository_id () const; + const char* _interface_repository_id () const override; //@} private: diff --git a/TAO/tao/Seq_Out_T.inl b/TAO/tao/Seq_Out_T.inl index 2dd32fead2c..70c26d52822 100644 --- a/TAO/tao/Seq_Out_T.inl +++ b/TAO/tao/Seq_Out_T.inl @@ -7,7 +7,7 @@ ACE_INLINE TAO_Seq_Out_T<T>::TAO_Seq_Out_T (T *& p) : ptr_ (p) { - this->ptr_ = 0; + this->ptr_ = nullptr; } template<typename T> @@ -16,23 +16,19 @@ TAO_Seq_Out_T<T>::TAO_Seq_Out_T (T_var & p) : ptr_ (p.out ()) { delete this->ptr_; - this->ptr_ = 0; + this->ptr_ = nullptr; } template<typename T> ACE_INLINE -TAO_Seq_Out_T<T>::TAO_Seq_Out_T ( - const TAO_Seq_Out_T<T> & p - ) +TAO_Seq_Out_T<T>::TAO_Seq_Out_T (const TAO_Seq_Out_T<T> & p) : ptr_ (p.ptr_) {} template<typename T> ACE_INLINE TAO_Seq_Out_T<T> & -TAO_Seq_Out_T<T>::operator= ( - const TAO_Seq_Out_T<T> & p - ) +TAO_Seq_Out_T<T>::operator= (const TAO_Seq_Out_T<T> & p) { this->ptr_ = p.ptr_; return *this; @@ -57,7 +53,7 @@ TAO_Seq_Out_T<T>::operator T *& () template<typename T> ACE_INLINE T *& -TAO_Seq_Out_T<T>::ptr (void) +TAO_Seq_Out_T<T>::ptr () { return this->ptr_; } @@ -65,7 +61,7 @@ TAO_Seq_Out_T<T>::ptr (void) template<typename T> ACE_INLINE T * -TAO_Seq_Out_T<T>::operator-> (void) +TAO_Seq_Out_T<T>::operator-> () { return this->ptr_; } diff --git a/TAO/tao/Seq_Var_T.cpp b/TAO/tao/Seq_Var_T.cpp index bc88a3a5904..f3c27e5b3c3 100644 --- a/TAO/tao/Seq_Var_T.cpp +++ b/TAO/tao/Seq_Var_T.cpp @@ -10,9 +10,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename T> -TAO_Seq_Var_Base_T<T>::TAO_Seq_Var_Base_T ( - const TAO_Seq_Var_Base_T<T> & p) - : ptr_ (p.ptr_ ? new T (*p.ptr_) : 0) +TAO_Seq_Var_Base_T<T>::TAO_Seq_Var_Base_T (const TAO_Seq_Var_Base_T<T> & p) + : ptr_ (p.ptr_ ? new T (*p.ptr_) : nullptr) { } @@ -20,8 +19,7 @@ TAO_Seq_Var_Base_T<T>::TAO_Seq_Var_Base_T ( template<typename T> TAO_FixedSeq_Var_T<T> & -TAO_FixedSeq_Var_T<T>::operator= ( - const TAO_FixedSeq_Var_T<T> & p) +TAO_FixedSeq_Var_T<T>::operator= (const TAO_FixedSeq_Var_T<T> & p) { // Strongly exception safe assignment using copy and non-throwing // swap technique. diff --git a/TAO/tao/Seq_Var_T.inl b/TAO/tao/Seq_Var_T.inl index 6d96a3176af..55b41b9bfc8 100644 --- a/TAO/tao/Seq_Var_T.inl +++ b/TAO/tao/Seq_Var_T.inl @@ -5,8 +5,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename T> ACE_INLINE -TAO_Seq_Var_Base_T<T>::TAO_Seq_Var_Base_T (void) - : ptr_ (0) +TAO_Seq_Var_Base_T<T>::TAO_Seq_Var_Base_T () + : ptr_ (nullptr) {} template<typename T> @@ -17,7 +17,7 @@ TAO_Seq_Var_Base_T<T>::TAO_Seq_Var_Base_T (T * p) template<typename T> ACE_INLINE -TAO_Seq_Var_Base_T<T>::~TAO_Seq_Var_Base_T (void) +TAO_Seq_Var_Base_T<T>::~TAO_Seq_Var_Base_T () { delete this->ptr_; } @@ -33,7 +33,7 @@ TAO_Seq_Var_Base_T<T>::operator-> () const template<typename T> ACE_INLINE T * -TAO_Seq_Var_Base_T<T>::operator-> (void) +TAO_Seq_Var_Base_T<T>::operator-> () { return this->ptr_; } @@ -70,7 +70,7 @@ TAO_Seq_Var_Base_T<T>::in () const template<typename T> ACE_INLINE T & -TAO_Seq_Var_Base_T<T>::inout (void) +TAO_Seq_Var_Base_T<T>::inout () { return *this->ptr_; } @@ -78,20 +78,20 @@ TAO_Seq_Var_Base_T<T>::inout (void) template<typename T> ACE_INLINE T *& -TAO_Seq_Var_Base_T<T>::out (void) +TAO_Seq_Var_Base_T<T>::out () { delete this->ptr_; - this->ptr_ = 0; + this->ptr_ = nullptr; return this->ptr_; } template<typename T> ACE_INLINE T * -TAO_Seq_Var_Base_T<T>::_retn (void) +TAO_Seq_Var_Base_T<T>::_retn () { T * tmp = this->ptr_; - this->ptr_ = 0; + this->ptr_ = nullptr; return tmp; } @@ -107,7 +107,7 @@ TAO_Seq_Var_Base_T<T>::ptr () const template<typename T> ACE_INLINE -TAO_FixedSeq_Var_T<T>::TAO_FixedSeq_Var_T (void) +TAO_FixedSeq_Var_T<T>::TAO_FixedSeq_Var_T () {} template<typename T> @@ -117,9 +117,7 @@ TAO_FixedSeq_Var_T<T>::TAO_FixedSeq_Var_T (T * p) {} template<typename T> -TAO_FixedSeq_Var_T<T>::TAO_FixedSeq_Var_T ( - const TAO_FixedSeq_Var_T<T> & p - ) +TAO_FixedSeq_Var_T<T>::TAO_FixedSeq_Var_T (const TAO_FixedSeq_Var_T<T> & p) : TAO_Seq_Var_Base_T<T> (p) { } @@ -163,7 +161,7 @@ TAO_FixedSeq_Var_T<T>::operator[] (CORBA::ULong index) const template<typename T> ACE_INLINE -TAO_VarSeq_Var_T<T>::TAO_VarSeq_Var_T (void) +TAO_VarSeq_Var_T<T>::TAO_VarSeq_Var_T () { } @@ -175,8 +173,7 @@ TAO_VarSeq_Var_T<T>::TAO_VarSeq_Var_T (T * p) } template<typename T> -TAO_VarSeq_Var_T<T>::TAO_VarSeq_Var_T ( - const TAO_VarSeq_Var_T<T> & p) +TAO_VarSeq_Var_T<T>::TAO_VarSeq_Var_T (const TAO_VarSeq_Var_T<T> & p) : TAO_Seq_Var_Base_T<T> (p) { } diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index fd742ddc17d..64f85080969 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -355,6 +355,7 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, taoid Basic_Arguments.h Basic_Argument_T.h Basic_Types.h + Basic_Types_IDLv4.h BD_String_Argument_T.h BiDir_Adapter.h Bind_Dispatcher_Guard.h diff --git a/TAO/tests/Alt_Mapping/README b/TAO/tests/Alt_Mapping/README index 81b4589fca0..66eb259f36d 100644 --- a/TAO/tests/Alt_Mapping/README +++ b/TAO/tests/Alt_Mapping/README @@ -68,7 +68,6 @@ run_test.pl: -n num -- runs the client num times (default is 5) -d -- runs each in debug mode - -onewin -- keeps all tests in one window on NT -h -- prints this information -t type -- runs only one type of param test -i (dii|sii) -- Changes the type of invocation (default is sii) diff --git a/TAO/tests/Alt_Mapping/run_test.pl b/TAO/tests/Alt_Mapping/run_test.pl index 2f344d4387f..c1f068d6d23 100755 --- a/TAO/tests/Alt_Mapping/run_test.pl +++ b/TAO/tests/Alt_Mapping/run_test.pl @@ -29,14 +29,13 @@ $status = 0; for ($i = 0; $i <= $#ARGV; $i++) { if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") { print "Run_Test Perl script for TAO Param Test\n\n"; - print "run_test [-n num] [-d] [-onewin] [-h] [-t type] [-i (dii|sii)] [-chorus <target>]\n"; + print "run_test [-n num] [-d] [-h] [-t type] [-i (dii|sii)]\n"; print "\n"; print "-n num -- runs the client num times\n"; print "-d -- runs each in debug mode\n"; print "-h -- prints this information\n"; print "-t type -- runs only one type of param test\n"; print "-i (dii|sii) -- Changes the type of invocation\n"; - print "-chorus <target> -- Run tests on chorus target\n"; exit 0; } elsif ($ARGV[$i] eq "-n") { diff --git a/TAO/tests/Bug_2289_Regression/run_test.pl b/TAO/tests/Bug_2289_Regression/run_test.pl index 9122517317c..ef1e3f3c51c 100755 --- a/TAO/tests/Bug_2289_Regression/run_test.pl +++ b/TAO/tests/Bug_2289_Regression/run_test.pl @@ -18,7 +18,7 @@ foreach $i (@ARGV) { } # We want the server to run on a fixed port -$port = PerlACE::uniqueid () + 10001; # This can't be 10000 for Chorus 4.0 +$port = PerlACE::uniqueid () + 10001; my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.cpp b/TAO/tests/Bug_3251_Regression/DllOrb.cpp index 239d08aed73..85a1701db36 100644 --- a/TAO/tests/Bug_3251_Regression/DllOrb.cpp +++ b/TAO/tests/Bug_3251_Regression/DllOrb.cpp @@ -74,7 +74,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[]) return -1; } - ACE_auto_ptr_reset (ma_barrier_, new ACE_Thread_Barrier (threadCnt + 1)); + ma_barrier_.reset (new ACE_Thread_Barrier (threadCnt + 1)); this->activate( THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED, @@ -106,7 +106,7 @@ DllOrb::fini (void) wait(); ACE_DEBUG ((LM_ERROR, ACE_TEXT ("wait() done\n"))); - ACE_auto_ptr_reset (ma_barrier_, static_cast<ACE_Thread_Barrier *> (0)); + ma_barrier_.reset (); } catch (...) { diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.h b/TAO/tests/Bug_3251_Regression/DllOrb.h index 24dae5c923e..d057b189e85 100644 --- a/TAO/tests/Bug_3251_Regression/DllOrb.h +++ b/TAO/tests/Bug_3251_Regression/DllOrb.h @@ -1,34 +1,34 @@ #ifndef bug_3251_DllORB_h #define bug_3251_DllORB_h -#include "ace/Auto_Ptr.h" #include "ace/Barrier.h" #include "ace/Task.h" #include "tao/ORB.h" -#include "tao/PortableServer/PortableServer.h" #include "bug_3251_export.h" +#include "tao/PortableServer/PortableServer.h" +#include <memory> -class bug_3251_Export DllOrb: public ACE_Task_Base +class bug_3251_Export DllOrb : public ACE_Task_Base { public: DllOrb (void); virtual ~DllOrb (void); - CORBA::ORB_ptr orb () const { return CORBA::ORB::_duplicate(mv_orb_.in()); } + CORBA::ORB_ptr orb () const { return CORBA::ORB::_duplicate (mv_orb_.in ()); } - virtual int init (int argc, ACE_TCHAR *argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); virtual int fini (); virtual int svc (); private: - auto_ptr < ACE_Thread_Barrier > ma_barrier_; - CORBA::ORB_var mv_orb_; - PortableServer::POA_var mv_rootPOA_; - PortableServer::POAManager_var mv_poaManager_; + std::unique_ptr<ACE_Thread_Barrier> ma_barrier_; + CORBA::ORB_var mv_orb_; + PortableServer::POA_var mv_rootPOA_; + PortableServer::POAManager_var mv_poaManager_; }; ACE_FACTORY_DECLARE (bug_3251, DllOrb) diff --git a/TAO/tests/Bug_3542_Regression/DllOrb.cpp b/TAO/tests/Bug_3542_Regression/DllOrb.cpp index 2dc87d62332..e16dcfc4acb 100644 --- a/TAO/tests/Bug_3542_Regression/DllOrb.cpp +++ b/TAO/tests/Bug_3542_Regression/DllOrb.cpp @@ -71,7 +71,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[]) return -1; } - ACE_auto_ptr_reset (ma_barrier_, new ACE_Thread_Barrier (threadCnt + 1)); + ma_barrier_.reset (new ACE_Thread_Barrier (threadCnt + 1)); this->activate( THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED, @@ -103,7 +103,7 @@ DllOrb::fini (void) wait(); ACE_DEBUG ((LM_ERROR, ACE_TEXT ("wait() done\n"))); - ACE_auto_ptr_reset (ma_barrier_, static_cast<ACE_Thread_Barrier *> (0)); + ma_barrier_.reset (); } catch (...) { diff --git a/TAO/tests/Bug_3542_Regression/DllOrb.h b/TAO/tests/Bug_3542_Regression/DllOrb.h index 5e320d6f9e9..1824980a125 100644 --- a/TAO/tests/Bug_3542_Regression/DllOrb.h +++ b/TAO/tests/Bug_3542_Regression/DllOrb.h @@ -1,34 +1,34 @@ #ifndef bug_3542_DllORB_h #define bug_3542_DllORB_h -#include "ace/Auto_Ptr.h" #include "ace/Barrier.h" #include "ace/Task.h" #include "tao/ORB.h" -#include "tao/PortableServer/PortableServer.h" #include "bug_3542_export.h" +#include "tao/PortableServer/PortableServer.h" +#include <memory> -class bug_3542_Export DllOrb: public ACE_Task_Base +class bug_3542_Export DllOrb : public ACE_Task_Base { public: DllOrb (void); virtual ~DllOrb (void); - CORBA::ORB_ptr orb () const { return CORBA::ORB::_duplicate(mv_orb_.in()); } + CORBA::ORB_ptr orb () const { return CORBA::ORB::_duplicate (mv_orb_.in ()); } - virtual int init (int argc, ACE_TCHAR *argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); virtual int fini (); virtual int svc (); private: - auto_ptr < ACE_Thread_Barrier > ma_barrier_; - CORBA::ORB_var mv_orb_; - PortableServer::POA_var mv_rootPOA_; - PortableServer::POAManager_var mv_poaManager_; + std::unique_ptr<ACE_Thread_Barrier> ma_barrier_; + CORBA::ORB_var mv_orb_; + PortableServer::POA_var mv_rootPOA_; + PortableServer::POAManager_var mv_poaManager_; }; ACE_FACTORY_DECLARE (bug_3542, DllOrb) diff --git a/TAO/tests/Bug_3853_Regression/run_test.pl b/TAO/tests/Bug_3853_Regression/run_test.pl index 97382650711..c4b86f89890 100755 --- a/TAO/tests/Bug_3853_Regression/run_test.pl +++ b/TAO/tests/Bug_3853_Regression/run_test.pl @@ -13,8 +13,8 @@ my $server1 = PerlACE::TestTarget::create_target (1) || die "Create target 1 fai my $server2 = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; my $client = PerlACE::TestTarget::create_target (3) || die "Create target 2 failed\n"; -$port1 = PerlACE::uniqueid () + 10001; # This can't be 10000 for Chorus 4.0 -$port2 = PerlACE::uniqueid () + 10002; # This can't be 10000 for Chorus 4.0 +$port1 = PerlACE::uniqueid () + 10001; +$port2 = PerlACE::uniqueid () + 10002; my $iorbase1 = "server1.ior"; my $iorbase2 = "server2.ior"; diff --git a/TAO/tests/Compression/RLECompressorTest.cpp b/TAO/tests/Compression/RLECompressorTest.cpp index 930106809cb..085f655f79e 100644 --- a/TAO/tests/Compression/RLECompressorTest.cpp +++ b/TAO/tests/Compression/RLECompressorTest.cpp @@ -9,15 +9,6 @@ #include <memory> -// Older versions of GCC do not support std::unique_ptr! -struct ACE_Byte_Array_ptr : std::auto_ptr<ACE_Byte> { - explicit ACE_Byte_Array_ptr(ACE_Byte *_Ptr = 0) - : std::auto_ptr<ACE_Byte>(_Ptr) {} - ~ACE_Byte_Array_ptr(void) { - delete [] (this->release()); - } -}; - /* This test produces the following output (RLECompressor) ******** TEST RLE Compressor ************ @@ -349,7 +340,7 @@ static int test128_compressor(const ::Compression::Compressor_var &compressor) ACE_TEXT("ERROR: nil Compressor.\n")),-1); } - ACE_Byte_Array_ptr buff_128(new ACE_Byte[BUFF_128_SIZE]); + std::unique_ptr<ACE_Byte[]> buff_128(new ACE_Byte[BUFF_128_SIZE]); ACE_OS::memset(buff_128.get(), 0, BUFF_128_SIZE); // Set Buffer to zero. @@ -412,7 +403,7 @@ static int test129A_compressor(const ::Compression::Compressor_var &compressor) ACE_TEXT("ERROR: nil Compressor.\n")),-1); } - const ACE_Byte_Array_ptr buff_129(new ACE_Byte[BUFF_129_SIZE]); + const std::unique_ptr<ACE_Byte[]> buff_129(new ACE_Byte[BUFF_129_SIZE]); ACE_OS::memset(buff_129.get(), 0, BUFF_129_SIZE); // Set Buffer to zero. @@ -475,7 +466,7 @@ static int test129B_compressor(const ::Compression::Compressor_var &compressor) ACE_TEXT("ERROR: nil Compressor.\n")),-1); } - const ACE_Byte_Array_ptr buff_129(new ACE_Byte[BUFF_129_SIZE]); + const std::unique_ptr<ACE_Byte[]> buff_129(new ACE_Byte[BUFF_129_SIZE]); ACE_OS::memset(buff_129.get(), 0, BUFF_129_SIZE); // Set Buffer to zero. diff --git a/TAO/tests/Compression/bzip2server.cpp b/TAO/tests/Compression/bzip2server.cpp index a9e938e9283..a51fda2298e 100644 --- a/TAO/tests/Compression/bzip2server.cpp +++ b/TAO/tests/Compression/bzip2server.cpp @@ -11,8 +11,7 @@ test_invalid_compression_factory (Compression::CompressionManager_ptr cm) try { // Get an invalid compression factory - Compression::CompressorFactory_var factory = - cm->get_factory (100); + Compression::CompressorFactory_var factory = cm->get_factory (100); } catch (const Compression::UnknownCompressorId&) { diff --git a/TAO/tests/Compression/zlibserver.cpp b/TAO/tests/Compression/zlibserver.cpp index 02f9add34ef..acbce34c446 100644 --- a/TAO/tests/Compression/zlibserver.cpp +++ b/TAO/tests/Compression/zlibserver.cpp @@ -11,12 +11,10 @@ test_invalid_compression_factory (Compression::CompressionManager_ptr cm) try { // Get an invalid compression factory - Compression::CompressorFactory_var factory = - cm->get_factory (100); + Compression::CompressorFactory_var factory = cm->get_factory (100); } - catch (const Compression::UnknownCompressorId& ex) + catch (const Compression::UnknownCompressorId&) { - ACE_UNUSED_ARG (ex); succeed = true; } catch (const CORBA::Exception&) @@ -119,7 +117,6 @@ test_compression (CORBA::ULong nelements, if (decompress != mytest) { ACE_ERROR ((LM_ERROR, "Error, decompress not working\n")); - } else { diff --git a/TAO/tests/DynAny_Test/run_test.pl b/TAO/tests/DynAny_Test/run_test.pl index 2f7562ff6d6..64e2257e833 100755 --- a/TAO/tests/DynAny_Test/run_test.pl +++ b/TAO/tests/DynAny_Test/run_test.pl @@ -28,7 +28,7 @@ sub run_test for ($i = 0; $i <= $#ARGV; $i++) { if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") { print "Run_Test Perl script for TAO DynAny Test\n\n"; - print "run_test [-chorus <target>] [-t type]\n"; + print "run_test [-t type]\n"; print "\n"; print "-t type -- runs only one type of dynany test\n"; exit; diff --git a/TAO/tests/IDL_Test/constants.idl b/TAO/tests/IDL_Test/constants.idl index c6c6023c5cf..46097f4f36d 100644 --- a/TAO/tests/IDL_Test/constants.idl +++ b/TAO/tests/IDL_Test/constants.idl @@ -1,4 +1,3 @@ - //============================================================================= /** * @file constants.idl @@ -8,7 +7,6 @@ * compiler. This test is to make sure the problems * stay fixed. * - * * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. */ //============================================================================= @@ -25,7 +23,6 @@ const char backslash = '\\'; // errors. // octal escape sequences - const char oct_nought = '\000'; const char lucky = '\7'; const char square = '4'; @@ -33,7 +30,6 @@ const char blastoff = '\321'; const char max_char_oct = '\377'; // hex escape sequences - const char hex_nought ='\x0'; const char fingers = '\xA'; const char fortnight = '\xe'; @@ -57,7 +53,6 @@ const long long PAAA = 122192928000000000; const long NAA = -1538947897; // various uncommon but legal formats for floats and doubles - const float root_beer = .2; const double bogey = .2; const float trip = 2.; @@ -75,7 +70,6 @@ const unsigned long mul1 = 0x80 * 0x70; const unsigned long div1 = 99 / 12; // The original Sun code for bitwise operators was broken. - const unsigned short stuff = ~0; const unsigned long day = ~0; const unsigned long drink = 1000000000 << 2; diff --git a/TAO/tests/IDLv4/annotations/annotation_tests.cpp b/TAO/tests/IDLv4/annotations/annotation_tests.cpp index 73b2359c178..3ddced256b8 100644 --- a/TAO/tests/IDLv4/annotations/annotation_tests.cpp +++ b/TAO/tests/IDLv4/annotations/annotation_tests.cpp @@ -4,7 +4,9 @@ #include <ast_porttype.h> #include <ast_eventtype.h> #include <ast_component.h> - +#include <ast_union_branch.h> +#include <ast_union_label.h> +#include <ast_expression.h> #include <string> namespace { @@ -1060,6 +1062,44 @@ annotation_tests () } } catch (Failed const &) {} + /* ------------------------------------------------------------------------- + * Empty union cases aliasing the default case must always be evaluated + * ------------------------------------------------------------------------- + * When the union has an enum discriminator, and one or more empty cases + * acting as an alias to the default case the IDL compiler was failing to + * resolve the ordinal value for these empty labels and this causes trouble + * for at least OpenDDS. + * + * This test is designed to verify that the condition is corrected by + * parsing a specially crafted union and validating the value of the + * label aliasing the default case. + */ + try { + Annotation_Test t ("empty union branch label"); + AST_Union *test_union = t.run ( + "enum disc {A, B, C};\n" + "union empty_union switch (disc) {\n" + "case A: long along;\n" + "case B: short bshort;\n" + "case C:\n" + "default: float cfloat;\n" + "};\n").assert_node<AST_Union>("::empty_union"); + AST_Field **af = 0; + test_union->field(af, 2); + AST_UnionBranch *ub = dynamic_cast<AST_UnionBranch *>(*af); + if (ub != nullptr) + { + AST_UnionLabel *ul = ub->label (); + if (ul != nullptr) + { + if (ul->label_val()->ev()->u.ulval != 2) + { + t.failed("did not get the correct label value"); + } + } + } +} catch (Failed const &) {} + // Done, Print Overall Results Annotation_Test::results (); } diff --git a/TAO/tests/Oneway_Send_Timeouts/Client_Task.h b/TAO/tests/Oneway_Send_Timeouts/Client_Task.h index b40ae16d536..6846ba0bc4c 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Client_Task.h +++ b/TAO/tests/Oneway_Send_Timeouts/Client_Task.h @@ -4,29 +4,29 @@ #include "Client.h" #include "ace/ARGV.h" +#include "ace/Task.h" class Client_Task : public ACE_Task_Base { - public: - +public: Client_Task (const std::string& args) : args_ (args) - { } + {} virtual int svc () { - ACE_ARGV my_args (args_.c_str()); + ACE_ARGV my_args (args_.c_str ()); { - Client client (my_args.argc(), my_args.argv()); - client.run(); + Client client (my_args.argc (), my_args.argv ()); + client.run (); } ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client_Task::svc>\n")); return 0; } - private: +private: std::string args_; }; diff --git a/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h b/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h index 60b870e3799..15ef11c9839 100644 --- a/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h +++ b/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h @@ -7,22 +7,24 @@ class ORB_Task : public ACE_Task_Base { - private: +private: CORBA::ORB_var orb_; - public: +public: ORB_Task (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) + { + if (CORBA::is_nil (orb_.in ()) == 1) { - if (CORBA::is_nil (orb_.in()) == 1) { - ACE_ERROR ((LM_ERROR, "ORB_Task> Ctr> Orb is NULL\n")); - } - }; + ACE_ERROR ((LM_ERROR, "ORB_Task> Ctr> Orb is NULL\n")); + } + }; virtual int svc () { - if (CORBA::is_nil (orb_.in()) == 0) { - orb_->run(); + if (CORBA::is_nil (orb_.in ()) == 0) + { + orb_->run (); } return -1; diff --git a/TAO/tests/Oneway_Send_Timeouts/Server.h b/TAO/tests/Oneway_Send_Timeouts/Server.h index 09d98a408d7..8317be7043a 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Server.h +++ b/TAO/tests/Oneway_Send_Timeouts/Server.h @@ -9,11 +9,11 @@ #include "tao/PortableServer/POAC.h" #include "tao/PortableServer/POAManagerC.h" -#include <string> +#include <memory> class Server { - public: +public: Server (int argc, ACE_TCHAR* argv[]); ~Server (); @@ -22,14 +22,14 @@ class Server bool init_; - private: +private: bool parse_args (int argc, ACE_TCHAR* argv[]); CORBA::ORB_var orb_; CORBA::ORB_var management_orb_; bool shutdown_; TAO_SYNCH_MUTEX mutex_; - std::auto_ptr<Test_i> test_i_; + std::unique_ptr<Test_i> test_i_; }; #endif //_SERVER_ diff --git a/TAO/tests/Oneway_Send_Timeouts/Server_Task.h b/TAO/tests/Oneway_Send_Timeouts/Server_Task.h index 08862f30111..2fa8cd818a3 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Server_Task.h +++ b/TAO/tests/Oneway_Send_Timeouts/Server_Task.h @@ -3,42 +3,48 @@ #include "Server.h" -#include "ace/Task.h" #include "ace/ARGV.h" -#include "ace/Auto_Ptr.h" +#include "ace/Task.h" + +#include <string> class Server_Task : public ACE_Task_Base { - public: - +public: Server_Task (const std::string& args) : args_ (args) - { } - ~Server_Task () - { - this->force_shutdown (); - } + {} + ~Server_Task () { this->force_shutdown (); } virtual int svc () { bool initializer = false; { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, -1); - if (server_.get() == 0) { - ACE_ARGV my_args (args_.c_str()); + if (!server_) + { + ACE_ARGV my_args (args_.c_str ()); - // Initialize Server ORB in new thread - ACE_auto_ptr_reset (server_, new Server (my_args.argc(), my_args.argv())); - ACE_ASSERT (server_.get() != 0); - initializer = true; + // Initialize Server ORB in new thread + +#ifdef ACE_HAS_CPP14 + server_ = std::make_unique<Server> (my_args.argc (), my_args.argv ()); +#else + server_.reset (new Server(my_args.argc (), my_args.argv ())); +#endif + + ACE_ASSERT (server_); + initializer = true; } } - if (initializer) { + if (initializer) + { server_->run (false); this->force_shutdown (); // servant thread is responsible for shutdown } - else { + else + { server_->run (true); } @@ -47,7 +53,8 @@ class Server_Task : public ACE_Task_Base bool ready () { - if (server_.get() != 0) { + if (server_) + { return server_->init_; } @@ -56,14 +63,15 @@ class Server_Task : public ACE_Task_Base void force_shutdown () { - if (server_.get() != 0) { + if (server_) + { server_->shutdown (); } } - private: +private: std::string args_; - std::auto_ptr<Server> server_; + std::unique_ptr<Server> server_; TAO_SYNCH_MUTEX mutex_; }; diff --git a/TAO/tests/Oneway_Send_Timeouts/Test_i.h b/TAO/tests/Oneway_Send_Timeouts/Test_i.h index 974a8401bba..896d33d846b 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Test_i.h +++ b/TAO/tests/Oneway_Send_Timeouts/Test_i.h @@ -5,7 +5,7 @@ class Test_i : public virtual POA_Test { - public: +public: Test_i (CORBA::ORB_ptr orb); virtual ~Test_i (); @@ -19,7 +19,7 @@ class Test_i : public virtual POA_Test virtual void shutdown (); - private: +private: volatile bool sleep_; volatile bool unsleep_; volatile bool shutdown_; diff --git a/TAO/tests/Oneway_Send_Timeouts/main.cpp b/TAO/tests/Oneway_Send_Timeouts/main.cpp index c1153ecbbf8..d8ff3f1ede1 100644 --- a/TAO/tests/Oneway_Send_Timeouts/main.cpp +++ b/TAO/tests/Oneway_Send_Timeouts/main.cpp @@ -1,11 +1,12 @@ -#include "Server_Task.h" #include "Client_Task.h" +#include "Server_Task.h" +#include "ace/High_Res_Timer.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_strings.h" -#include "ace/High_Res_Timer.h" -#include "ace/Auto_Ptr.h" + +#include <memory> class MyMain { @@ -20,37 +21,40 @@ private: bool init_server (const ACE_TCHAR* args); bool init_client (const ACE_TCHAR* args); - std::auto_ptr<Server_Task> server_task_; - std::auto_ptr<Client_Task> client_task_; + std::unique_ptr<Server_Task> server_task_; + std::unique_ptr<Client_Task> client_task_; bool s_init_; bool shutdown_; }; -void -MyMain::print_usage () -{ -} +void MyMain::print_usage () +{} -bool -MyMain::init_server (const ACE_TCHAR* args) +bool MyMain::init_server (const ACE_TCHAR* args) { - std::string my_args (ACE_TEXT_ALWAYS_CHAR(args)); + std::string my_args (ACE_TEXT_ALWAYS_CHAR (args)); // main thread and extra thread for backdoor operations int thread_pool = 2; - ACE_auto_ptr_reset (server_task_, new Server_Task (my_args)); - ACE_ASSERT (server_task_.get() != 0); +#ifdef ACE_HAS_CPP14 + server_task_ = std::make_unique<Server_Task> (my_args); +#else + server_task_.reset (new Server_Task (my_args)); +#endif - server_task_->activate (THR_NEW_LWP | THR_JOINABLE |THR_INHERIT_SCHED - , thread_pool); + ACE_ASSERT (server_task_); - int duration = 4; //wait 3 seconds for initialization + server_task_->activate (THR_NEW_LWP | THR_JOINABLE | THR_INHERIT_SCHED, thread_pool); + + int duration = 4; // wait 3 seconds for initialization ACE_Time_Value current = ACE_High_Res_Timer::gettimeofday_hr (); - ACE_Time_Value timeout = current + ACE_Time_Value(duration); + ACE_Time_Value timeout = current + ACE_Time_Value (duration); - while (current < timeout) { - if (server_task_->ready()) { + while (current < timeout) + { + if (server_task_->ready ()) + { break; } ACE_Time_Value sleep_time; @@ -59,65 +63,75 @@ MyMain::init_server (const ACE_TCHAR* args) current += sleep_time; } - if (!server_task_->ready()) { + if (!server_task_->ready ()) + { server_task_->force_shutdown (); server_task_->wait (); - ACE_auto_ptr_reset (server_task_, (Server_Task*)0); + server_task_.reset (); return false; } return true; } -bool -MyMain::init_client (const ACE_TCHAR* args) +bool MyMain::init_client (const ACE_TCHAR* args) { - std::string my_args (ACE_TEXT_ALWAYS_CHAR(args)); + std::string my_args (ACE_TEXT_ALWAYS_CHAR (args)); int thread_pool = 1; - ACE_auto_ptr_reset (client_task_, new Client_Task (my_args)); - ACE_ASSERT (client_task_.get() != 0); +#ifdef ACE_HAS_CPP14 + client_task_ = std::make_unique<Client_Task> (my_args); +#else + client_task_.reset (new Client_Task (my_args)); +#endif - client_task_->activate (THR_NEW_LWP | THR_JOINABLE |THR_INHERIT_SCHED - , thread_pool); + ACE_ASSERT (client_task_); + + client_task_->activate (THR_NEW_LWP | THR_JOINABLE | THR_INHERIT_SCHED, thread_pool); return true; } MyMain::MyMain (int argc, ACE_TCHAR* argv[]) - : s_init_ (false), shutdown_ (false) + : s_init_ (false) + , shutdown_ (false) { argc--; for (int p = 1; p <= argc; p++) + { + if (ACE_OS::strcmp (argv[p], ACE_TEXT ("-?")) == 0) { - if (ACE_OS::strcmp (argv[p], ACE_TEXT("-?")) == 0) { - print_usage (); - return; - } + print_usage (); + return; + } - if (ACE_OS::strcasecmp (argv[p], ACE_TEXT("-s")) == 0) { - const ACE_TCHAR* s_args = (((p+1) <= argc) ? argv[p+1] : 0); - s_init_ = this->init_server (s_args); - p++; - } - else if (ACE_OS::strcasecmp (argv[p], ACE_TEXT("-c")) == 0) { - const ACE_TCHAR* s_args = (((p+1) <= argc) ? argv[p+1] : 0); - if (s_init_) { - this->init_client (s_args); - } - p++; + if (ACE_OS::strcasecmp (argv[p], ACE_TEXT ("-s")) == 0) + { + const ACE_TCHAR* s_args = (((p + 1) <= argc) ? argv[p + 1] : 0); + s_init_ = this->init_server (s_args); + p++; + } + else if (ACE_OS::strcasecmp (argv[p], ACE_TEXT ("-c")) == 0) + { + const ACE_TCHAR* s_args = (((p + 1) <= argc) ? argv[p + 1] : 0); + if (s_init_) + { + this->init_client (s_args); } + p++; } + } } -void -MyMain::run () +void MyMain::run () { - if (server_task_.get() != 0) { + if (server_task_) + { server_task_->wait (); } - if (client_task_.get() != 0) { + if (client_task_) + { client_task_->wait (); } @@ -126,7 +140,8 @@ MyMain::run () MyMain::~MyMain () { - if (!shutdown_) { + if (!shutdown_) + { this->run (); } } diff --git a/TAO/tests/POA/EndpointPolicy/README b/TAO/tests/POA/EndpointPolicy/README index cfbf848b9f2..181b0dfd992 100644 --- a/TAO/tests/POA/EndpointPolicy/README +++ b/TAO/tests/POA/EndpointPolicy/README @@ -1,7 +1,5 @@ /** - - @page EndpointPolicy Test README File This test validates the TAO-specific Endpoint Policy. The Endpoint Policy diff --git a/TAO/tests/Param_Test/README b/TAO/tests/Param_Test/README index 88f7b83df9e..408fe74cf69 100644 --- a/TAO/tests/Param_Test/README +++ b/TAO/tests/Param_Test/README @@ -90,7 +90,6 @@ run_test.pl: -n num -- runs the client num times (default is 5) -d -- runs each in debug mode - -onewin -- keeps all tests in one window on NT -h -- prints this information -t type -- runs only one type of param test -i (dii|sii) -- Changes the type of invocation (default is sii) diff --git a/TAO/tests/Param_Test/run_test.pl b/TAO/tests/Param_Test/run_test.pl index 7b89939b0d8..563c1694777 100755 --- a/TAO/tests/Param_Test/run_test.pl +++ b/TAO/tests/Param_Test/run_test.pl @@ -40,14 +40,13 @@ $status = 0; for ($i = 0; $i <= $#ARGV; $i++) { if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") { print "Run_Test Perl script for TAO Param Test\n\n"; - print "run_test [-n num] [-d] [-onewin] [-h] [-t type] [-i (dii|sii)] [-chorus <target>]\n"; + print "run_test [-n num] [-d] [-h] [-t type] [-i (dii|sii)]\n"; print "\n"; print "-n num -- runs the client num times\n"; print "-d -- runs each in debug mode\n"; print "-h -- prints this information\n"; print "-t type -- runs only one type of param test\n"; print "-i (dii|sii) -- Changes the type of invocation\n"; - print "-chorus <target> -- Run tests on chorus target\n"; exit 0; } elsif ($ARGV[$i] eq "-n") { |