diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-16 07:53:25 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-16 07:53:25 +0000 |
| commit | c009335d5ced2ce650f4d2083e502ab768b6d241 (patch) | |
| tree | 4fe278fd231681ca52ddac52415209ebc4fbed82 | |
| parent | 9aab81ca34ca5360385ca3c118f373732cb21625 (diff) | |
| download | ATCD-c009335d5ced2ce650f4d2083e502ab768b6d241.tar.gz | |
ChangeLogTag:Tue Nov 15 23:48:47 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
177 files changed, 1028 insertions, 265 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 442099c5991..cbb47f5aedd 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,191 @@ +Tue Nov 15 23:48:47 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/Makefile.am: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp: + * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp: + + Removed empty files. + + + * orbsvcs/orbsvcs/ETCL/ETCL.ll: + * orbsvcs/orbsvcs/ETCL/ETCL.yy: + * orbsvcs/orbsvcs/ETCL/ETCL_l.cpp: + * orbsvcs/orbsvcs/ETCL/ETCL_y.cpp: + + Added missing versioned namespace macros. + + * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp: + * orbsvcs/orbsvcs/Property/CosPropertyService_i.h: + * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp: + * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h: + * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp: + * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h: + * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i: + * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp: + * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h: + * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h: + * orbsvcs/orbsvcs/SSLIOP/params_dup.c: + * orbsvcs/orbsvcs/SSLIOP/params_dup.h: + * orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp: + * orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h: + * orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp: + * orbsvcs/orbsvcs/Sched/Config_Scheduler.h: + * orbsvcs/orbsvcs/Sched/DynSched.cpp: + * orbsvcs/orbsvcs/Sched/DynSched.h: + * orbsvcs/orbsvcs/Sched/DynSched.i: + * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp: + * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h: + * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp: + * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h: + * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp: + * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h: + * orbsvcs/orbsvcs/Sched/SchedEntry.cpp: + * orbsvcs/orbsvcs/Sched/SchedEntry.h: + * orbsvcs/orbsvcs/Sched/SchedEntry.i: + * orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp: + * orbsvcs/orbsvcs/Sched/Scheduler_Generic.h: + * orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp: + * orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h: + * orbsvcs/orbsvcs/Security/CSI_Utils.cpp: + * orbsvcs/orbsvcs/Security/CSI_Utils.h: + * orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp: + * orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h: + * orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp: + * orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h: + * orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp: + * orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h: + * orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp: + * orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h: + * orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp: + * orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h: + * orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp: + * orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h: + * orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp: + * orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h: + * orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp: + * orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h: + * orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl: + * orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp: + * orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h: + * orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp: + * orbsvcs/orbsvcs/Security/SL3_SecurityManager.h: + * orbsvcs/orbsvcs/Security/Security_Current.cpp: + * orbsvcs/orbsvcs/Security/Security_Current.h: + * orbsvcs/orbsvcs/Security/Security_Current.inl: + * orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp: + * orbsvcs/orbsvcs/Security/Security_Current_Impl.h: + * orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp: + * orbsvcs/orbsvcs/Security/Security_ORBInitializer.h: + * orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp: + * orbsvcs/orbsvcs/Security/Security_PolicyFactory.h: + * orbsvcs/orbsvcs/Time/TAO_TIO.cpp: + * orbsvcs/orbsvcs/Time/TAO_TIO.h: + * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp: + * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h: + * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp: + * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h: + * orbsvcs/orbsvcs/Time/TAO_UTO.cpp: + * orbsvcs/orbsvcs/Time/TAO_UTO.h: + * orbsvcs/orbsvcs/Time/Timer_Helper.cpp: + * orbsvcs/orbsvcs/Time/Timer_Helper.h: + * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp: + * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h: + * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp: + * orbsvcs/orbsvcs/Trader/Constraint_Nodes.h: + * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp: + * orbsvcs/orbsvcs/Trader/Constraint_Visitors.h: + * orbsvcs/orbsvcs/Trader/Constraint_l.cpp: + * orbsvcs/orbsvcs/Trader/Constraint_y.cpp: + * orbsvcs/orbsvcs/Trader/Interpreter.cpp: + * orbsvcs/orbsvcs/Trader/Interpreter.h: + * orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp: + * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h: + * orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp: + * orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h: + * orbsvcs/orbsvcs/Trader/Locking.h: + * orbsvcs/orbsvcs/Trader/Offer_Database.cpp: + * orbsvcs/orbsvcs/Trader/Offer_Database.h: + * orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp: + * orbsvcs/orbsvcs/Trader/Offer_Iterators.h: + * orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp: + * orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h: + * orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp: + * orbsvcs/orbsvcs/Trader/Service_Type_Repository.h: + * orbsvcs/orbsvcs/Trader/Trader.cpp: + * orbsvcs/orbsvcs/Trader/Trader.h: + * orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp: + * orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h: + * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp: + * orbsvcs/orbsvcs/Trader/Trader_Interfaces.h: + * orbsvcs/orbsvcs/Trader/Trader_T.cpp: + * orbsvcs/orbsvcs/Trader/Trader_T.h: + * orbsvcs/orbsvcs/Trader/Trader_Utils.cpp: + * orbsvcs/orbsvcs/Trader/Trader_Utils.h: + * orbsvcs/orbsvcs/Trader/constraint.l: + * orbsvcs/orbsvcs/Trader/constraint.y: + + Added versioned namespace support. + Tue Nov 15 07:44:59 2005 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/tests/Bug_2285_Regression/Makefile.am: diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll b/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll index 7745930e2fd..bfbe15ddd2a 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll @@ -1,7 +1,7 @@ %option noyywrap %{ -// ETCL.ll,v 1.4 2005/11/10 06:47:23 ossama Exp +// ETCL.ll,v 1.5 2005/11/16 07:53:24 ossama Exp // ======================================================================== // // = LIBRARY @@ -16,11 +16,13 @@ // // ======================================================================== -#include "ace/OS_NS_stdlib.h" +#include "ace/OS.h" #include "ETCL_Constraint.h" #include "ETCL_y.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + static const char * extract_string(char*); #define TAO_YY_LEX_DEBUG @@ -155,3 +157,5 @@ yywrap (void) { return 1; } + +TAO_END_VERSIONED_NAMESPACE_DECL
\ No newline at end of file diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL.yy b/TAO/orbsvcs/orbsvcs/ETCL/ETCL.yy index ae9fd433bc7..14c9eaad182 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL.yy +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL.yy @@ -18,6 +18,8 @@ #include "ETCL_Constraint.h" #include "ETCL_Interpreter.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + extern int yylex (void); static void yyerror (const char *) @@ -256,3 +258,4 @@ union_val: /* empty */ %% +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp index 116d28f0c23..a3b00d9800c 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp @@ -20,7 +20,7 @@ #ifdef __cplusplus -#include "ace/OS_NS_stdlib.h" +#include "ace/OS.h" /* Use prototypes in function declarations. */ #define YY_USE_PROTOS @@ -464,6 +464,8 @@ char *yytext; #include "ETCL_Constraint.h" #include "ETCL_y.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + static const char* extract_string(char*); //static const char * extract_string(char*); @@ -1868,3 +1870,5 @@ yywrap (void) { return 1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp index 97d5b128d8d..923f6bccda0 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp @@ -70,6 +70,8 @@ #include "ETCL_Constraint.h" #include "ETCL_Interpreter.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + extern int yylex (void); extern void yyflush_current_buffer (void); @@ -1282,3 +1284,4 @@ yyerrhandle: //#line 257 "ETCL/ETCL.yy" +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index ef7249b7f8c..6238e2f61d2 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -4958,7 +4958,6 @@ libTAO_RTSched_la_SOURCES = \ Sched/Config_Scheduler.cpp \ Sched/DynSched.cpp \ Sched/Reconfig_Sched_Utils.cpp \ - Sched/Reconfig_Scheduler.cpp \ Sched/SchedEntry.cpp \ Sched/Scheduler.cpp \ Sched/Scheduler_Generic.cpp \ @@ -5621,11 +5620,9 @@ libTAO_SSLIOP_la_SOURCES = \ SSLIOP/SSLIOP_ORBInitializer.cpp \ SSLIOP/SSLIOP_OwnCredentials.cpp \ SSLIOP/SSLIOP_Profile.cpp \ - SSLIOP/SSLIOP_SSL.cpp \ SSLIOP/SSLIOP_TargetCredentials.cpp \ SSLIOP/SSLIOP_Transport.cpp \ SSLIOP/SSLIOP_Util.cpp \ - SSLIOP/SSLIOP_X509.cpp \ SSLIOP/params_dup.c \ SSLIOP/ssl_endpointsC.cpp \ SSLIOPC.cpp diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index 3f93bcf9a68..817d0726b4b 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -19,6 +19,8 @@ ACE_RCSID(Property, CosPropertyService_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // = Methods to deal with ACE_Hash_Map_Manager. CosProperty_Hash_Key::CosProperty_Hash_Key (void) @@ -1882,3 +1884,5 @@ TAO_PropertiesIterator::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); ACE_CHECK; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h index 33ee726d0ab..8e00a380251 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h @@ -33,6 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // = Classes to deal with the ACE_Hash_Map_Manager. class TAO_Property_Export CosProperty_Hash_Key @@ -608,6 +610,8 @@ private: // The iterator object. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp index 15df3752ffe..fe09552fce1 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -20,6 +20,8 @@ #include "tao/PortableInterceptorC.h" #include "tao/CodecFactory/CodecFactory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { @@ -518,3 +520,5 @@ ACE_THROW_SPEC ((CORBA::SystemException, #endif /* TAO_HAS_INTERCEPTORS == 1 */ } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h index 8ae82aaaba0..69ac688e910 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -38,6 +38,7 @@ #include "tao/CodecFactory/CodecFactory.h" #include "tao/RTCORBA/Linear_Priority_Mapping.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -203,6 +204,8 @@ class TAO_RTCosScheduling_Export RTCosScheduling_ClientScheduler_i : } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp index 5ef02463424..60d8e98aa33 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp @@ -20,6 +20,8 @@ #include "RTCosScheduling_PCP_Manager.i" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { CosSchedulingLockList::CosSchedulingLockList(CosSchedulingLockNode *lock_array, @@ -513,3 +515,5 @@ PCP_Manager_Factory::~PCP_Manager_Factory() } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h index 69d71d1420f..d9e25489d8e 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -37,6 +37,7 @@ #endif /* __BORLANDC__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -294,9 +295,10 @@ public: }; - } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "RTCosScheduling_PCP_Manager.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i index f6df426891f..15e9ced25a9 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -12,6 +12,8 @@ */ //============================================================================= +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * Returns a pointer to the node containing the highest ceiling (the * first node in the list of held locks) @@ -93,3 +95,4 @@ TAO::CosSchedulingLockNode::operator=(const CosSchedulingLockNode& L) return *this; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp index ae3558de793..df2f202397e 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp @@ -1,5 +1,3 @@ -/* -*- C++ -*- */ - //============================================================================= /** * @file RTCosScheduling_ServerScheduler_i.cpp @@ -25,6 +23,8 @@ #include "tao/RTPortableServer/RTPortableServer.h" #include "tao/CodecFactory/CodecFactory.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { RTCosScheduling_ServerScheduler_i:: @@ -762,3 +762,5 @@ RTCosScheduling_ServerScheduler_i::resources( } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h index 0b7b3ff657e..367471640fd 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -39,6 +39,7 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL #ifndef RTCOSSCHEDULING_SERVER_CONTAINERS #define RTCOSSCHEDULING_SERVER_CONTAINERS @@ -295,6 +296,8 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter< }; } +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "RTCosScheduling_ServerScheduler_i.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i index a8d071fc9fd..4bf50f13a5b 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -10,6 +10,9 @@ */ //============================================================================= + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE int ACE_Equal_To< COS_SCHEDULING_OBJECT_NAME_KEY >::operator () ( COS_SCHEDULING_OBJECT_NAME_KEY lhs, @@ -32,3 +35,5 @@ TAO::CosSchedulingInvocation_Hash_key::operator () ( { return static_cast<u_long> (key); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp index ea425123143..bdf0d871878 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp @@ -8,6 +8,8 @@ ACE_RCSID (SSLIOP, IIOP_SSL_Acceptor, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::IIOP_SSL_Acceptor::IIOP_SSL_Acceptor (CORBA::Boolean flag) : TAO_IIOP_Acceptor (flag), base_acceptor_ (), @@ -33,3 +35,5 @@ TAO::IIOP_SSL_Acceptor::close (void) { return this->base_acceptor_.close (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h index 4e1f3f2df8c..5b7efb1c74f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h @@ -26,6 +26,8 @@ #include "tao/IIOP_Acceptor.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { @@ -77,6 +79,8 @@ namespace TAO } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_IIOP_SSL_ACCEPTOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp index bd27221202e..c8c3d66531f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp @@ -18,7 +18,7 @@ ACE_RCSID (SSLIOP, #if defined (ACE_ENABLE_TIMEPROBES) -static const char *TAO_IIOP_SSL_Connect_Timeprobe_Description[] = +static const char * const TAO_IIOP_SSL_Connect_Timeprobe_Description[] = { "IIOP_SSL_Connection_Handler::handle_input - start", "IIOP_SSL_Connection_Handler::handle_input - end", @@ -50,6 +50,8 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_IIOP_SSL_Connect_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler ( ACE_Thread_Manager *t) : TAO_IIOP_Connection_Handler (t) @@ -68,15 +70,15 @@ TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler ( CORBA::Boolean /* flag */) : TAO_IIOP_Connection_Handler (orb_core, 0) { + // Delete the transport with TAO_IIOP_Connection_Handler. + delete this->transport (); + IIOP_SSL_Transport* specific_transport = 0; ACE_NEW (specific_transport, IIOP_SSL_Transport (this, orb_core, 0)); - // Delete the transport with TAO_IIOP_Connection_Handler. - delete this->transport (); - // store this pointer this->transport (specific_transport); } @@ -85,4 +87,4 @@ TAO::IIOP_SSL_Connection_Handler::~IIOP_SSL_Connection_Handler (void) { } -// **************************************************************** +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl index 0d8b95058be..7a0b3d4b320 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO::Null_SSL_State_Guard::Null_SSL_State_Guard ( TAO::SSLIOP::Current_ptr current, @@ -27,3 +29,5 @@ TAO::Null_SSL_State_Guard::~Null_SSL_State_Guard (void) this->current_->teardown (this->previous_current_impl_, this->setup_done_); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp index a8075b44aeb..d8bfb80dee0 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp @@ -18,6 +18,8 @@ ACE_RCSID (SSLIOP, IIOP_SSL_Connector, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::IIOP_SSL_Connector::IIOP_SSL_Connector (CORBA::Boolean flag) : TAO_IIOP_Connector (flag), connect_strategy_ (), @@ -282,3 +284,5 @@ TAO::IIOP_SSL_Connector::cancel_svc_handler ( return -1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h index 87b3f5b280c..722505eb16c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h @@ -26,6 +26,8 @@ #include "tao/IIOP_Connector.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /** @@ -95,6 +97,8 @@ namespace TAO } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_IIOP_SSL_CONNECTOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp index 9fa051b7821..a30defe3da7 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp @@ -12,6 +12,7 @@ ACE_RCSID (SSLIOP, IIOP_SSL_Transport, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::IIOP_SSL_Transport::IIOP_SSL_Transport ( IIOP_SSL_Connection_Handler *handler, @@ -49,3 +50,5 @@ TAO::IIOP_SSL_Transport::handle_input (TAO_Resume_Handle &rh, max_wait_time, block); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h index 1cd2555976b..d7cfcc1f9de 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h @@ -24,6 +24,7 @@ #include "tao/IIOP_Transport.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ORB_Core; class TAO_Resume_Handle; @@ -82,6 +83,8 @@ namespace TAO } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_IIOP_SSL_TRANSPORT_H */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp index b5f5607d416..17351b87747 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp @@ -5,6 +5,7 @@ ACE_RCSID (SSLIOP, SSLIOP_Accept_Strategy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SSLIOP::Accept_Strategy::Accept_Strategy ( TAO_ORB_Core * orb_core, @@ -58,3 +59,4 @@ TAO::SSLIOP::Accept_Strategy::accept_svc_handler (handler_type * svc_handler) return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h index 285376f4faa..a4a70efceff 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h @@ -30,6 +30,7 @@ #include "ace/SSL/SSL_SOCK_Acceptor.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -90,6 +91,7 @@ namespace TAO } // End SSLIOP namespace } // End TAO namespace +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp index 08ca12a06cf..822f7fea63a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp @@ -17,6 +17,8 @@ ACE_RCSID (SSLIOP, SSLIOP_Acceptor, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::SSLIOP::Acceptor::Acceptor (::Security::QOP qop, const ACE_Time_Value & timeout) : TAO::IIOP_SSL_Acceptor (), @@ -674,3 +676,5 @@ TAO::SSLIOP::Acceptor::verify_secure_configuration (TAO_ORB_Core *orb_core, return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h index 2c4e9afcf5c..0dfd1f147f5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h @@ -33,6 +33,8 @@ #include "orbsvcs/SSLIOPC.h" /* CSIv1 */ #include "orbsvcs/CSIIOPC.h" /* CSIv2 */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace SSLIOP @@ -43,7 +45,7 @@ namespace TAO * * @brief The SSLIOP-specific bridge class for the concrete acceptor. */ - class TAO_SSLIOP_Export Acceptor + class Acceptor : public IIOP_SSL_Acceptor { public: @@ -156,6 +158,8 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(__ACE_INLINE__) #include "SSLIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i index d37f85ba422..9dd630f54ef 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i @@ -3,8 +3,12 @@ // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE const SSLIOP::SSL & TAO::SSLIOP::Acceptor::ssl_component (void) const { return this->ssl_component_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp index d22485f2af1..629815c3147 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp @@ -9,6 +9,8 @@ ACE_RCSID (SSLIOP, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::SSLIOP::ClientCredentials::ClientCredentials ( X509 * cert, EVP_PKEY *evp, @@ -136,3 +138,5 @@ TAO::SSLIOP::ClientCredentials::integrity (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return true; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h index 5e030734636..ce621276918 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h @@ -35,6 +35,8 @@ #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace SSLIOP @@ -46,7 +48,7 @@ namespace TAO * * */ - class TAO_SSLIOP_Export ClientCredentials + class ClientCredentials : public virtual SecurityLevel3::ClientCredentials, public virtual SSLIOP_Credentials { @@ -140,6 +142,7 @@ namespace TAO } // End SSLIOP namespace } // End TAO namespace +TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp index 8d288191435..87197731cba 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp @@ -24,6 +24,8 @@ ACE_RCSID (SSLIOP, // **************************************************************** +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::SSLIOP::Connection_Handler::Connection_Handler ( ACE_Thread_Manager *t) : SVC_HANDLER (t, 0 , 0), @@ -440,3 +442,4 @@ TAO::SSLIOP::Connection_Handler::teardown_ssl_state ( setup_done); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h index 06ad1f2b0ae..36f58cdf26f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h @@ -31,6 +31,8 @@ #include "ace/Reactor.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_IIOP_Properties; namespace TAO @@ -187,6 +189,8 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "SSLIOP_Connection_Handler.i" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i index 0131b083abc..193fc62f426 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i @@ -2,6 +2,7 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::SSLIOP::State_Guard::State_Guard ( @@ -24,3 +25,5 @@ TAO::SSLIOP::State_Guard::~State_Guard (void) this->handler_->teardown_ssl_state (this->previous_current_impl_, this->setup_done_); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 7347aefe0b3..785c5c701ae 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -24,6 +24,8 @@ ACE_RCSID (SSLIOP, SSLIOP_Connector, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::SSLIOP::Connector::Connector (::Security::QOP qop) : TAO::IIOP_SSL_Connector (), qop_ (qop), @@ -856,3 +858,5 @@ TAO::SSLIOP::Connector::cancel_svc_handler ( return -1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h index dd4cfef6ec4..aefc3efc7f2 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h @@ -30,6 +30,8 @@ #include "ace/SSL/SSL_SOCK_Connector.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Forward declarations. class TAO_Base_Transport_Property; @@ -50,7 +52,7 @@ namespace TAO * for establishing a connection with a server and is called from * the Connector_Registry. */ - class TAO_SSLIOP_Export Connector : public TAO::IIOP_SSL_Connector + class Connector : public TAO::IIOP_SSL_Connector { public: @@ -153,6 +155,8 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_SSLIOP_CONNECTOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp index 2e70bec4633..e75990c0fab 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp @@ -14,6 +14,7 @@ ACE_RCSID (SSLIOP, # include "SSLIOP_Credentials.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SSLIOP_Credentials::SSLIOP_Credentials (::X509 *cert, ::EVP_PKEY *evp) : x509_ (TAO::SSLIOP::OpenSSL_traits< ::X509 >::_duplicate (cert)), @@ -263,3 +264,4 @@ tao_TAO_SSLIOP_Credentials_upcast (void *src) return *tmp; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h index 89b27c15a62..b8e40ab99f8 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h @@ -26,6 +26,9 @@ #include "orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { class SSLIOP_Credentials; @@ -169,6 +172,8 @@ namespace TAO // } // End SSLIOP namespace } // End TAO namespace +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "SSLIOP_Credentials.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl index 8c353c74cff..42970eb800f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE ::X509 * TAO::SSLIOP_Credentials::x509 (void) { @@ -15,3 +17,5 @@ TAO::SSLIOP_Credentials::evp (void) return TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::_duplicate (this->evp_.in ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp index 088255970f4..e3c6c3c2d38 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp @@ -21,12 +21,27 @@ ACE_RCSID (SSLIOP, // ------------------------------------------------------- +#if (defined (TAO_HAS_VERSIONED_NAMESPACE) \ + && TAO_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* + +# define TAO_SSLIOP_PASSWORD_CALLBACK_NAME ACE_PREPROC_CONCATENATE(TAO_VERSIONED_NAMESPACE_NAME, _TAO_SSLIOP_password_callback) + +#else + +# define TAO_SSLIOP_PASSWORD_CALLBACK_NAME TAO_SSLIOP_password_callback + +#endif /* TAO_HAS_VERSIONED_NAMESPACE == 1 */ + + extern "C" int -TAO_SSLIOP_password_callback (char *buf, - int size, - int /* rwflag */, - void *userdata) +TAO_SSLIOP_PASSWORD_CALLBACK_NAME (char *buf, + int size, + int /* rwflag */, + void *userdata) { // @@ I'm probably over complicating this implementation, but that's // what you get when you try to be overly efficient. :-) @@ -66,6 +81,8 @@ TAO_SSLIOP_password_callback (char *buf, // ------------------------------------------------------- +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::SSLIOP::CredentialsAcquirer::CredentialsAcquirer ( TAO::SL3::CredentialsCurator_ptr curator, const CORBA::Any & acquisition_arguments) @@ -286,7 +303,7 @@ TAO::SSLIOP::CredentialsAcquirer::make_X509 (const ::SSLIOP::File &certificate) // it to OpenSSL's internal X.509 format. x = PEM_read_X509 (fp, 0, - TAO_SSLIOP_password_callback, + TAO_SSLIOP_PASSWORD_CALLBACK_NAME, const_cast<char *> (password)); } @@ -364,7 +381,7 @@ TAO::SSLIOP::CredentialsAcquirer::make_EVP_PKEY (const ::SSLIOP::File &key) // OpenSSL's internal private key format. evp = PEM_read_PrivateKey (fp, 0, - TAO_SSLIOP_password_callback, + TAO_SSLIOP_PASSWORD_CALLBACK_NAME, const_cast<char *> (password)); } @@ -375,3 +392,5 @@ TAO::SSLIOP::CredentialsAcquirer::make_EVP_PKEY (const ::SSLIOP::File &key) return evp; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h index a77db17cf59..ced974209ef 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h @@ -44,6 +44,7 @@ extern "C" typedef struct evp_pkey_st EVP_PKEY; } +TAO_SSLIOP_PASSWORD_CALLBACK_NAME namespace TAO { @@ -142,6 +143,7 @@ namespace TAO } // End SSLIOP namespace } // End TAO namespace +TAO_END_PASSWORD_CALLBACK_NAME #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp index 1f5593c6108..4f86ddb3c6a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp @@ -9,6 +9,8 @@ ACE_RCSID (SSLIOP, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + SecurityLevel3::CredentialsAcquirer_ptr TAO::SSLIOP::CredentialsAcquirerFactory::make ( TAO::SL3::CredentialsCurator_ptr curator, @@ -24,3 +26,5 @@ TAO::SSLIOP::CredentialsAcquirerFactory::make ( return ca; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h index 6918b068b0d..dcc44e36919 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h @@ -27,6 +27,8 @@ #include "orbsvcs/SecurityLevel3C.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace SSLIOP @@ -56,6 +58,7 @@ namespace TAO } // End SSLIOP namespace } // End TAO namespace +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp index bf352552e64..4e4de7a7b5a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp @@ -11,6 +11,7 @@ ACE_RCSID (SSLIOP, # include "SSLIOP_Current.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SSLIOP::Current::Current (TAO_ORB_Core *orb_core) : tss_slot_ (0), @@ -193,3 +194,4 @@ tao_TAO_SSLIOP_Current_upcast ( return *tmp; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h index a71b824b845..0c20e111f05 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h @@ -34,6 +34,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -53,7 +54,7 @@ namespace TAO * SSL peer certificate chains for the current request can be * obtained from this object. */ - class TAO_SSLIOP_Export Current + class Current : public ::SSLIOP::Current, public TAO_Local_RefCounted_Object { @@ -141,24 +142,26 @@ namespace TAO /// Prevent copying through the copy constructor and the assignment /// operator. //@{ - ACE_UNIMPLEMENTED_FUNC (Current (const Current &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const Current &)) + Current (const Current &); + void operator= (const Current &); //@} private: /// TSS slot assigned to this object. - size_t tss_slot_; + size_t const tss_slot_; /// Pointer to the ORB Core corresponding to the ORB with which this /// object is registered. - TAO_ORB_Core *orb_core_; + TAO_ORB_Core * const orb_core_; }; } // End SSLIOP namespace. } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "SSLIOP_Current.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl index cef3feb365c..1584b919606 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE void TAO::SSLIOP::Current::tss_slot (size_t slot) { @@ -34,3 +36,5 @@ TAO::SSLIOP::Current::implementation (void) return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp index 6ee7a07cffe..5104357895c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp @@ -17,6 +17,7 @@ ACE_RCSID (SSLIOP, #include <openssl/x509.h> +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SSLIOP::Current_Impl::~Current_Impl (void) { @@ -121,3 +122,5 @@ TAO::SSLIOP::Current_Impl::tag (void) const { return ::SSLIOP::TAG_SSL_SEC_TRANS; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h index 5502393a62b..bb28f0d1596 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h @@ -23,10 +23,11 @@ #include "orbsvcs/SSLIOPC.h" #include "orbsvcs/Security/SL3_SecurityCurrent_Impl.h" -#include "tao/ORB_Core.h" #include <openssl/ssl.h> +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace SSLIOP @@ -101,6 +102,8 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) # include "SSLIOP_Current_Impl.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl index 73f2e9a988b..d1f4b91ee81 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl @@ -3,6 +3,8 @@ // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO::SSLIOP::Current_Impl::Current_Impl (void) : ssl_ (0) @@ -20,3 +22,5 @@ TAO::SSLIOP::Current_Impl::ssl (void) { return this->ssl_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp index 9ed92d48a82..bd0af0c207e 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp @@ -14,6 +14,8 @@ ACE_RCSID (SSLIOP, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ::EVP_PKEY * TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key) { @@ -71,3 +73,4 @@ TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key) return p._retn (); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h index 903828b73d5..2dea793edc5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h @@ -26,6 +26,7 @@ #include <openssl/evp.h> #include <openssl/crypto.h> +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -71,6 +72,7 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp index 68a0492e95d..a10bb155e93 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp @@ -17,6 +17,8 @@ ACE_RCSID (SSLIOP, # include "SSLIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_SSLIOP_Endpoint::TAO_SSLIOP_Endpoint (const ::SSLIOP::SSL *ssl_component, TAO_IIOP_Endpoint *iiop_endp) : TAO_Endpoint (IOP::TAG_INTERNET_IOP), @@ -377,3 +379,4 @@ TAO_SSLIOP_Synthetic_Endpoint::duplicate (void) return endpoint; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h index a250f7424fd..d1ba9e7086d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h @@ -32,6 +32,8 @@ #include "tao/IIOP_Endpoint.h" #include "ace/INET_Addr.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { /// Tag for storing multiple ssl endpoints within a single profile. @@ -243,6 +245,8 @@ namespace TAO // } // End SSLIOP namespace. // } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "SSLIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i index 9b9f9e4d585..9ea9beb96b6 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i @@ -3,6 +3,8 @@ // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE TAO_IIOP_Endpoint * TAO_SSLIOP_Endpoint::iiop_endpoint (void) const { @@ -64,3 +66,5 @@ TAO_SSLIOP_Endpoint::credentials_set (void) const { return this->credentials_set_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index 646b14fc991..82cf4db9108 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -23,16 +23,18 @@ static const unsigned char session_id_context_[] = "$Id$"; // Protocol name prefix -static const char *prefix_[] = {"iiop", "ssliop"}; +static const char * const the_prefix[] = {"iiop", "ssliop"}; // An OS-dependent path separator character -static const char *TAO_PATH_SEPARATOR_STRING = +static ACE_TCHAR const TAO_PATH_SEPARATOR_STRING[] = #if defined(ACE_WIN32) ACE_TEXT (";"); #else ACE_TEXT (":"); #endif +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace SSLIOP @@ -57,8 +59,8 @@ int TAO::SSLIOP::Protocol_Factory::match_prefix (const ACE_CString &prefix) { // Check for the proper prefix for this protocol. - return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_[0]) == 0) - || (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_[1]) == 0); + return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix[0]) == 0) + || (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix[1]) == 0); } const char * @@ -68,7 +70,7 @@ TAO::SSLIOP::Protocol_Factory::prefix (void) const // keeping it may make things more confusing - a Factory can // well be handling multiple protocol prefixes, not just one! // Shouldn't it be deprecated? - return ::prefix_[0]; + return ::the_prefix[0]; } char @@ -95,10 +97,10 @@ TAO::SSLIOP::Protocol_Factory::make_acceptor (void) // the buffer pointed to by arg! int TAO::SSLIOP::Protocol_Factory::parse_x509_file (char *arg, - char **path) + char **path) { - ACE_ASSERT (arg!= 0); - ACE_ASSERT (path!= 0); + ACE_ASSERT (arg != 0); + ACE_ASSERT (path != 0); char *lst = 0; const char *type_name = ACE_OS::strtok_r (arg, ":", &lst); @@ -599,6 +601,7 @@ TAO::SSLIOP::Protocol_Factory::requires_explicit_endpoint (void) const return 0; } +TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE (TAO_SSLIOP_Protocol_Factory, ACE_TEXT ("SSLIOP_Factory"), diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h index d4b989d0a0a..b32a9d67050 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h @@ -33,10 +33,11 @@ #include "ace/Service_Config.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Acceptor; class TAO_Connector; - namespace TAO { namespace SSLIOP @@ -120,7 +121,7 @@ namespace TAO * mechanism list of the @c CSIIOP::CompoundSecMechList IOR tagged * component. */ - CSIIOP::TLS_SEC_TRANS * csiv2_component_; + // CSIIOP::TLS_SEC_TRANS * csiv2_component_; }; } // End SSLIOP namespace. @@ -129,6 +130,8 @@ namespace TAO // Work around preprocessor tokenization. typedef TAO::SSLIOP::Protocol_Factory TAO_SSLIOP_Protocol_Factory; +TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_SSLIOP, TAO_SSLIOP_Protocol_Factory) ACE_STATIC_SVC_REQUIRE (TAO_SSLIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_SSLIOP, TAO_SSLIOP_Protocol_Factory) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp index 63d4e4a2b95..669fc6b08bc 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp @@ -10,6 +10,8 @@ ACE_RCSID (SSLIOP, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::SSLIOP::Server_Invocation_Interceptor::Server_Invocation_Interceptor ( ::SSLIOP::Current_ptr current, ::Security::QOP qop) @@ -84,7 +86,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts ( X509 *peer = ::d2i_X509 (0, &der_cert, cert->length ()); if (peer != 0) { - char buf[BUFSIZ]; + char buf[BUFSIZ] = { 0 }; ::X509_NAME_oneline (::X509_get_subject_name (peer), buf, @@ -160,3 +162,5 @@ TAO::SSLIOP::Server_Invocation_Interceptor::send_other ( PortableInterceptor::ForwardRequest)) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h index b5c4ef41f70..d0eef730127 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h @@ -34,6 +34,8 @@ #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace SSLIOP @@ -47,7 +49,7 @@ namespace TAO * invocations if the effective target object policy requires * secure invocations. */ - class TAO_SSLIOP_Export Server_Invocation_Interceptor + class Server_Invocation_Interceptor : public virtual PortableInterceptor::ServerRequestInterceptor, public virtual TAO_Local_RefCounted_Object { @@ -135,6 +137,8 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp index 52b1317b28e..97bf03157b5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp @@ -24,6 +24,8 @@ ACE_RCSID (SSLIOP, #include "ace/Auto_Ptr.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::SSLIOP::ORBInitializer::ORBInitializer ( ::Security::QOP qop, CSIIOP::AssociationOptions csiv2_target_supports, @@ -243,3 +245,4 @@ TAO::SSLIOP::ORBInitializer::get_tss_slot_id ( return security_current->tss_slot (); } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h index 6c180b4c107..12180c7aaa3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h @@ -35,6 +35,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace SSLIOP @@ -47,9 +49,9 @@ namespace TAO * ORB initializer that registers all SSLIOP-specific interceptors and * object references. */ - class TAO_SSLIOP_Export ORBInitializer : - public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + class ORBInitializer + : public virtual PortableInterceptor::ORBInitializer, + public virtual TAO_Local_RefCounted_Object { public: @@ -87,6 +89,8 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp index 0bf1723c320..970d2201160 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp @@ -10,11 +10,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_RCSID (SSLIOP, - SSLIOP_OpenSSL_st_T, - "$Id$") - - #if !defined (__ACE_INLINE__) #include "SSLIOP_OpenSSL_st_T.inl" #endif /* !__ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h index d08140d244e..f1ddb054e8b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h @@ -21,6 +21,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -116,6 +117,8 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "SSLIOP_OpenSSL_st_T.inl" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl index 51b9e46a102..0233a73fc01 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl @@ -5,6 +5,7 @@ #include <openssl/crypto.h> +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename T> ACE_INLINE T * TAO::SSLIOP::_duplicate (T * st) @@ -160,3 +161,5 @@ TAO::SSLIOP::OpenSSL_st_var<T>::ptr (void) const { return this->st_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp index e0b181fc1a2..8817457d263 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp @@ -8,6 +8,8 @@ ACE_RCSID (SSLIOP, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::SSLIOP::OwnCredentials::OwnCredentials (X509 *cert, EVP_PKEY *evp) : SSLIOP_Credentials (cert, evp) { @@ -72,3 +74,4 @@ TAO::SSLIOP::OwnCredentials::release_credentials ( this->creds_state_ = SecurityLevel3::CS_PendingRelease; } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h index 1b8f6dc3fe8..46642bc3a4a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h @@ -29,6 +29,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace SSLIOP @@ -47,7 +49,7 @@ namespace TAO * @c OwnCredentials are a representation of our identity, not our * peer's identity. */ - class TAO_SSLIOP_Export OwnCredentials + class OwnCredentials : public virtual SecurityLevel3::OwnCredentials, public virtual SSLIOP_Credentials { @@ -106,6 +108,8 @@ namespace TAO } // End TAO namespace +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp index 4e9e5b43590..cdb965396d0 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp @@ -9,6 +9,9 @@ ACE_RCSID (SSLIOP, SSLIOP_Profile, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (const ACE_INET_Addr & addr, const TAO::ObjectKey & object_key, const TAO_GIOP_Message_Version & version, @@ -350,3 +353,5 @@ TAO_SSLIOP_Profile::parse_string (const char * ior Security::NoProtection); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h index 6dab11bcab0..033ca4c2c4c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h @@ -28,6 +28,8 @@ #include "SSLIOP_Endpoint.h" #include "tao/IIOP_Profile.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // namespace TAO // { // namespace SSLIOP @@ -43,7 +45,7 @@ * This class extends TAO_IIOP_Profile to support secure * communication using SSL. */ - class TAO_SSLIOP_Export TAO_SSLIOP_Profile : public TAO_IIOP_Profile + class TAO_SSLIOP_Profile : public TAO_IIOP_Profile { public: /// Profile constructor, same as above except the object_key has @@ -170,6 +172,7 @@ // } // End SSLIOP namespace. // } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.cpp deleted file mode 100644 index 69c8af5bcea..00000000000 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.cpp +++ /dev/null @@ -1,9 +0,0 @@ -// $Id$ - -#include "SSLIOP_SSL.h" - - -ACE_RCSID (SSLIOP, - SSLIOP_SSL, - "$Id$") - diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h index b8e013b6f71..94e9d595f59 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h @@ -29,6 +29,8 @@ #include <openssl/crypto.h> +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace SSLIOP @@ -76,6 +78,7 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp index dac7198565b..ec54af02bf8 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp @@ -6,6 +6,7 @@ ACE_RCSID (SSLIOP, SSLIOP_TargetCredentials, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SSLIOP::TargetCredentials::TargetCredentials (::X509 *cert, ::EVP_PKEY *evp) @@ -130,3 +131,5 @@ TAO::SSLIOP::TargetCredentials::release (ACE_ENV_SINGLE_ARG_DECL) { ACE_THROW (CORBA::NO_IMPLEMENT ()); } + +TAO_ENDBEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h index 98b4a75ec87..826ff3da7ba 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h @@ -23,6 +23,8 @@ #include "SSLIOP_Credentials.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace SSLIOP @@ -120,6 +122,8 @@ namespace TAO } } +TAO_ENDBEGIN_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_SSLIOP_TARGET_CREDENTIALS_H */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp index f91dde34130..3c3bf3cf4be 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp @@ -20,6 +20,8 @@ ACE_RCSID (SSLIOP, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::SSLIOP::Transport::Transport ( TAO::SSLIOP::Connection_Handler *handler, TAO_ORB_Core *orb_core, @@ -378,3 +380,5 @@ TAO::SSLIOP::Transport::get_listen_point ( return 1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h index 67ff72eaac9..95579367c78 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h @@ -35,6 +35,9 @@ #include "ace/Svc_Handler.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward decls. class TAO_ORB_Core; class TAO_Pluggable_Messaging; @@ -56,7 +59,7 @@ namespace TAO * * SSLIOP-specific transport implementation. */ - class TAO_SSLIOP_Export Transport : public TAO_Transport + class Transport : public TAO_Transport { public: @@ -150,5 +153,7 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_SSLIOP_TRANSPORT_H */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp index 29c06c74f1c..9aa0756e081 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp @@ -13,6 +13,8 @@ ACE_RCSID (SSLIOP, #include "tao/debug.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::SSLIOP::Current_ptr TAO::SSLIOP::Util::current ( TAO_ORB_Core *orb_core) @@ -52,3 +54,5 @@ TAO::SSLIOP::Util::current ( return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h index efe5dc406b1..aec7af349c8 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h @@ -26,6 +26,9 @@ #include "SSLIOP_Current.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_ORB_Core; class TAO_IIOP_Properties; @@ -55,6 +58,7 @@ namespace TAO } // End SSLIOP namespace. } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp deleted file mode 100644 index 3c6bb2755e7..00000000000 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "SSLIOP_X509.h" - - -ACE_RCSID (SSLIOP, - SSLIOP_X509, - "$Id$") - diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h index 6937053169b..def6d0bfa62 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h @@ -27,6 +27,8 @@ #include <openssl/crypto.h> +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace SSLIOP @@ -75,6 +77,8 @@ namespace TAO } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_SSLIOP_X509_H */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c index e340018a65a..6199894cab0 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c @@ -6,13 +6,14 @@ DSA * -DSAparams_dup_wrapper (DSA *dsa) +DSAPARAMS_DUP_WRAPPER_NAME (DSA *dsa) { return DSAparams_dup (dsa); } DH * -DHparams_dup_wrapper (DH *dh) +DHPARAMS_DUP_WRAPPER_NAME (DH *dh) { return DHparams_dup (dh); } + diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h index ea9b5409325..07b382db8ba 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h @@ -10,6 +10,23 @@ #include <openssl/dsa.h> #include <openssl/dh.h> +#if (defined (TAO_HAS_VERSIONED_NAMESPACE) \ + && TAO_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* + +# define DSAPARAMS_DUP_WRAPPER_NAME ACE_PREPROC_CONCATENATE(TAO_VERSIONED_NAMESPACE_NAME, _DSAparams_dup_wrapper) +# define DHPARAMS_DUP_WRAPPER_NAME ACE_PREPROC_CONCATENATE(TAO_VERSIONED_NAMESPACE_NAME, _DHparams_dup_wrapper) + +#else + +# define DSAPARAMS_DUP_WRAPPER_NAME DSAparams_dup_wrapper +# define DHPARAMS_DUP_WRAPPER_NAME DHparams_dup_wrapper + +#endif /* ACE_HAS_VERSIONED_NAMESPACE == 1 */ + + #ifdef __cplusplus extern "C" { #endif diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp index 327f9d92c1c..14cc75ef1fb 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp @@ -41,6 +41,8 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -207,3 +209,5 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_TAO_SSLEndpointSequence_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h index dd81bd66c6f..e08b44538af 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h @@ -63,6 +63,8 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -139,6 +141,8 @@ TAO_SSLIOP_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_TAO_SSLEndpointSequence_H_ */ +TAO_END_VERSIONED_NAMESPACE_DECL + // TAO_IDL - Generated from // be\be_codegen.cpp:955 diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index 01bbb250f5c..d98076e17a1 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -11,6 +11,8 @@ ACE_RCSID(Sched, Config_Scheduler, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_Config_Scheduler::ACE_Config_Scheduler (void) #if defined (TAO_USES_STRATEGY_SCHEDULER) : scheduler_strategy_ (static_cast<RtecScheduler::Preemption_Priority_t> (TAO_MIN_CRITICAL_PRIORITY)) @@ -668,3 +670,5 @@ void ACE_Config_Scheduler::get_config_info_set (RtecScheduler::Config_Info_Set_o { ACE_THROW (CORBA::NO_IMPLEMENT ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h index 084a36a33f2..aea4c970803 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + // $Id$ #ifndef ACE_CONFIG_SCHEDULER_H @@ -22,6 +24,8 @@ #include "orbsvcs/Sched/Scheduler_Generic.h" #endif /* defined (TAO_USES_STRATEGY_SCHEDULER) */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_RTSched_Export ACE_Config_Scheduler : public POA_RtecScheduler::Scheduler // = TITLE @@ -307,15 +311,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_SCHEDULER_H */ - - - - - - - - - diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp index 0a657a7ffba..0e3de992a7f 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp @@ -28,6 +28,8 @@ ACE_RCSID(Sched, DynSched, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ////////////////////// // Helper functions // ////////////////////// @@ -2417,3 +2419,5 @@ ACE_DynScheduler::output_timeline (const char *filename, const char *heading) return status; } // this prints the entire set of timeline outputs to the specified file + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h index b8278aae6d5..a65ffb688ca 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // // ============================================================================ @@ -34,6 +35,9 @@ #include "sched_export.h" #include "ace/Recursive_Thread_Mutex.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_RTSched_Export ACE_DynScheduler // = TITLE // Dispatch scheduling interface. @@ -528,6 +532,8 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "DynSched.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.i b/TAO/orbsvcs/orbsvcs/Sched/DynSched.i index 3eb2a3c0bda..8e27d24c28e 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.i +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.i @@ -1,3 +1,5 @@ +// -*- C++ -*- + // $Id$ // // ============================================================================ @@ -16,6 +18,7 @@ // // ============================================================================ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL //////////////////////////// // Class ACE_DynScheduler // @@ -107,5 +110,4 @@ ACE_DynScheduler::max_dispatch_id () const return max_dispatch_id_; } - -// EOF +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp index dac7ca3cd56..271069bbc73 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp @@ -27,6 +27,8 @@ ACE_RCSID (Sched, Reconfig_Sched_Utils, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /////////////////////////// // struct TAO_RT_Info_Ex // /////////////////////////// @@ -1802,3 +1804,5 @@ TAO_RMS_MLF_Reconfig_Sched_Strategy::assign_config (RtecScheduler::Config_Info & #endif /* TAO_RECONFIG_SCHED_UTILS_C */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h index f7e0ae3967c..15cb0468d37 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -32,6 +33,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + struct TAO_RTSched_Export TAO_RT_Info_Ex : public RtecScheduler::RT_Info // = TITLE @@ -657,6 +660,8 @@ public: // on the operation characteristics of a representative scheduling entry. }; +TAO_END_VERSIONED_NAMESPACE_DECL + // Include the templates here. #include "Reconfig_Sched_Utils_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp index 8f8e5497ece..8f537287407 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp @@ -15,8 +15,8 @@ // // ============================================================================ -#ifndef TAO_RECONFIG_SCHED_UTILS_T_C -#define TAO_RECONFIG_SCHED_UTILS_T_C +#ifndef TAO_RECONFIG_SCHED_UTILS_T_CPP +#define TAO_RECONFIG_SCHED_UTILS_T_CPP #include "Reconfig_Sched_Utils_T.h" #include "ace/Sched_Params.h" @@ -26,7 +26,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_RCSID(Sched, Reconfig_Sched_Utils_T, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL //////////////////////////////// // TAO_RSE_Dependency_Visitor // @@ -168,19 +168,18 @@ visit (TAO_Reconfig_Scheduler_Entry &rse) return 0; } -/* WSOA merge - commented out -// Performs an unconditional action when the entry is first reached. -// Returns 0 for success, and -1 if an error occurred. - -template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int -TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -unconditional_action (TAO_Reconfig_Scheduler_Entry &rse) -{ - // Default behavior: just return success. - ACE_UNUSED_ARG (rse); - return 0; -} -*/ +// WSOA merge - commented out +// // Performs an unconditional action when the entry is first reached. +// // Returns 0 for success, and -1 if an error occurred. + +// template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int +// TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: +// unconditional_action (TAO_Reconfig_Scheduler_Entry & /* rse */) +// { +// // Default behavior: just return success. +// return 0; +// } +// // Tests whether or not any conditional actions should be taken for // the entry. Returns 0 if the actions should be applied, 1 if the @@ -202,10 +201,9 @@ precondition (TAO_Reconfig_Scheduler_Entry &rse) template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -prefix_action (TAO_Reconfig_Scheduler_Entry &rse) +prefix_action (TAO_Reconfig_Scheduler_Entry & /* rse */) { // Default behavior: just return success. - ACE_UNUSED_ARG (rse); return 0; } @@ -215,14 +213,11 @@ prefix_action (TAO_Reconfig_Scheduler_Entry &rse) template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, - TAO_Reconfig_Scheduler_Entry &successor, - const RtecScheduler::Dependency_Info &di) +pre_recurse_action (TAO_Reconfig_Scheduler_Entry & /* entry */, + TAO_Reconfig_Scheduler_Entry & /* successor */, + const RtecScheduler::Dependency_Info & /* di */) { // Default behavior: just return success. - ACE_UNUSED_ARG (entry); - ACE_UNUSED_ARG (successor); - ACE_UNUSED_ARG (di); return 0; } @@ -232,10 +227,9 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -postfix_action (TAO_Reconfig_Scheduler_Entry &rse) +postfix_action (TAO_Reconfig_Scheduler_Entry & /* rse */) { // Default behavior: just return success. - ACE_UNUSED_ARG (rse); return 0; } @@ -297,13 +291,10 @@ prefix_action (TAO_Reconfig_Scheduler_Entry &rse) template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_DFS_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, - TAO_Reconfig_Scheduler_Entry &successor, - const RtecScheduler::Dependency_Info &di) +pre_recurse_action (TAO_Reconfig_Scheduler_Entry & /* entry */, + TAO_Reconfig_Scheduler_Entry & successor, + const RtecScheduler::Dependency_Info & /* di */) { - ACE_UNUSED_ARG (entry); - ACE_UNUSED_ARG (di); - // Enabled operations we reached via a dependency and that do not // specify a period are not thread delineators. if (successor.enabled_state () != RtecScheduler::RT_INFO_DISABLED @@ -445,10 +436,8 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, TAO_Reconfig_Scheduler_Entry &successor, - const RtecScheduler::Dependency_Info &di) + const RtecScheduler::Dependency_Info & /* di */) { - ACE_UNUSED_ARG (di); - if (successor.enabled_state () != RtecScheduler::RT_INFO_DISABLED && successor.rev_dfs_status () == @@ -504,10 +493,8 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_Reverse_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, TAO_Reconfig_Scheduler_Entry &successor, - const RtecScheduler::Dependency_Info &di) + const RtecScheduler::Dependency_Info & /* di */) { - ACE_UNUSED_ARG (di); - // @TODO - check for conjunction nodes here and perform conjunctive // function on existing rate tuples. Idea: treat conjunctive tuples // as skolem functions over the possible rates of their incedent @@ -697,14 +684,13 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_Forward_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, TAO_Reconfig_Scheduler_Entry &successor, - const RtecScheduler::Dependency_Info &di) + const RtecScheduler::Dependency_Info & /* di */) { if (successor.enabled_state () == RtecScheduler::RT_INFO_DISABLED) { return 1; } - ACE_UNUSED_ARG (di); TAO_RT_Info_Tuple **tuple_ptr_ptr; TUPLE_SET_ITERATOR orig_tuple_iter (entry.orig_tuple_subset ()); @@ -1060,10 +1046,8 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_Criticality_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, TAO_Reconfig_Scheduler_Entry &successor, - const RtecScheduler::Dependency_Info &di) + const RtecScheduler::Dependency_Info & /* di */) { - ACE_UNUSED_ARG (di); - #ifdef SCHEDULER_LOGGING ACE_DEBUG ((LM_DEBUG, "Crit Prop_Visitor visiting %s[%d], successor is %s[%d]\n", @@ -1098,4 +1082,4 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, } -#endif /* TAO_RECONFIG_SCHED_UTILS_T_C */ +#endif /* TAO_RECONFIG_SCHED_UTILS_T_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h index a63f3dba239..af2ce071f89 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ @@ -26,6 +27,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ////////////////////////////////////////// // Reconfig Sched Entry Visitor classes // ////////////////////////////////////////// @@ -473,6 +476,8 @@ protected: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Reconfig_Sched_Utils_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp deleted file mode 100644 index 9422209f27c..00000000000 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// ============================================================================ -// -// $Id$ -// -// ============================================================================ -// -// = LIBRARY -// orbsvcs -// -// = FILENAME -// Reconfig_Scheduler.cpp -// -// = AUTHOR -// Chris Gill <cdgill@cs.wustl.edu> -// -// ============================================================================ - -#ifndef TAO_RECONFIG_SCHEDULER_C -#define TAO_RECONFIG_SCHEDULER_C - -#include "Reconfig_Scheduler_T.h" -#include "Reconfig_Scheduler.h" - - -ACE_RCSID(Sched, Reconfig_Scheduler, "$Id$") - -#endif /* TAO_RECONFIG_SCHEDULER_C */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index 499b2d04518..0bd5ac9febf 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -30,7 +30,7 @@ //#define SCHEDULER_LOGGING 1 //#endif -ACE_RCSID(Sched, Reconfig_Scheduler_T, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL ////////////////////////////////////////////// // Helper function type definition for sort // @@ -1294,8 +1294,8 @@ compute_scheduling (CORBA::Long minimum_priority, template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -recompute_scheduling (CORBA::Long minimum_priority, - CORBA::Long maximum_priority, +recompute_scheduling (CORBA::Long /* minimum_priority */, + CORBA::Long /* maximum_priority */, RtecScheduler::Scheduling_Anomaly_Set_out anomalies ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, @@ -1316,8 +1316,8 @@ recompute_scheduling (CORBA::Long minimum_priority, ACE_CHECK; // @@ TO DO - use these to establish the bounds of priority assignment. - ACE_UNUSED_ARG (minimum_priority); - ACE_UNUSED_ARG (maximum_priority); + // minimum_priority + // maximum_priority // If everything is already up to date, we're done. if (SCHED_ALL_STABLE == stability_flags_) @@ -3153,5 +3153,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::init_rt_info (RtecSch */ +TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_RECONFIG_SCHEDULER_T_C */ + diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h index c8b82223a21..44101a29878 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // ============================================================================ // @@ -25,6 +26,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> class TAO_Reconfig_Scheduler : public POA_RtecScheduler::Scheduler @@ -759,6 +762,8 @@ maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array, // arrays. This function expands the array eagerly, to minimize time // overhead for memory allocation (at a cost of some unused space). +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Reconfig_Scheduler_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp index ea7a1da14bb..852504b93f7 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp @@ -26,6 +26,8 @@ ACE_RCSID(Sched, SchedEntry, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + Task_Entry::Task_Entry (void) : rt_info_ (0), effective_period_(0), @@ -932,3 +934,5 @@ TimeLine_Entry::TimeLine_Entry (Dispatch_Entry &dispatch_entry, prev_ (prev) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h index 87cf62c1668..6eeedffd7d8 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // // ============================================================================ @@ -26,6 +27,8 @@ #include "orbsvcs/Event_Service_Constants.h" #include "ace/Containers.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ////////////////////// // Helper Functions // ////////////////////// @@ -633,6 +636,7 @@ private: }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "SchedEntry.i" diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i index f133d00e95f..13f00111d67 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // // ============================================================================ @@ -17,6 +18,8 @@ // // ============================================================================ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ////////////////////// // Class Task_Entry // ////////////////////// @@ -437,6 +440,8 @@ TimeLine_Entry_Link::entry () const ACE_INLINE bool TimeLine_Entry_Link::operator < (const TimeLine_Entry_Link &l) const { - return (entry_ < l.entry_) ? true : false; + return (entry_ < l.entry_); } // comparison operator + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp index 4d5cfdd4623..b81bc443a06 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp @@ -23,6 +23,8 @@ ACE_RCSID(Sched, Scheduler_Generic, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// // static functions @@ -214,11 +216,9 @@ Scheduler_Generic::init (const int minimum_priority, Scheduler::status_t -Scheduler_Generic::schedule (ACE_Unbounded_Set<Scheduling_Anomaly *> - &anomaly_set) +Scheduler_Generic::schedule (ACE_Unbounded_Set<Scheduling_Anomaly *> & + /* anomaly_set */) { - ACE_UNUSED_ARG (anomaly_set); - ACE_GUARD_RETURN (LOCK, ace_mon, lock_, ACE_Scheduler::FAILED); // here goes . . . @@ -240,15 +240,12 @@ Scheduler_Generic::schedule (ACE_Unbounded_Set<Scheduling_Anomaly *> int -Scheduler_Generic::priority (const handle_t handle, +Scheduler_Generic::priority (const handle_t /* handle */, OS_Thread_Priority &priority, Sub_Priority &subpriority, Preemption_Priority &preemption_prio, - const mode_t requested_mode) const + const mode_t /* requested_mode */) const { - ACE_UNUSED_ARG (handle); - ACE_UNUSED_ARG (requested_mode); - priority = minimum_priority_; subpriority = ACE_Scheduler_MIN_SUB_PRIORITY; preemption_prio = ACE_Scheduler_MAX_PREEMPTION_PRIORITY; @@ -268,3 +265,5 @@ void Scheduler_Generic::print_schedule () { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h index a623fb37e7e..9f5b55bc908 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // // ============================================================================ @@ -26,6 +27,8 @@ #include "ace/Synch_Traits.h" #include "ace/Recursive_Thread_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_RTSched_Export Scheduler_Generic : public ACE_Scheduler // = TITLE // Implementation of an off-line scheduler. @@ -129,6 +132,8 @@ private: Scheduler_Generic &operator= (const Scheduler_Generic &); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* SCHEDULER_INTERNAL_H */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp index f2e7c3c467f..5ddc6420565 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp @@ -43,6 +43,8 @@ typedef int (*COMP_FUNC) (const void*, const void*); // = Constructor. +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_Strategy_Scheduler::ACE_Strategy_Scheduler (ACE_Scheduler_Strategy &strategy) : ACE_DynScheduler (), strategy_ (strategy) @@ -860,9 +862,8 @@ ACE_MUF_Scheduler_Strategy::minimum_critical_priority () // = Provides the dispatching queue type for the given dispatch entry. ACE_DynScheduler::Dispatching_Type -ACE_MUF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry &entry) +ACE_MUF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */) { - ACE_UNUSED_ARG (entry); return RtecScheduler::LAXITY_DISPATCHING; } @@ -951,12 +952,10 @@ ACE_RMS_Scheduler_Strategy::~ACE_RMS_Scheduler_Strategy () // = All entries have the same dynamic subpriority value. long -ACE_RMS_Scheduler_Strategy::dynamic_subpriority (Dispatch_Entry &entry, - RtecScheduler::Time current_time) +ACE_RMS_Scheduler_Strategy::dynamic_subpriority ( + Dispatch_Entry & /* entry */, + RtecScheduler::Time /* current_time */) { - ACE_UNUSED_ARG (entry); - ACE_UNUSED_ARG (current_time); - return 0; } @@ -996,9 +995,8 @@ ACE_RMS_Scheduler_Strategy::minimum_critical_priority () // = Provide the dispatching queue type for the given dispatch entry. ACE_DynScheduler::Dispatching_Type -ACE_RMS_Scheduler_Strategy::dispatch_type (const Dispatch_Entry &entry) +ACE_RMS_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */) { - ACE_UNUSED_ARG (entry); return RtecScheduler::STATIC_DISPATCHING; } @@ -1131,9 +1129,8 @@ ACE_MLF_Scheduler_Strategy::sort_function (void *arg1, void *arg2) // = Provides the dispatching queue type for the given dispatch entry. ACE_DynScheduler::Dispatching_Type -ACE_MLF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry &entry) +ACE_MLF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */) { - ACE_UNUSED_ARG (entry); return RtecScheduler::LAXITY_DISPATCHING; } @@ -1257,9 +1254,8 @@ ACE_EDF_Scheduler_Strategy::sort_function (void *arg1, void *arg2) // = Provides the dispatching queue type for the given dispatch entry. ACE_DynScheduler::Dispatching_Type -ACE_EDF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry &entry) +ACE_EDF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */) { - ACE_UNUSED_ARG (entry); return RtecScheduler::DEADLINE_DISPATCHING; } @@ -1347,12 +1343,10 @@ ACE_Criticality_Scheduler_Strategy::~ACE_Criticality_Scheduler_Strategy () // = All entries have the same dynamic subpriority value. long -ACE_Criticality_Scheduler_Strategy::dynamic_subpriority (Dispatch_Entry &entry, - RtecScheduler::Time current_time) +ACE_Criticality_Scheduler_Strategy::dynamic_subpriority ( + Dispatch_Entry & /* entry */, + RtecScheduler::Time /* current_time */) { - ACE_UNUSED_ARG (entry); - ACE_UNUSED_ARG (current_time); - return 0; } @@ -1391,8 +1385,10 @@ ACE_Criticality_Scheduler_Strategy::minimum_critical_priority () // = Provides the dispatching queue type for the given dispatch entry. ACE_DynScheduler::Dispatching_Type -ACE_Criticality_Scheduler_Strategy::dispatch_type (const Dispatch_Entry &entry) +ACE_Criticality_Scheduler_Strategy::dispatch_type ( + const Dispatch_Entry & /* entry */) { - ACE_UNUSED_ARG (entry); return RtecScheduler::STATIC_DISPATCHING; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h index d2d60872b92..3f8e837ea98 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // // ============================================================================ @@ -23,6 +24,8 @@ #include "DynSched.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // forward declaration of the abstract base class for scheduler strategies class ACE_Scheduler_Strategy; @@ -493,6 +496,9 @@ private: }; + +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* STRATEGY_SCHEDULER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp index c600d1c71c9..a0fab4d2a1f 100644 --- a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp @@ -12,6 +12,7 @@ ACE_RCSID (Security, CSI_Utils, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO::CSI_Utils::create_sas_service_context ( @@ -64,3 +65,5 @@ TAO::CSI_Utils::extract_sas_service_context ( return (cdr >> sas_context); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.h b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.h index 5b1e5409858..8f233dbfd97 100644 --- a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.h @@ -18,6 +18,11 @@ // the declared types/variables are not meant to be used outside TAO's // CSIv2 implementation. +#include "tao/orbconf.h" +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward declarations namespace IOP { @@ -46,4 +51,6 @@ namespace TAO } } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_CSI_UTILS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp index 5fbdca1e5e7..06fb5262aa8 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp @@ -10,6 +10,8 @@ ACE_RCSID (Security, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::Security::EstablishTrustPolicy::EstablishTrustPolicy ( const ::Security::EstablishTrust &trust) : trust_ (trust) @@ -57,3 +59,5 @@ TAO::Security::EstablishTrustPolicy::trust (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return this->trust_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h index eeb4bc7ddc9..7003fd73e3c 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h @@ -26,6 +26,8 @@ #include "tao/LocalObject.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Security @@ -49,7 +51,7 @@ namespace TAO * appropriate Security::EstablishTrust structure (inserted into a * CORBA::Any). */ - class TAO_Security_Export EstablishTrustPolicy + class EstablishTrustPolicy : public virtual SecurityLevel2::EstablishTrustPolicy, public virtual TAO_Local_RefCounted_Object { @@ -90,13 +92,15 @@ namespace TAO /// Quality of protection which can be specified for an object /// reference and used to protect messages. - ::Security::EstablishTrust trust_; + ::Security::EstablishTrust const trust_; }; } // End Security namespace } // End TAO namespace +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ESTABLISH_TRUST_POLICY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp index 6d9748b209d..521a8706db0 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp @@ -10,6 +10,8 @@ ACE_RCSID (Security, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::Security::QOPPolicy::QOPPolicy (::Security::QOP qop) : qop_ (qop) { @@ -55,3 +57,5 @@ TAO::Security::QOPPolicy::qop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return this->qop_; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h index a349ef444a1..a94c5040359 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h @@ -26,6 +26,7 @@ #include "tao/LocalObject.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -47,7 +48,7 @@ namespace TAO * Security::SecQOPPolicy policy type, and the appropriate * Security::QOP enumeration (inserted into a CORBA::Any). */ - class TAO_Security_Export QOPPolicy + class QOPPolicy : public virtual SecurityLevel2::QOPPolicy, public virtual TAO_Local_RefCounted_Object { @@ -88,13 +89,15 @@ namespace TAO /// Quality of protection which can be specified for an object /// reference and used to protect messages. - ::Security::QOP qop_; + ::Security::QOP const qop_; }; } // End Security namespace } // End TAO namespace +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_SL2_QOP_POLICY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp index e3d0ee246c4..b6e9e6380dc 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp @@ -7,6 +7,7 @@ ACE_RCSID (Security, SL3_ContextEstablishmentPolicy, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SL3::ContextEstablishmentPolicy::ContextEstablishmentPolicy ( SecurityLevel3::CredsDirective creds_directive, @@ -121,3 +122,5 @@ TAO::SL3::ContextEstablishmentPolicy::destroy ( this->use_confidentiality_ = SecurityLevel3::FD_UseDefault; this->use_integrity_ = SecurityLevel3::FD_UseDefault; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h index 5cbb4fe3d86..266c1dd31f6 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h @@ -30,6 +30,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace SL3 @@ -41,7 +43,7 @@ namespace TAO * * */ - class TAO_Security_Export ContextEstablishmentPolicy + class ContextEstablishmentPolicy : public virtual SecurityLevel3::ContextEstablishmentPolicy, public virtual TAO_Local_RefCounted_Object { @@ -121,6 +123,7 @@ namespace TAO } // End TAO namespace +TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp index 28e1650facf..6bc147f782e 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp @@ -5,7 +5,10 @@ ACE_RCSID (Security, SL3_CredentialsAcquirerFactory, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SL3::CredentialsAcquirerFactory::~CredentialsAcquirerFactory (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h index 6e593d6345d..6a09b69a44a 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h @@ -26,6 +26,7 @@ #include "orbsvcs/SecurityLevel3C.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -41,7 +42,7 @@ namespace TAO * All concrete CredentialsAcquirerFactory classes must implement * this interface. */ - class TAO_Security_Export CredentialsAcquirerFactory + class CredentialsAcquirerFactory { public: @@ -59,6 +60,8 @@ namespace TAO } // End SL3 namespace } // End TAO namespace +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp index e0159269ff5..a20eae8dae7 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp @@ -8,6 +8,7 @@ ACE_RCSID (Security, SL3_CredentialsCurator, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -279,3 +280,5 @@ TAO::SL3::CredentialsCurator::_tao_add_own_credentials ( // CredentialsCurator nows owns the id. (void) credentials_id._retn (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h index e874a126628..2fe93b466eb 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h @@ -34,6 +34,9 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace SL3 @@ -54,7 +57,7 @@ namespace TAO * This class provides a means for creating and managing * OwnCredentials. */ - class TAO_Security_Export CredentialsCurator + class CredentialsCurator : public virtual SecurityLevel3::CredentialsCurator, public virtual TAO_Local_RefCounted_Object { @@ -160,6 +163,8 @@ namespace TAO } // End TAO namespace +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp index c11ce4a57af..7517e4ae3b2 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp @@ -8,6 +8,8 @@ ACE_RCSID (Security, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::SL3::ObjectCredentialsPolicy::ObjectCredentialsPolicy ( const SecurityLevel3::OwnCredentialsList & creds) : creds_list_ (creds) @@ -59,3 +61,5 @@ TAO::SL3::ObjectCredentialsPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->creds_list_.length (0); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h index 84e1ada564d..c4479d9aa8e 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h @@ -1,4 +1,3 @@ - // -*- C++ -*- //============================================================================= @@ -31,6 +30,9 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace SL3 @@ -46,7 +48,7 @@ namespace TAO * POA will have the credentials contained within this Policy * associated with them. */ - class TAO_Security_Export ObjectCredentialsPolicy + class ObjectCredentialsPolicy : public virtual SecurityLevel3::ObjectCredentialsPolicy, public virtual TAO_Local_RefCounted_Object { @@ -97,6 +99,7 @@ namespace TAO } // End TAO namespace +TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp index 7262bb8ce04..456103ca3f8 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp @@ -10,6 +10,8 @@ ACE_RCSID (Security, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Policy_ptr TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type, const CORBA::Any & value @@ -57,3 +59,5 @@ TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type, return policy; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h index 9cf82400061..9c3a36b0913 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h @@ -29,6 +29,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace SL3 @@ -71,6 +73,7 @@ namespace TAO } // End SL3 namespace. } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp index 2ad9a8ca9fc..d97987dba63 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp @@ -12,6 +12,7 @@ ACE_RCSID (Security, # include "SL3_SecurityCurrent.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SL3::SecurityCurrent::SecurityCurrent (size_t tss_slot, TAO_ORB_Core * oc) @@ -55,3 +56,5 @@ TAO::SL3::SecurityCurrent::request_is_local (ACE_ENV_SINGLE_ARG_DECL) return impl->request_is_local (ACE_ENV_SINGLE_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h index cd84dbbff61..c9386dc29b5 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h @@ -33,6 +33,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ORB_Core; @@ -129,13 +130,14 @@ namespace TAO /// Pointer to the ORB Core corresponding to the ORB with which /// this object is registered. - TAO_ORB_Core *orb_core_; + TAO_ORB_Core * const orb_core_; }; } // End SL3 namespace } // End TAO namespace +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "SL3_SecurityCurrent.inl" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl index ca53b8175b0..4194ffe1895 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl @@ -5,6 +5,8 @@ #include "tao/ORB_Core.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE size_t TAO::SL3::SecurityCurrent::tss_slot (void) const { @@ -20,3 +22,5 @@ TAO::SL3::SecurityCurrent::implementation (void) return impl; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp index a0e96f0ed65..e7dac650073 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp @@ -7,6 +7,10 @@ ACE_RCSID (Security, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::SL3::SecurityCurrent_Impl::~SecurityCurrent_Impl (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h index 5b0b97162ad..010d16b54f9 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h @@ -24,6 +24,9 @@ #include "security_export.h" #include "orbsvcs/SecurityLevel3C.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace SL3 @@ -75,6 +78,8 @@ namespace TAO } // End Security namespace. } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_SL3_SECURITY_CURRENT_IMPL_H */ diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp index 8dede16ad3d..0aa06b8c5ca 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp @@ -10,6 +10,8 @@ ACE_RCSID (Security, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO::SL3::SecurityManager::SecurityManager ( SecurityLevel3::CredentialsCurator_ptr cc) : credentials_curator_ (SecurityLevel3::CredentialsCurator::_duplicate (cc)) @@ -78,3 +80,5 @@ TAO::SL3::SecurityManager::create_object_creds_policy ( return policy; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h index 44d02adfcac..3f1ac2054ae 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h @@ -30,6 +30,9 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace SL3 @@ -41,7 +44,7 @@ namespace TAO * * */ - class TAO_Security_Export SecurityManager + class SecurityManager : public virtual SecurityLevel3::SecurityManager, public virtual TAO_Local_RefCounted_Object { @@ -91,7 +94,7 @@ namespace TAO * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~SecurityManager (void); + virtual ~SecurityManager (void); private: @@ -104,6 +107,8 @@ namespace TAO } // End SL3 namespace } // End TAO namespace +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp index 321151fc753..4c52f56e4bb 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp @@ -11,6 +11,8 @@ ACE_RCSID (Security, # include "Security_Current.inl" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Security_Current::TAO_Security_Current (size_t tss_slot, const char *orb_id) : tss_slot_ (tss_slot), @@ -91,3 +93,5 @@ TAO_Security_Current::init (void) return result; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h index 3126d96f1b6..e073d62a74a 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h @@ -34,6 +34,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Security_Current * @@ -121,14 +123,14 @@ private: private: /// TSS slot assigned to this object. - size_t tss_slot_; + size_t const tss_slot_; /// The ORBid of the ORB with which this object is registered. CORBA::String_var orb_id_; /// Pointer to the ORB Core corresponding to the ORB with which this /// object is registered. - TAO_ORB_Core *orb_core_; + TAO_ORB_Core * orb_core_; }; diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl b/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl index c194ecf4d1a..eee8c6c11fe 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl @@ -2,6 +2,8 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE size_t TAO_Security_Current::tss_slot (void) const { @@ -20,3 +22,5 @@ TAO_Security_Current::implementation (void) return impl; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp index 57f35df99d7..ef2158ec53f 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp @@ -6,7 +6,10 @@ ACE_RCSID (Security, SL3_Security_Current_Impl, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::Security::Current_Impl::~Current_Impl (void) { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h index a297564e3fd..6d1054f2e4b 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h @@ -24,6 +24,8 @@ #include "security_export.h" #include "orbsvcs/SecurityLevel2C.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Security @@ -86,6 +88,8 @@ namespace TAO } // End Security namespace. } // End TAO namespace. +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_SECURITY_CURRENT_IMPL_H */ diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp index ad129be0e9e..9a61e49415d 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -18,6 +18,7 @@ ACE_RCSID (Security, #include "tao/ORB_Constants.h" #include "tao/debug.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO::Security::ORBInitializer::pre_init ( @@ -235,3 +236,5 @@ TAO::Security::ORBInitializer::register_policy_factories ( // ---------------------------------------------------------------- } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h index ec755fcb406..8aec1ba210d 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h @@ -38,6 +38,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /// Security ORB initializer. namespace TAO { @@ -93,6 +95,8 @@ namespace TAO } // End Security namespace } // End TAO namespace +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp index 1f79aff69bf..59e914d0dd0 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp @@ -17,6 +17,8 @@ ACE_RCSID (Security, #include "tao/ORB_Constants.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + CORBA::Policy_ptr TAO::Security::PolicyFactory::create_policy ( CORBA::PolicyType type, @@ -153,3 +155,5 @@ TAO::Security::PolicyFactory::create_policy ( ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), CORBA::Policy::_nil ()); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h index e9dc2e54fb5..234428c364c 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h @@ -32,6 +32,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + namespace TAO { namespace Security @@ -44,7 +46,7 @@ namespace TAO * * Policy factory for all security related policies. */ - class TAO_Security_Export PolicyFactory + class PolicyFactory : public PortableInterceptor::PolicyFactory, public CORBA::LocalObject { @@ -60,6 +62,7 @@ namespace TAO } // End Security namespace } // End TAO namespace +TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp index 0da9f75664f..7aff9042f90 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp @@ -1,8 +1,9 @@ -// -*- C++ -*- // $Id$ #include "TAO_TIO.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Constructor. TAO_TIO::TAO_TIO (TimeBase::TimeT lower, TimeBase::TimeT upper) @@ -69,7 +70,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, ACE_NEW_RETURN (tio, TAO_TIO (lb1, up1), CosTime::OTNoOverlap); - overlap = tio->_this (); + overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTOverlap; } @@ -80,6 +82,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, CosTime::OTNoOverlap); overlap = tio->_this (); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTContained; } @@ -89,7 +92,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, TAO_TIO (lb2, up2), CosTime::OTNoOverlap); - overlap = tio->_this (); + overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTContained; } @@ -101,7 +105,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, TAO_TIO (0, 0), CosTime::OTNoOverlap); - overlap = tio->_this (); + overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTNoOverlap; } @@ -110,7 +115,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, ACE_NEW_RETURN (tio, TAO_TIO (lb2, up1), CosTime::OTNoOverlap); - overlap = tio->_this (); + overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTOverlap; } @@ -122,7 +128,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, TAO_TIO (0, 0), CosTime::OTNoOverlap); - overlap = tio->_this (); + overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTNoOverlap; } @@ -132,8 +139,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, TAO_TIO (lb1, up2), CosTime::OTNoOverlap); - overlap = tio->_this (); - + overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); } } ACE_CATCHANY @@ -180,7 +187,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, ACE_CHECK_RETURN (CosTime::OTNoOverlap); - overlap = tio_i->_this (); + overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTOverlap; } @@ -191,7 +199,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::OTNoOverlap); - overlap = tio_i->_this (); + overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTContained; } @@ -202,7 +211,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::OTNoOverlap); - overlap = tio_i->_this (); + overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTContained; } @@ -214,7 +224,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, TAO_TIO (0, 0), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::OTNoOverlap); - overlap = tio_i->_this (); + overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTNoOverlap; } @@ -225,7 +236,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::OTNoOverlap); - overlap = tio_i->_this (); + overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTOverlap; } @@ -237,7 +249,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::OTNoOverlap); - overlap = tio_i->_this (); + overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTNoOverlap; } @@ -269,5 +282,7 @@ TAO_TIO::time (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK_RETURN (CosTime::UTO::_nil ()); - return uto->_this (); + return uto->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h index cdebf3a0462..9dddb9718ff 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h @@ -22,6 +22,8 @@ #include "TAO_UTO.h" #include "time_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_TIO * @@ -87,5 +89,7 @@ private: TimeBase::IntervalT attr_time_interval; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_TIO_H */ diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp index 2667b77f73a..d5e1c4556de 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp @@ -8,6 +8,8 @@ #include "tao/ORB_Core.h" #include "ace/OS_NS_sys_time.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Constructor. TAO_Time_Service_Clerk::TAO_Time_Service_Clerk (int timer_value, int timer_value_usecs, @@ -175,3 +177,5 @@ TAO_Time_Service_Clerk::inaccuracy (TimeBase::InaccuracyT inaccuracy) { this->inaccuracy_ = inaccuracy; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h index 41357544e52..78629d2f122 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h @@ -24,6 +24,9 @@ #include "Timer_Helper.h" #include "time_export.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Time_Service_Clerk * @@ -132,5 +135,7 @@ private: Timer_Helper helper_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TIME_SERVICE_CLERK_H */ diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp index 54422e753ff..e6afbb21415 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp @@ -11,6 +11,7 @@ ACE_RCSID (Time, TAO_Time_Service_Server, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Constructor. TAO_Time_Service_Server::TAO_Time_Service_Server (void) @@ -122,3 +123,5 @@ TAO_Time_Service_Server::new_interval (TimeBase::TimeT lower, return tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h index f83b3cb5701..b23700a5bfe 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h @@ -21,6 +21,8 @@ #include "orbsvcs/TimeServiceS.h" #include "time_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Time_Service_Server * @@ -79,5 +81,7 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_TIME_SERVICE_SERVER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp index 467d95525d2..92356ad597b 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp @@ -11,6 +11,8 @@ ACE_RCSID (Time, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_UTO::TAO_UTO (TimeBase::TimeT time, TimeBase::InaccuracyT inaccuracy, TimeBase::TdfT tdf) @@ -240,3 +242,5 @@ TAO_UTO::interval (ACE_ENV_SINGLE_ARG_DECL) return tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h index b705d2244d8..4614b2de571 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h @@ -21,6 +21,8 @@ #include "orbsvcs/TimeServiceS.h" #include "time_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_UTO * @@ -111,5 +113,7 @@ private: TimeBase::UtcT attr_utc_time_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_UTO_H */ diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp index aa2c45aae47..6de610ec506 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp @@ -11,6 +11,8 @@ ACE_RCSID (Time, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + Timer_Helper::Timer_Helper (void) : clerk_ (0) { @@ -150,3 +152,5 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &, return 0; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h index 5e89f43785d..66f245cc7fd 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h @@ -33,6 +33,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Time_Service_Clerk; /** @@ -71,6 +73,8 @@ protected: typedef ACE_Array_Base<CosTime::TimeService_var> IORS; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TIMER_HELPER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp index 78672b1dab4..8b686b5d992 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp @@ -7,6 +7,9 @@ ACE_RCSID (Trader, Constraint_Interpreter, "$Id$") + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Constraint_Interpreter::TAO_Constraint_Interpreter ( const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, const char* constraints @@ -248,3 +251,5 @@ TAO_Preference_Interpreter::num_offers (void) { return this->offers_.size (); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h index b3e7e3ec208..4c2299a4164 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h @@ -22,6 +22,8 @@ #include "orbsvcs/CosTradingS.h" #include "orbsvcs/CosTradingReposS.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Constraint_Evaluator; class TAO_Constraint_Validator; @@ -158,5 +160,7 @@ private: Ordered_Offers offers_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_CONSTRAINT_INTERPRETER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp index d39235d4340..7955af7fc73 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp @@ -11,6 +11,8 @@ ACE_RCSID (Trader, Constraint_Nodes, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + int TAO_Noop_Constraint::accept (TAO_Constraint_Visitor* visitor) { @@ -925,3 +927,5 @@ TAO_Literal_Constraint::copy (const TAO_Literal_Constraint& lit) else type_ = TAO_UNKNOWN; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h index 1e73a887e21..a38b764cf1a 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -26,6 +26,8 @@ #pragma warning (disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Constraint_Visitor; typedef unsigned short TAO_Expression_Type; @@ -347,6 +349,8 @@ class TAO_Trading_Serv_Export TAO_Literal_Constraint : public TAO_Constraint }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp index 0281593f45c..b679afdc32f 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp @@ -14,6 +14,8 @@ ACE_RCSID (Trader, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Constraint_Evaluator::Operand_Queue::Operand_Queue (void) { } @@ -1198,3 +1200,5 @@ TAO_Constraint_Validator::expr_returns_string (TAO_Expression_Type expr_type) return return_value; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h index b1870a30889..8e192bd393d 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h @@ -19,6 +19,8 @@ #include "orbsvcs/Trader/trading_serv_export.h" #include "ace/Containers.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_DynSequence_i; class TAO_Constraint; @@ -437,5 +439,7 @@ public: const char* element) const; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* CONSTRAINT_VISITORS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp index 2197337bab9..2e56f8e62d2 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp @@ -423,6 +423,8 @@ char *yytext; #include "Constraint_Nodes.h" #include "Constraint_Tokens.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + static TAO_Literal_Constraint* extract_string(const char*); #define TAO_YY_LEX_DEBUG @@ -1775,3 +1777,5 @@ yywrap (void) { return 1; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp index df613be500b..d2712ddbd4d 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp @@ -17,6 +17,8 @@ #include "Constraint_Interpreter.h" #include "Constraint_Nodes.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //#define YYDEBUG 1 # define TAO_GT 257 # define TAO_GE 258 @@ -895,3 +897,4 @@ case 37: goto yystack; /* reset registers in driver code */ } +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp index 8205067b623..f7d01af106f 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp @@ -3,6 +3,8 @@ #include "Interpreter.h" #include "ace/OS_NS_string.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_SYNCH_MUTEX TAO_Interpreter::parserMutex__; TAO_Interpreter::TAO_Interpreter (void) @@ -95,3 +97,5 @@ TAO_Lex_String_Input::reset (char* input_string) TAO_Lex_String_Input::end_ = input_string + ACE_OS::strlen (TAO_Lex_String_Input::string_); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h index 4575bc96e89..1e4a3747f1d 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef TAO_TCL_INTERPRETER_H #define TAO_TCL_INTERPRETER_H #include /**/ "ace/pre.h" @@ -19,6 +18,8 @@ #include "Constraint_Visitors.h" #include "orbsvcs/Trader/trading_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Constraint_Evaluator; class TAO_Constraint_Validator; @@ -100,5 +101,7 @@ typedef union extern YYSTYPE yylval; extern YYSTYPE yyval; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_TCL_INTERPRETER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp index 22dd38b69d0..842d51dac11 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp @@ -4,6 +4,8 @@ #include "ace/ACE.h" #include "ace/OS_NS_string.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // = Methods to deal with ACE_Hash_Map_Manager. TAO_String_Hash_Key::TAO_String_Hash_Key (void) @@ -94,3 +96,5 @@ sequence_type (CORBA::TypeCode* type_code return return_value; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h index 509d455ec03..9062244f2c7 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h @@ -22,6 +22,8 @@ #include "orbsvcs/Trader/trading_serv_export.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // = Classes to deal with the ACE_Hash_Map_Manager. /** @@ -86,6 +88,8 @@ public: // is <code>. }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_INTERPRETER_UTILS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp index f621f592ea9..5474d4fb694 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp @@ -7,6 +7,8 @@ #include "orbsvcs/Trader/Constraint_Visitors.h" #include "tao/DynamicAny/DynSequence_i.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class OPERAND_TYPE> CORBA::Boolean TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& element) { @@ -45,4 +47,6 @@ TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& element) return return_value; } +TAO_END_VERSIONED_NAMESPACE_DECL + #endif /* TAO_INTERPRETER_UTILS_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h index 4127dc0ddc4..e7640a3be6e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + // $Id$ #ifndef TAO_INTERPRETER_UTILS_T_H @@ -6,9 +8,13 @@ #include "tao/Basic_Types.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class OPERAND_TYPE> CORBA::Boolean TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& operand); +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Interpreter_Utils_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Locking.h b/TAO/orbsvcs/orbsvcs/Trader/Locking.h index a3b7cd2e7a2..e01ba419b43 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Locking.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Locking.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp index 222c8f5cfa6..ecfd1f67c97 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp @@ -1,13 +1,13 @@ // $Id$ -#ifndef TAO_OFFER_DATABASE_C -#define TAO_OFFER_DATABASE_C +#ifndef TAO_OFFER_DATABASE_CPP +#define TAO_OFFER_DATABASE_CPP #include "Offer_Database.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" -ACE_RCSID(Trader, Offer_Database, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class LOCK_TYPE> TAO_Offer_Database<LOCK_TYPE>::TAO_Offer_Database (void) @@ -384,4 +384,6 @@ TAO_Service_Offer_Iterator<LOCK_TYPE>::next_offer (void) this->offer_iter_->advance (); } -#endif /* TAO_OFFER_DATABASE_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_OFFER_DATABASE_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h index 4ec7cfef179..46b95189833 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -19,6 +19,8 @@ #include "Offer_Iterators.h" #include "ace/Null_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template <class LOCK_TYPE> class TAO_Service_Offer_Iterator; /** @@ -199,6 +201,7 @@ class TAO_Service_Offer_Iterator const char* type_; }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Offer_Database.cpp" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp index 4ccdb4d0b39..102bf0b9be9 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp @@ -4,6 +4,8 @@ ACE_RCSID(Trader, Offer_Iterators, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Offer_Iterator::TAO_Offer_Iterator (const TAO_Property_Filter& pfilter) : pfilter_ (pfilter) { @@ -316,3 +318,5 @@ TAO_Offer_Id_Iterator::insert_id (CosTrading::OfferId new_id) { this->ids_.enqueue_tail (new_id); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h index 2c836bf660d..11e6e95860a 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -23,12 +23,14 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // ************************************************************* // TAO_Offer_Iterator // ************************************************************* -class TAO_Offer_Iterator : - public virtual POA_CosTrading::OfferIterator +class TAO_Offer_Iterator + : public virtual POA_CosTrading::OfferIterator { // = TITLE // This class implements CosTrading::OfferIterator IDL @@ -286,6 +288,8 @@ class TAO_Offer_Id_Iterator : TAO_String_Queue ids_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp index bf0c9c7ad7c..7dba728106a 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp @@ -1,11 +1,11 @@ // $Id$ -#ifndef TAO_OFFER_ITERATORS_T_C -#define TAO_OFFER_ITERATORS_T_C +#ifndef TAO_OFFER_ITERATORS_T_CPP +#define TAO_OFFER_ITERATORS_T_CPP #include "Offer_Iterators_T.h" -ACE_RCSID(Trader, Offer_Iterators_T, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class MAP_LOCK_TYPE> TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>:: @@ -92,4 +92,6 @@ next_n (CORBA::ULong n, return static_cast<CORBA::Boolean> (ret_offers != 0); } -#endif /* TAO_REGISTER_OFFER_ITERATOR_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_REGISTER_OFFER_ITERATOR_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h index 440b4db8449..d1b4459e3a9 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -23,6 +23,10 @@ #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ + + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Register_Offer_Iterator * @@ -78,6 +82,7 @@ private: TAO_String_Queue offer_ids_; }; +TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Offer_Iterators_T.cpp" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp index 1bc95e7bcdc..cf7cccce4a1 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp @@ -10,6 +10,8 @@ ACE_RCSID (Trader, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Service_Type_Repository:: TAO_Service_Type_Repository (ACE_Lock* lock) : lock_ (lock) @@ -689,3 +691,5 @@ update_type_map (const char *name, TAO_String_Hash_Key type_name (name); this->type_map_.bind (type_name, type); } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h index b65b50bb49b..cb34acd9be4 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -20,13 +20,16 @@ #include "ace/Hash_Map_Manager.h" #include "ace/Null_Mutex.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Service_Type_Repository * * @brief This class implements CosTradingRepos::ServiceTypeRepository * IDL interface. */ -class TAO_Trading_Serv_Export TAO_Service_Type_Repository : public POA_CosTradingRepos::ServiceTypeRepository +class TAO_Trading_Serv_Export TAO_Service_Type_Repository + : public POA_CosTradingRepos::ServiceTypeRepository { public: /** @@ -318,5 +321,7 @@ private: CosTradingRepos::ServiceTypeRepository::IncarnationNumber incarnation_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_SERVICE_TYPE_REPOSITORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp index 2743d67bbdf..49dbba67957 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp @@ -15,6 +15,8 @@ ACE_RCSID (Trader, Trader, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Trader_Base::TAO_Trader_Base (void) : trading_components_ (*this), import_attributes_ (*this), @@ -856,3 +858,5 @@ TAO_Trader_Factory::parse_args (int& argc, ACE_TCHAR** argv) arg_shifter.ignore_arg (); } } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h index 25d731b8fbe..62f04a1b03f 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -35,6 +35,8 @@ #pragma warning (disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Forward Declaration. class TAO_Trader_Base; @@ -513,6 +515,8 @@ bool operator== (const CosTrading::Admin::OctetSeq& left, const CosTrading::Admin::OctetSeq& right); +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp index a62b2d3773a..23372d9bd5c 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp @@ -2,6 +2,8 @@ #include "Trader_Constraint_Visitors.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Trader_Constraint_Evaluator:: TAO_Trader_Constraint_Evaluator (CosTrading::Offer* offer, CORBA::Boolean supports_dp) @@ -78,3 +80,5 @@ TAO_Trader_Constraint_Validator:: ~TAO_Trader_Constraint_Validator () { } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h index e5740b3dc86..8c77cfdf193 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h @@ -1,3 +1,4 @@ +// -*- C++ -*- //============================================================================= /** @@ -19,7 +20,10 @@ #include "Trader_Utils.h" #include "orbsvcs/CosTradingC.h" -class TAO_Trading_Serv_Export TAO_Trader_Constraint_Validator : public TAO_Constraint_Validator +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class TAO_Trading_Serv_Export TAO_Trader_Constraint_Validator +: public TAO_Constraint_Validator { public: /** @@ -53,5 +57,7 @@ class TAO_Trading_Serv_Export TAO_Trader_Constraint_Evaluator : public TAO_Const TAO_Property_Evaluator prop_eval_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_TRADER_CONSTRAINT_VISITOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp index c14baa22f3e..401b24dcb4d 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp @@ -1,7 +1,7 @@ // $Id$ -#if !defined (TAO_TRADER_INTERFACES_C) -#define TAO_TRADER_INTERFACES_C +#ifndef TAO_TRADER_INTERFACES_CPP +#define TAO_TRADER_INTERFACES_CPP #include "Trader_Interfaces.h" #include "Trader_T.h" @@ -10,7 +10,7 @@ #include "ace/OS_NS_time.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Trader, Trader_Interfaces, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: @@ -1926,13 +1926,15 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> void TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: list_proxies (CORBA::ULong, - CosTrading::OfferIdSeq*&, - CosTrading::OfferIdIterator_ptr& - ACE_ENV_ARG_DECL) + CosTrading::OfferIdSeq*&, + CosTrading::OfferIdIterator_ptr& + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)) { ACE_THROW (CORBA::UNKNOWN ()); } -#endif /* TAO_TRADER_INTERFACES_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_TRADER_INTERFACES_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h index 8b8ea1368c3..dafadb93588 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h @@ -26,6 +26,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Hack because g++ forced this inane circular dependecy! class TAO_Constraint_Interpreter; @@ -999,6 +1001,8 @@ private: TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>& trader_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Trader_Interfaces.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp index 2b02ec5ffdc..4d41e22bd51 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp @@ -1,12 +1,12 @@ // $Id$ -#ifndef TAO_TRADER_C -#define TAO_TRADER_C +#ifndef TAO_TRADER_CPP +#define TAO_TRADER_CPP #include "Trader_T.h" #include "Trader_Interfaces.h" -ACE_RCSID(Trader, Trader_T, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>:: @@ -320,4 +320,6 @@ operator () (TAO_DynSequence_i& dyn_any, return 1; } -#endif /* TAO_TRADER_C */ +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_TRADER_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h index be1ec6a4149..bce823d2343 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -31,6 +31,8 @@ #pragma warning (disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_DynSequence_i; /** @@ -262,6 +264,8 @@ public: const ELEMENT_TYPE& element); }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Trader_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp index d0495dc1c24..4d34131c215 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp @@ -5,6 +5,8 @@ ACE_RCSID(Trader, Trader_Utils, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + TAO_Policy_Creator::TAO_Policy_Creator (int num_policies) : policies_ (num_policies), num_policies_ (0) @@ -1522,3 +1524,5 @@ TAO_Property_Filter::filter_offer (CosTrading::Offer* source, // d_props.replace (length, length, props, 0); d_props = s_props; } + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h index 0fb91489fa4..90e4bf04624 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h @@ -23,6 +23,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + /** * @class TAO_Property_Evaluator * @@ -769,6 +771,8 @@ private: CosTrading::Lookup::HowManyProps policy_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/constraint.l b/TAO/orbsvcs/orbsvcs/Trader/constraint.l index 955d62f9cfc..445219603c8 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/constraint.l +++ b/TAO/orbsvcs/orbsvcs/Trader/constraint.l @@ -18,6 +18,8 @@ #include "Constraint_Nodes.h" #include "Constraint_Tokens.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + static TAO_Literal_Constraint* extract_string(const char*); #define TAO_YY_LEX_DEBUG @@ -129,4 +131,6 @@ extract_string(const char* total) str[ctr - 1] = '\0'; return new TAO_Literal_Constraint(str); -}
\ No newline at end of file +} + +TAO_END_VERSIONED_NAMESPACE_DECL
\ No newline at end of file diff --git a/TAO/orbsvcs/orbsvcs/Trader/constraint.y b/TAO/orbsvcs/orbsvcs/Trader/constraint.y index 1e5ab5c81cf..7d32796775a 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/constraint.y +++ b/TAO/orbsvcs/orbsvcs/Trader/constraint.y @@ -17,6 +17,8 @@ #include "Constraint_Interpreter.h" #include "Constraint_Nodes.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + //#define YYDEBUG 1 %} @@ -133,4 +135,5 @@ factor: TAO_LPAREN bool_or TAO_RPAREN %% +TAO_END_VERSIONED_NAMESPACE_DECL //extern int yydebug = 1; |