From 363d0088e5f7a598ef1ced7ff0d8ddd9b11e129b Mon Sep 17 00:00:00 2001 From: Ossama Othman Date: Sun, 27 Nov 2005 12:11:35 +0000 Subject: ChangeLogTag:Sun Nov 27 04:05:52 2005 Ossama Othman --- ChangeLog | 58 ++++++++++++++++++++++ Kokyu/Kokyu_defs.h | 2 - ace/Asynch_Connector.h | 4 ++ ace/Cleanup.cpp | 10 ++-- ace/Cleanup.h | 19 ++++++- ace/If_Then_Else.h | 2 + ace/OS.h | 9 ++++ ace/Object_Manager.cpp | 2 +- ace/Object_Manager.inl | 2 +- ace/SSL/SSL_Asynch_Stream.h | 4 +- ace/SSL/SSL_SOCK_Acceptor.cpp | 4 +- ace/Value_Ptr.h | 2 + ace/ace.mpc | 2 +- ace/ace_for_tao.mpc | 2 +- bin/MakeProjectCreator/config/aceexe.mpb | 2 +- bin/MakeProjectCreator/config/acelib.mpb | 2 +- bin/MakeProjectCreator/config/acexml.mpb | 1 + .../config/versioned_namespace.mpb | 13 +++++ protocols/ace/HTBP/HTBP_Addr.cpp | 8 ++- protocols/ace/HTBP/HTBP_Addr.h | 4 ++ protocols/ace/HTBP/HTBP_Channel.cpp | 4 ++ protocols/ace/HTBP/HTBP_Channel.h | 3 ++ protocols/ace/HTBP/HTBP_Channel.inl | 8 +-- protocols/ace/HTBP/HTBP_Environment.cpp | 4 ++ protocols/ace/HTBP/HTBP_Environment.h | 3 ++ protocols/ace/HTBP/HTBP_Filter.cpp | 7 ++- protocols/ace/HTBP/HTBP_Filter.h | 6 ++- protocols/ace/HTBP/HTBP_Filter.inl | 7 ++- protocols/ace/HTBP/HTBP_Filter_Factory.cpp | 5 ++ protocols/ace/HTBP/HTBP_Filter_Factory.h | 4 ++ protocols/ace/HTBP/HTBP_ID_Requestor.cpp | 4 ++ protocols/ace/HTBP/HTBP_ID_Requestor.h | 5 ++ protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp | 6 ++- protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h | 6 ++- protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl | 7 ++- protocols/ace/HTBP/HTBP_Notifier.cpp | 4 ++ protocols/ace/HTBP/HTBP_Notifier.h | 6 ++- protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp | 4 ++ protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h | 4 ++ protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl | 7 ++- protocols/ace/HTBP/HTBP_Session.cpp | 6 ++- protocols/ace/HTBP/HTBP_Session.h | 7 ++- protocols/ace/HTBP/HTBP_Session.inl | 7 ++- protocols/ace/HTBP/HTBP_Stream.cpp | 4 +- protocols/ace/HTBP/HTBP_Stream.h | 6 ++- tests/ACE_Init_Test.cpp | 2 + tests/Process_Strategy_Test.h | 3 -- 47 files changed, 249 insertions(+), 42 deletions(-) create mode 100644 bin/MakeProjectCreator/config/versioned_namespace.mpb diff --git a/ChangeLog b/ChangeLog index 13de051f708..1af5e465426 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,61 @@ +Sun Nov 27 04:05:52 2005 Ossama Othman + + * ace/ace.mpc: + * ace/ace_for_tao.mpc: + * bin/MakeProjectCreator/config/aceexe.mpb: + * bin/MakeProjectCreator/config/acelib.mpb: + * bin/MakeProjectCreator/config/versioned_namespace.mpb: + + Added versioned namespace MPC support. Disabled by default. + Add "versioned_namespace=1" to default.features to enable. + + * Kokyu/Kokyu_defs.h: + * ace/Asynch_Connector.h: + * ace/Cleanup.cpp: + * ace/Cleanup.h: + * ace/If_Then_Else.h: + * ace/OS.h: + * ace/Object_Manager.cpp: + * ace/Object_Manager.inl: + * ace/Value_Ptr.h: + * ace/SSL/SSL_Asynch_Stream.h: + * ace/SSL/SSL_SOCK_Acceptor.cpp: + * protocols/ace/HTBP/HTBP_Addr.cpp: + * protocols/ace/HTBP/HTBP_Addr.h: + * protocols/ace/HTBP/HTBP_Channel.cpp: + * protocols/ace/HTBP/HTBP_Channel.h: + * protocols/ace/HTBP/HTBP_Channel.inl: + * protocols/ace/HTBP/HTBP_Environment.cpp: + * protocols/ace/HTBP/HTBP_Environment.h: + * protocols/ace/HTBP/HTBP_Filter.cpp: + * protocols/ace/HTBP/HTBP_Filter.h: + * protocols/ace/HTBP/HTBP_Filter.inl: + * protocols/ace/HTBP/HTBP_Filter_Factory.cpp: + * protocols/ace/HTBP/HTBP_Filter_Factory.h: + * protocols/ace/HTBP/HTBP_ID_Requestor.cpp: + * protocols/ace/HTBP/HTBP_ID_Requestor.h: + * protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp: + * protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h: + * protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl: + * protocols/ace/HTBP/HTBP_Notifier.cpp: + * protocols/ace/HTBP/HTBP_Notifier.h: + * protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp: + * protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h: + * protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl: + * protocols/ace/HTBP/HTBP_Session.cpp: + * protocols/ace/HTBP/HTBP_Session.h: + * protocols/ace/HTBP/HTBP_Session.inl: + * protocols/ace/HTBP/HTBP_Stream.cpp: + * protocols/ace/HTBP/HTBP_Stream.h: + * tests/ACE_Init_Test.cpp: + * tests/Process_Strategy_Test.h: + + Corrected build errors in versioned namespace builds. + + * bin/MakeProjectCreator/config/acexml.mpb: + + Disable ACEXML libraries when "ace_for_tao" is enabled. + Fri Nov 25 19:04:10 2005 Ossama Othman * NEWS: diff --git a/Kokyu/Kokyu_defs.h b/Kokyu/Kokyu_defs.h index 281b0ac42c0..c2b83af847a 100644 --- a/Kokyu/Kokyu_defs.h +++ b/Kokyu/Kokyu_defs.h @@ -24,8 +24,6 @@ #include "kokyu_export.h" -class ACE_Allocator; - namespace Kokyu { typedef long Priority_t; diff --git a/ace/Asynch_Connector.h b/ace/Asynch_Connector.h index d7bf516cecf..06e9bb41382 100644 --- a/ace/Asynch_Connector.h +++ b/ace/Asynch_Connector.h @@ -26,6 +26,8 @@ #include "ace/Asynch_IO.h" #include "ace/INET_Addr.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward declarations class ACE_Message_Block; @@ -155,6 +157,8 @@ private: }; +ACE_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Asynch_Connector.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/ace/Cleanup.cpp b/ace/Cleanup.cpp index 71b5ebf0d74..7bc3c29e523 100644 --- a/ace/Cleanup.cpp +++ b/ace/Cleanup.cpp @@ -28,7 +28,7 @@ ACE_Cleanup::~ACE_Cleanup (void) /*****************************************************************************/ extern "C" void -ace_cleanup_destroyer (ACE_Cleanup *object, void *param) +ACE_CLEANUP_DESTROYER_NAME (ACE_Cleanup *object, void *param) { object->cleanup (param); } @@ -175,10 +175,12 @@ ACE_OS_Exit_Info::call_hooks (void) iter = iter->next_) { ACE_Cleanup_Info &info = iter->cleanup_info_; - if (info.cleanup_hook_ == reinterpret_cast (ace_cleanup_destroyer)) + if (info.cleanup_hook_ == reinterpret_cast ( + ACE_CLEANUP_DESTROYER_NAME)) // The object is an ACE_Cleanup. - ace_cleanup_destroyer (reinterpret_cast (info.object_), - info.param_); + ACE_CLEANUP_DESTROYER_NAME ( + reinterpret_cast (info.object_), + info.param_); else if (info.object_ == &ace_exit_hook_marker) // The hook is an ACE_EXIT_HOOK. (* reinterpret_cast (info.cleanup_hook_)) (); diff --git a/ace/Cleanup.h b/ace/Cleanup.h index 35442a26d86..d288225a0a5 100644 --- a/ace/Cleanup.h +++ b/ace/Cleanup.h @@ -27,6 +27,23 @@ #include "ace/ACE_export.h" +#if (defined (ACE_HAS_VERSIONED_NAMESPACE) \ + && ACE_HAS_VERSIONED_NAMESPACE == 1) \ + && !(defined (_MSC_VER) && _MSC_VER <= 1200) +// MSVC++ 6's preprocessor can't handle macro expansions required by +// the versioned namespace support. *sigh* + +# include "ace/Global_Macros.h" + +# define ACE_CLEANUP_DESTROYER_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ace_cleanup_destroyer) + +#else + +# define ACE_CLEANUP_DESTROYER_NAME ace_cleanup_destroyer + +#endif /* ACE_HAS_VERSIONED_NAMESPACE == 1 */ + + ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** @@ -49,7 +66,7 @@ public: // Adapter for cleanup, used by ACE_Object_Manager. extern "C" ACE_Export -void ace_cleanup_destroyer (ACE_Cleanup *, void *param = 0); +void ACE_CLEANUP_DESTROYER_NAME (ACE_Cleanup *, void *param = 0); /** * @class ACE_Cleanup_Info diff --git a/ace/If_Then_Else.h b/ace/If_Then_Else.h index 391490a07c5..163219e206b 100644 --- a/ace/If_Then_Else.h +++ b/ace/If_Then_Else.h @@ -17,6 +17,8 @@ #ifndef ACE_IF_THEN_ELSE_H #define ACE_IF_THEN_ELSE_H +#include "ace/config-lite.h" + ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE diff --git a/ace/OS.h b/ace/OS.h index ed37b63ff6c..4f2fe57d8e4 100644 --- a/ace/OS.h +++ b/ace/OS.h @@ -76,8 +76,12 @@ #include "ace/Time_Value.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + class ACE_Timeout_Manager; +ACE_END_VERSIONED_NAMESPACE_DECL + // Here are all ACE-specific default constants, needed throughout ACE // and its applications. The values can be over written by user // specific values in config.h files. @@ -328,6 +332,9 @@ class ACE_Timeout_Manager; # include "ace/os_include/os_syslog.h" # endif /* !defined (ACE_WIN32) && !defined (ACE_LACKS_UNIX_SYSLOG) */ + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @namespace ACE_OS * @@ -350,6 +357,8 @@ namespace ACE_OS // = A set of wrappers for miscellaneous operations. } /* namespace ACE_OS */ +ACE_END_VERSIONED_NAMESPACE_DECL + # if defined (ACE_HAS_INLINED_OSCALLS) # if defined (ACE_INLINE) # undef ACE_INLINE diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp index 84c204d15b4..e05477198eb 100644 --- a/ace/Object_Manager.cpp +++ b/ace/Object_Manager.cpp @@ -88,7 +88,7 @@ void *ACE_Object_Manager::preallocated_array[ preallocated_array[ID] = array_p;\ } # define ACE_DELETE_PREALLOCATED_OBJECT(TYPE, ID)\ - ace_cleanup_destroyer (\ + ACE_CLEANUP_DESTROYER_NAME (\ (ACE_Cleanup_Adapter *) preallocated_object[ID], 0);\ preallocated_object[ID] = 0; # define ACE_DELETE_PREALLOCATED_ARRAY(TYPE, ID, COUNT)\ diff --git a/ace/Object_Manager.inl b/ace/Object_Manager.inl index 9c78d96f4a9..bb95a485fdc 100644 --- a/ace/Object_Manager.inl +++ b/ace/Object_Manager.inl @@ -11,7 +11,7 @@ ACE_Object_Manager::at_exit (ACE_Cleanup *object, { return ACE_Object_Manager::instance ()->at_exit_i ( object, - (ACE_CLEANUP_FUNC) ace_cleanup_destroyer, + (ACE_CLEANUP_FUNC) ACE_CLEANUP_DESTROYER_NAME, param); } diff --git a/ace/SSL/SSL_Asynch_Stream.h b/ace/SSL/SSL_Asynch_Stream.h index 8e8f5534e3a..908e855a697 100644 --- a/ace/SSL/SSL_Asynch_Stream.h +++ b/ace/SSL/SSL_Asynch_Stream.h @@ -60,8 +60,8 @@ class ACE_SSL_Export ACE_SSL_Asynch_Stream : public ACE_Asynch_Operation, public ACE_Service_Handler { - friend int ACE_Asynch_BIO_read (BIO * pBIO, char * buf, int len); - friend int ACE_Asynch_BIO_write (BIO * pBIO, const char * buf, int len); + friend int ::ACE_Asynch_BIO_read (BIO * pBIO, char * buf, int len); + friend int ::ACE_Asynch_BIO_write (BIO * pBIO, const char * buf, int len); public: diff --git a/ace/SSL/SSL_SOCK_Acceptor.cpp b/ace/SSL/SSL_SOCK_Acceptor.cpp index acad89fd219..61c91e999e4 100644 --- a/ace/SSL/SSL_SOCK_Acceptor.cpp +++ b/ace/SSL/SSL_SOCK_Acceptor.cpp @@ -12,8 +12,6 @@ #include "ace/Time_Value.h" #include "ace/Countdown_Time.h" -ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Acceptor) - #if !defined (__ACE_INLINE__) #include "SSL_SOCK_Acceptor.i" #endif /* __ACE_INLINE__ */ @@ -24,6 +22,8 @@ ACE_RCSID (ACE_SSL, ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Acceptor) + ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor (void) { ACE_TRACE ("ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor"); diff --git a/ace/Value_Ptr.h b/ace/Value_Ptr.h index b652183ef43..70570f9c34b 100644 --- a/ace/Value_Ptr.h +++ b/ace/Value_Ptr.h @@ -16,6 +16,8 @@ #ifndef ACE_VALUE_PTR_H #define ACE_VALUE_PTR_H +#include "ace/config-lite.h" + #include ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ace/ace.mpc b/ace/ace.mpc index 6ae796ec743..146c3764308 100644 --- a/ace/ace.mpc +++ b/ace/ace.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- now wouldn't this be cool... // $Id$ -project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache, pkgconfig { +project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache, versioned_namespace, pkgconfig { avoids = ace_for_tao libout = $(ACE_ROOT)/lib sharedname = ACE diff --git a/ace/ace_for_tao.mpc b/ace/ace_for_tao.mpc index 57775f2cc3d..de606b1a423 100644 --- a/ace/ace_for_tao.mpc +++ b/ace/ace_for_tao.mpc @@ -2,7 +2,7 @@ // // $Id$ -project(ACE_FOR_TAO) : acedefaults, core, svcconf, pkgconfig { +project(ACE_FOR_TAO) : acedefaults, core, svcconf, versioned_namespace, pkgconfig { requires = ace_for_tao libout = $(ACE_ROOT)/lib sharedname = ACE_FOR_TAO diff --git a/bin/MakeProjectCreator/config/aceexe.mpb b/bin/MakeProjectCreator/config/aceexe.mpb index 0e75bbcf3a1..cfd59d40b8d 100644 --- a/bin/MakeProjectCreator/config/aceexe.mpb +++ b/bin/MakeProjectCreator/config/aceexe.mpb @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project: acedefaults, acenosubsets, ace_for_tao { +project: acedefaults, acenosubsets, ace_for_tao, versioned_namespace { } diff --git a/bin/MakeProjectCreator/config/acelib.mpb b/bin/MakeProjectCreator/config/acelib.mpb index aba02c877ca..c1be0ca8fc3 100644 --- a/bin/MakeProjectCreator/config/acelib.mpb +++ b/bin/MakeProjectCreator/config/acelib.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project: acedefaults, acenosubsets, ace_for_tao, pkgconfig { +project: acedefaults, acenosubsets, ace_for_tao, versioned_namespace, pkgconfig { libout = $(ACE_ROOT)/lib specific(automake) { diff --git a/bin/MakeProjectCreator/config/acexml.mpb b/bin/MakeProjectCreator/config/acexml.mpb index caf428e3353..7097de92b92 100644 --- a/bin/MakeProjectCreator/config/acexml.mpb +++ b/bin/MakeProjectCreator/config/acexml.mpb @@ -2,6 +2,7 @@ // $Id$ project { + avoids += ace_for_tao after += ACEXML_Parser ACEXML libs += ACEXML_Parser ACEXML includes += $(ACE_ROOT)/ACEXML/common diff --git a/bin/MakeProjectCreator/config/versioned_namespace.mpb b/bin/MakeProjectCreator/config/versioned_namespace.mpb new file mode 100644 index 00000000000..502c8139ceb --- /dev/null +++ b/bin/MakeProjectCreator/config/versioned_namespace.mpb @@ -0,0 +1,13 @@ +// -*- MPC -*- +// +// $Id$ + +feature(versioned_namespace) { + + macros += ACE_HAS_VERSIONED_NAMESPACE=1 + + // Users, define the ACE_VERSIONED_NAMESPACE_NAME preprocessor + // symbol in your ace/config.h to override the default versioned + // namespace name of the form ACE_5_4_7. + +} diff --git a/protocols/ace/HTBP/HTBP_Addr.cpp b/protocols/ace/HTBP/HTBP_Addr.cpp index 0ea811bb108..aff894e80dc 100644 --- a/protocols/ace/HTBP/HTBP_Addr.cpp +++ b/protocols/ace/HTBP/HTBP_Addr.cpp @@ -7,8 +7,10 @@ ACE_RCSID (HTBP, ACE_HTBP_Addr, "$Id$") - // Constructor - ACE::HTBP::Addr::Addr () +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + +// Constructor +ACE::HTBP::Addr::Addr () { } @@ -87,3 +89,5 @@ ACE::HTBP::Addr::string_to_addr (const char address[]) // this->htid_ = address; // return 0; } + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/protocols/ace/HTBP/HTBP_Addr.h b/protocols/ace/HTBP/HTBP_Addr.h index 3cbbaa397f7..14241b3c3b6 100644 --- a/protocols/ace/HTBP/HTBP_Addr.h +++ b/protocols/ace/HTBP/HTBP_Addr.h @@ -24,6 +24,8 @@ #include "ace/Synch.h" #include "ace/SString.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + namespace ACE { namespace HTBP @@ -83,5 +85,7 @@ namespace ACE } } +ACE_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ACE_HTBP_ADDR_H */ diff --git a/protocols/ace/HTBP/HTBP_Channel.cpp b/protocols/ace/HTBP/HTBP_Channel.cpp index 10bbd507206..064312377ba 100644 --- a/protocols/ace/HTBP/HTBP_Channel.cpp +++ b/protocols/ace/HTBP/HTBP_Channel.cpp @@ -22,6 +22,8 @@ #include "ace/Reactor.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + // Initialization and termination methods. /// Constructor. ACE::HTBP::Channel::Channel (ACE::HTBP::Session *s) @@ -531,3 +533,5 @@ ACE::HTBP::Channel::get_filter () int inside = (this->session_ != 0); return factory->get_filter (inside); } + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/protocols/ace/HTBP/HTBP_Channel.h b/protocols/ace/HTBP/HTBP_Channel.h index 3109ed656eb..b33d446e40b 100644 --- a/protocols/ace/HTBP/HTBP_Channel.h +++ b/protocols/ace/HTBP/HTBP_Channel.h @@ -26,6 +26,7 @@ #include "HTBP_Filter.h" #include "HTBP_Notifier.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { @@ -269,6 +270,8 @@ namespace ACE } } +ACE_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "HTBP_Channel.inl" #endif diff --git a/protocols/ace/HTBP/HTBP_Channel.inl b/protocols/ace/HTBP/HTBP_Channel.inl index 70fc4834842..7df1ba8f16e 100644 --- a/protocols/ace/HTBP/HTBP_Channel.inl +++ b/protocols/ace/HTBP/HTBP_Channel.inl @@ -1,8 +1,8 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ -// ACE::HTBP::Channel.i - +ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE::HTBP::Session * @@ -120,3 +120,5 @@ ACE::HTBP::Channel::set_handle (ACE_HANDLE h) return; this->ace_stream_.set_handle (h); } + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/protocols/ace/HTBP/HTBP_Environment.cpp b/protocols/ace/HTBP/HTBP_Environment.cpp index 60d3b017f17..bd14abcce3d 100644 --- a/protocols/ace/HTBP/HTBP_Environment.cpp +++ b/protocols/ace/HTBP/HTBP_Environment.cpp @@ -6,6 +6,8 @@ ACE_RCSID (HTBP, ACE_HTBP_Environment, "$Id$") +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + ACE::HTBP::Environment::Environment (ACE_Configuration *config, int using_registry, const ACE_TCHAR *persistent_file) @@ -195,3 +197,5 @@ ACE::HTBP::Environment::export_config (const ACE_TCHAR *filename) { return this->imp_exp_->export_config (filename); } + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/protocols/ace/HTBP/HTBP_Environment.h b/protocols/ace/HTBP/HTBP_Environment.h index 2f4cc90a5ac..894a376457a 100644 --- a/protocols/ace/HTBP/HTBP_Environment.h +++ b/protocols/ace/HTBP/HTBP_Environment.h @@ -15,6 +15,7 @@ #include "ace/Configuration_Import_Export.h" #include "ace/Singleton.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { @@ -103,5 +104,7 @@ namespace ACE } } +ACE_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ACE_HTBP_ENVIRONMENT_H */ diff --git a/protocols/ace/HTBP/HTBP_Filter.cpp b/protocols/ace/HTBP/HTBP_Filter.cpp index 2571199ef2d..2ac714b8904 100644 --- a/protocols/ace/HTBP/HTBP_Filter.cpp +++ b/protocols/ace/HTBP/HTBP_Filter.cpp @@ -1,4 +1,3 @@ -// ACE_HTBP_Filter.cpp // $Id$ #include "ace/Log_Msg.h" @@ -10,7 +9,9 @@ #include "HTBP_Filter.inl" #endif -ACE_RCSID(HTBP,ACE_HTBP_Filter,"$ID: $") +ACE_RCSID(HTBP,ACE_HTBP_Filter,"$Id$") + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE::HTBP::Filter::Filter (void) :http_code_ (0) @@ -52,3 +53,5 @@ ACE::HTBP::Filter::header_complete (ACE::HTBP::Channel *ch) } return 0; } + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/protocols/ace/HTBP/HTBP_Filter.h b/protocols/ace/HTBP/HTBP_Filter.h index 9548f377d1b..ebc9ebb895f 100644 --- a/protocols/ace/HTBP/HTBP_Filter.h +++ b/protocols/ace/HTBP/HTBP_Filter.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -21,6 +21,8 @@ #include "HTBP_Export.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + namespace ACE { namespace HTBP @@ -92,6 +94,8 @@ namespace ACE } } +ACE_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "HTBP_Filter.inl" #endif diff --git a/protocols/ace/HTBP/HTBP_Filter.inl b/protocols/ace/HTBP/HTBP_Filter.inl index 224b7e02699..c648393daa4 100644 --- a/protocols/ace/HTBP/HTBP_Filter.inl +++ b/protocols/ace/HTBP/HTBP_Filter.inl @@ -1,7 +1,8 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ -// ACE_HTBP_Filter.i +ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ssize_t @@ -58,3 +59,5 @@ ACE::HTBP::Filter::http_code (void) { return this->http_code_; } + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/protocols/ace/HTBP/HTBP_Filter_Factory.cpp b/protocols/ace/HTBP/HTBP_Filter_Factory.cpp index 8c42584d143..07b16ea9669 100644 --- a/protocols/ace/HTBP/HTBP_Filter_Factory.cpp +++ b/protocols/ace/HTBP/HTBP_Filter_Factory.cpp @@ -11,6 +11,8 @@ ACE_RCSID (ACE_HTBP_Filter_Factory, HTBP, "$Id$") +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + ACE::HTBP::Filter_Factory::Filter_Factory () { } @@ -39,6 +41,8 @@ ACE::HTBP::Filter_Factory::init (int /* argc */, return 0; } +ACE_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE (ACE_HTBP_Filter_Factory, ACE_TEXT ("Filter_Factory"), ACE_SVC_OBJ_T, @@ -55,3 +59,4 @@ template class ACE_Dynamic_Service; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Dynamic_Service #endif + diff --git a/protocols/ace/HTBP/HTBP_Filter_Factory.h b/protocols/ace/HTBP/HTBP_Filter_Factory.h index 84f32000664..0681055b679 100644 --- a/protocols/ace/HTBP/HTBP_Filter_Factory.h +++ b/protocols/ace/HTBP/HTBP_Filter_Factory.h @@ -24,6 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + namespace ACE { namespace HTBP @@ -57,6 +59,8 @@ namespace ACE } } +ACE_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (HTBP, ACE_HTBP_Filter_Factory) ACE_FACTORY_DECLARE (HTBP, ACE_HTBP_Filter_Factory) diff --git a/protocols/ace/HTBP/HTBP_ID_Requestor.cpp b/protocols/ace/HTBP/HTBP_ID_Requestor.cpp index 3c4b72e38fb..66d3ef7cd93 100644 --- a/protocols/ace/HTBP/HTBP_ID_Requestor.cpp +++ b/protocols/ace/HTBP/HTBP_ID_Requestor.cpp @@ -13,6 +13,8 @@ ACE_RCSID(HTBP, ACE_HTBP_ID_Requestor, "$Id$") +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_TString ACE::HTBP::ID_Requestor::htid_; ACE_SYNCH_MUTEX ACE::HTBP::ID_Requestor::htid_lock_; @@ -133,3 +135,5 @@ ACE::HTBP::ID_Requestor::get_HTID () } return htid; } + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/protocols/ace/HTBP/HTBP_ID_Requestor.h b/protocols/ace/HTBP/HTBP_ID_Requestor.h index e6cdd87fb1d..b885f07cae5 100644 --- a/protocols/ace/HTBP/HTBP_ID_Requestor.h +++ b/protocols/ace/HTBP/HTBP_ID_Requestor.h @@ -13,6 +13,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward declarations class ACE_SOCK_Stream; @@ -54,5 +56,8 @@ namespace ACE } } + +ACE_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* HTID_REQUESTOR_H */ diff --git a/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp index 4a75ac6ffc6..acb019ce2bb 100644 --- a/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp +++ b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp @@ -12,7 +12,9 @@ #include "HTBP_Inside_Squid_Filter.inl" #endif -ACE_RCSID(HTBP,ACE_HTBP_Inside_Squid_Filter,"$ID:$") +ACE_RCSID(HTBP,ACE_HTBP_Inside_Squid_Filter,"$Id$") + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL ssize_t ACE::HTBP::Inside_Squid_Filter::send_data_trailer (ACE::HTBP::Channel *ch) @@ -230,3 +232,5 @@ ACE::HTBP::Inside_Squid_Filter::recv_ack (ACE::HTBP::Channel *ch) errno = ch->consume_error () ? EINVAL : EWOULDBLOCK; return 0; } + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h index 142607aa49f..e60a682d81f 100644 --- a/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h +++ b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -21,6 +21,8 @@ #include "HTBP_Export.h" #include "HTBP_Filter.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + namespace ACE { namespace HTBP @@ -79,6 +81,8 @@ namespace ACE } } +ACE_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "HTBP_Inside_Squid_Filter.inl" #endif diff --git a/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl index d9c4618537e..e8b08950ce6 100644 --- a/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl +++ b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl @@ -1,9 +1,12 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ -// ACE_HTBP_Inside_Squid_Filter.i +ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE::HTBP::Inside_Squid_Filter::~Inside_Squid_Filter (void) { } + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/protocols/ace/HTBP/HTBP_Notifier.cpp b/protocols/ace/HTBP/HTBP_Notifier.cpp index 631ea2728b0..70a6df54023 100644 --- a/protocols/ace/HTBP/HTBP_Notifier.cpp +++ b/protocols/ace/HTBP/HTBP_Notifier.cpp @@ -14,6 +14,8 @@ #include "HTBP_Session.h" #include "ace/Reactor.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + ACE::HTBP::Notifier::Notifier (ACE::HTBP::Channel *s) : channel_(s) { @@ -80,3 +82,5 @@ ACE::HTBP::Notifier::get_handle(void) const { return this->channel_->ace_stream().get_handle(); } + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/protocols/ace/HTBP/HTBP_Notifier.h b/protocols/ace/HTBP/HTBP_Notifier.h index f0ef01b1f25..0c9dcffa2ed 100644 --- a/protocols/ace/HTBP/HTBP_Notifier.h +++ b/protocols/ace/HTBP/HTBP_Notifier.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -22,6 +22,8 @@ #include "HTBP_Export.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + namespace ACE { namespace HTBP @@ -46,5 +48,7 @@ namespace ACE } } +ACE_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ACE_HTBP_NOTIFIER_H */ diff --git a/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp index 3c035b8dcde..05e79083794 100644 --- a/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp +++ b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp @@ -14,6 +14,8 @@ ACE_RCSID(HTBP, ACE_HTBP_Outside_Squid_Filter, "$Id$") +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + ssize_t ACE::HTBP::Outside_Squid_Filter::recv_data_header (ACE::HTBP::Channel *ch) { @@ -190,3 +192,5 @@ ACE::HTBP::Outside_Squid_Filter::recv_ack (ACE::HTBP::Channel *) { return 1; } + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h index 5f0c820fccd..92008c3a8b6 100644 --- a/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h +++ b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h @@ -21,6 +21,8 @@ #include "HTBP_Export.h" #include "HTBP_Filter.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + namespace ACE { namespace HTBP @@ -74,6 +76,8 @@ namespace ACE } } +ACE_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "HTBP_Outside_Squid_Filter.inl" #endif diff --git a/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl index 351c6e53856..e0659ae5e13 100644 --- a/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl +++ b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl @@ -1,9 +1,12 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ -// ACE_HTBP_Outside_Squid_Filter.i +ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE::HTBP::Outside_Squid_Filter::~Outside_Squid_Filter (void) { } + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/protocols/ace/HTBP/HTBP_Session.cpp b/protocols/ace/HTBP/HTBP_Session.cpp index 930accaaf9f..113cf98d1d6 100644 --- a/protocols/ace/HTBP/HTBP_Session.cpp +++ b/protocols/ace/HTBP/HTBP_Session.cpp @@ -13,7 +13,9 @@ #include "HTBP_Session.inl" #endif -ACE_RCSID(HTBP,ACE_HTBP_Session," $") +ACE_RCSID(HTBP,HTBP_Session,"$Id$") + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE::HTBP::Session::Session_Map ACE::HTBP::Session::session_map_; ACE_UINT32 ACE::HTBP::Session::last_session_id_ = 0; @@ -299,3 +301,5 @@ template class ACE_Equal_To; #pragma instantiate ACE_Equal_To #endif + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/protocols/ace/HTBP/HTBP_Session.h b/protocols/ace/HTBP/HTBP_Session.h index 9c162849215..5b46c6e86b3 100644 --- a/protocols/ace/HTBP/HTBP_Session.h +++ b/protocols/ace/HTBP/HTBP_Session.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -29,6 +29,8 @@ #include "HTBP_Stream.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward declarations. class ACE_HTBP_Filter; class ACE_Event_Handler; @@ -185,6 +187,9 @@ namespace ACE }; } } + +ACE_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "HTBP_Session.inl" #endif diff --git a/protocols/ace/HTBP/HTBP_Session.inl b/protocols/ace/HTBP/HTBP_Session.inl index fb5c337826c..06c510650c9 100644 --- a/protocols/ace/HTBP/HTBP_Session.inl +++ b/protocols/ace/HTBP/HTBP_Session.inl @@ -1,6 +1,9 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE void ACE::HTBP::Session::reconnect () @@ -107,3 +110,5 @@ ACE::HTBP::Session_Id_t::operator ==(const ACE::HTBP::Session_Id_t &other) const (this->local_ == other.local_) && (this->peer_ == other.peer_)); } + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/protocols/ace/HTBP/HTBP_Stream.cpp b/protocols/ace/HTBP/HTBP_Stream.cpp index f351993369a..c0913569af0 100644 --- a/protocols/ace/HTBP/HTBP_Stream.cpp +++ b/protocols/ace/HTBP/HTBP_Stream.cpp @@ -16,6 +16,7 @@ #include "ace/Message_Block.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Initialization and termination methods. /// Constructor. @@ -322,5 +323,6 @@ ACE::HTBP::Stream::get_handle (void) const void ACE::HTBP::Stream::set_handle (ACE_HANDLE ) { - // no-op } + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/protocols/ace/HTBP/HTBP_Stream.h b/protocols/ace/HTBP/HTBP_Stream.h index e950939469e..0527ab06632 100644 --- a/protocols/ace/HTBP/HTBP_Stream.h +++ b/protocols/ace/HTBP/HTBP_Stream.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -26,6 +26,8 @@ #include "HTBP_Filter.h" #include "HTBP_Notifier.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + namespace ACE { namespace HTBP @@ -283,5 +285,7 @@ namespace ACE } } +ACE_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ACE_HTBP_STREAM_H */ diff --git a/tests/ACE_Init_Test.cpp b/tests/ACE_Init_Test.cpp index 64d77320e07..af56574d927 100644 --- a/tests/ACE_Init_Test.cpp +++ b/tests/ACE_Init_Test.cpp @@ -18,6 +18,8 @@ #include "test_config.h" +using namespace ACE_VERSIONED_NAMESPACE_NAME; + // If this is not a WIN32 platform do not even try to compile the // test, many of the #includes make little sense. int diff --git a/tests/Process_Strategy_Test.h b/tests/Process_Strategy_Test.h index de6586d5688..9278e37404a 100644 --- a/tests/Process_Strategy_Test.h +++ b/tests/Process_Strategy_Test.h @@ -30,9 +30,6 @@ #include "ace/Svc_Handler.h" #include "ace/Strategies_T.h" -// Forward decl. -class ACE_Thread_Manager; - class Counting_Service : public ACE_Svc_Handler // = TITLE // Reads and increments the count in a shared file. -- cgit v1.2.1