diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-30 23:24:18 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-30 23:24:18 +0000 |
| commit | e5bc1e3ed106dba3330b670db175f969d83cce95 (patch) | |
| tree | 86737bda76766affa6915b679e48e0cf6233ba89 | |
| parent | e212cf75ba1e21b37dbab7602e23a134672dd16b (diff) | |
| download | ATCD-e5bc1e3ed106dba3330b670db175f969d83cce95.tar.gz | |
ChangeLogTag:Wed Aug 30 16:16:02 2000 Carlos O'Ryan <coryan@uci.edu>
29 files changed, 1195 insertions, 747 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index f824e1f5bf1..81569051fe6 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,43 @@ +Wed Aug 30 16:16:02 2000 Carlos O'Ryan <coryan@uci.edu> + + * tao/TAO.dsp: + * tao/TAO.dsw: + * tao/TAO_Static.dsp: + * tao/PortableServer/TAO_PortableServer.dsp: + * tao/PortableServer/TAO_PortableServer_Static.dsp: + Add new project files for the PortableServer library. + Update the list of files in the TAO library + + * tao/PortableServer/portableserver_export.h: + Add file to define the export macros for the PortableServer + library. + + * tao/PortableServer/Active_Object_Map.h: + * tao/PortableServer/Collocated_Object.h: + * tao/PortableServer/DomainS.h: + * tao/PortableServer/FT_CORBAS.h: + * tao/PortableServer/Forwarding_Servant.h: + * tao/PortableServer/ImplRepoC.h: + * tao/PortableServer/ImplRepoC.i: + * tao/PortableServer/ImplRepoS.h: + * tao/PortableServer/Key_Adapters.h: + * tao/PortableServer/MessagingS.h: + * tao/PortableServer/ORB_Manager.h: + * tao/PortableServer/Object_Adapter.h: + * tao/PortableServer/Operation_Table.h: + * tao/PortableServer/POA.h: + * tao/PortableServer/POAManager.h: + * tao/PortableServer/POA_CORBA.h: + * tao/PortableServer/PortableServer.h: + * tao/PortableServer/PortableServerC.h: + * tao/PortableServer/PortableServerC.i: + * tao/PortableServer/Servant_Base.h: + * tao/PortableServer/Object_Adapter.cpp: + Add the infamous export macros. + + * tao/PortableServer/DomainS.cpp: + Fix use of ACE_NESTED_CLASS macro + Wed Aug 30 13:56:53 2000 Carlos O'Ryan <coryan@uci.edu> * tao/PortableServer/DomainS_T.h: diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h index 5287c09584b..1e0a2fa4c91 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.h +++ b/TAO/tao/PortableServer/Active_Object_Map.h @@ -32,7 +32,7 @@ class TAO_Lifespan_Strategy; class TAO_Id_Assignment_Strategy; class TAO_Id_Hint_Strategy; -class TAO_Export TAO_Active_Object_Map +class TAO_PortableServer_Export TAO_Active_Object_Map { // = TITLE // Map of object ids to servants. diff --git a/TAO/tao/PortableServer/Collocated_Object.h b/TAO/tao/PortableServer/Collocated_Object.h index c4229e0e32e..e99a114d0eb 100644 --- a/TAO/tao/PortableServer/Collocated_Object.h +++ b/TAO/tao/PortableServer/Collocated_Object.h @@ -17,6 +17,7 @@ #define TAO_COLLOCATED_OBJECT_H #include "ace/pre.h" +#include "portableserver_export.h" #include "tao/Object.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -25,7 +26,7 @@ class TAO_ServantBase; -class TAO_Export TAO_Collocated_Object : public virtual CORBA_Object +class TAO_PortableServer_Export TAO_Collocated_Object : public virtual CORBA_Object { public: TAO_Collocated_Object (TAO_Stub *p = 0, diff --git a/TAO/tao/PortableServer/DomainS.cpp b/TAO/tao/PortableServer/DomainS.cpp index cc5a9d7f511..c4d1ba085e2 100644 --- a/TAO/tao/PortableServer/DomainS.cpp +++ b/TAO/tao/PortableServer/DomainS.cpp @@ -479,7 +479,7 @@ POA_CORBA__tao_direct_collocated_DomainManager::POA_CORBA__tao_direct_collocated POA_CORBA_DomainManager_ptr servant, TAO_Stub *stub ) - : ACE_NESTED_CLASS (CORBA,DomainManager) (), + : CORBA_DomainManager (stub, 1), TAO_Collocated_Object (stub, 1, servant), CORBA_Object (stub, 1), servant_ (servant) diff --git a/TAO/tao/PortableServer/DomainS.h b/TAO/tao/PortableServer/DomainS.h index add4ca0f09f..b0e87a81bb8 100644 --- a/TAO/tao/PortableServer/DomainS.h +++ b/TAO/tao/PortableServer/DomainS.h @@ -32,7 +32,7 @@ class POA_CORBA_DomainManager; typedef POA_CORBA_DomainManager *POA_CORBA_DomainManager_ptr; - class TAO_Export POA_CORBA_DomainManager : public virtual PortableServer::ServantBase + class TAO_PortableServer_Export POA_CORBA_DomainManager : public virtual PortableServer::ServantBase { protected: POA_CORBA_DomainManager (void); @@ -149,7 +149,7 @@ CORBA::Policy_ptr result_; #if !defined (_CORBA_DOMAINMANAGER___THRU_POA_COLLOCATED_SH_) #define _CORBA_DOMAINMANAGER___THRU_POA_COLLOCATED_SH_ -class TAO_Export POA_CORBA__tao_thru_poa_collocated_DomainManager : public virtual ::CORBA::DomainManager +class TAO_PortableServer_Export POA_CORBA__tao_thru_poa_collocated_DomainManager : public virtual ::CORBA::DomainManager { public: POA_CORBA__tao_thru_poa_collocated_DomainManager ( @@ -182,7 +182,7 @@ public: #if !defined (_CORBA_DOMAINMANAGER___DIRECT_COLLOCATED_SH_) #define _CORBA_DOMAINMANAGER___DIRECT_COLLOCATED_SH_ -class TAO_Export POA_CORBA__tao_direct_collocated_DomainManager : public virtual CORBA::DomainManager, public virtual TAO_Collocated_Object +class TAO_PortableServer_Export POA_CORBA__tao_direct_collocated_DomainManager : public virtual CORBA::DomainManager, public virtual TAO_Collocated_Object { public: POA_CORBA__tao_direct_collocated_DomainManager ( @@ -221,7 +221,7 @@ private: #if defined (ACE_HAS_USING_KEYWORD) // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> -class TAO_Export POA_CORBA_DomainManager_tie : public POA_CORBA_DomainManager +class TAO_PortableServer_Export POA_CORBA_DomainManager_tie : public POA_CORBA_DomainManager { public: POA_CORBA_DomainManager_tie (T &t); @@ -275,7 +275,7 @@ private: class POA_CORBA_ConstructionPolicy; typedef POA_CORBA_ConstructionPolicy *POA_CORBA_ConstructionPolicy_ptr; -class TAO_Export POA_CORBA_ConstructionPolicy : public virtual POA_CORBA::Policy +class TAO_PortableServer_Export POA_CORBA_ConstructionPolicy : public virtual POA_CORBA::Policy { protected: POA_CORBA_ConstructionPolicy (void); @@ -415,7 +415,7 @@ CORBA::Boolean & constr_policy_; #if !defined (_CORBA_CONSTRUCTIONPOLICY___THRU_POA_COLLOCATED_SH_) #define _CORBA_CONSTRUCTIONPOLICY___THRU_POA_COLLOCATED_SH_ -class TAO_Export POA_CORBA__tao_thru_poa_collocated_ConstructionPolicy : public virtual ::CORBA::ConstructionPolicy, +class TAO_PortableServer_Export POA_CORBA__tao_thru_poa_collocated_ConstructionPolicy : public virtual ::CORBA::ConstructionPolicy, public virtual POA_CORBA::_tao_thru_poa_collocated_CORBA_Policy { public: @@ -450,7 +450,7 @@ public: #if defined (ACE_HAS_USING_KEYWORD) // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> -class TAO_Export POA_CORBA_ConstructionPolicy_tie : public POA_CORBA_ConstructionPolicy +class TAO_PortableServer_Export POA_CORBA_ConstructionPolicy_tie : public POA_CORBA_ConstructionPolicy { public: POA_CORBA_ConstructionPolicy_tie (T &t); diff --git a/TAO/tao/PortableServer/FT_CORBAS.h b/TAO/tao/PortableServer/FT_CORBAS.h index fb480167e96..b59a54ec195 100644 --- a/TAO/tao/PortableServer/FT_CORBAS.h +++ b/TAO/tao/PortableServer/FT_CORBAS.h @@ -30,7 +30,7 @@ #endif /* _MSC_VER */ -class TAO_Export FT_POA_RequestDurationPolicy : public virtual POA_CORBA::Policy +class TAO_PortableServer_Export FT_POA_RequestDurationPolicy : public virtual POA_CORBA::Policy { protected: FT_POA_RequestDurationPolicy (void); @@ -122,7 +122,7 @@ public: }; -class TAO_Export +class TAO_PortableServer_Export FT_POA_tao_thru_poa_collocated_RequestDurationPolicy : public virtual FT::RequestDurationPolicy, public virtual POA_CORBA::_tao_thru_poa_collocated_CORBA_Policy @@ -159,7 +159,7 @@ public: // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> -class TAO_Export FT_POA_RequestDurationPolicy_tie : +class TAO_PortableServer_Export FT_POA_RequestDurationPolicy_tie : public FT_POA_RequestDurationPolicy { public: @@ -238,7 +238,7 @@ private: #endif /* ACE_HAS_USING_KEYWORD */ -class TAO_Export FT_POA_HeartbeatPolicy : public virtual POA_CORBA::Policy +class TAO_PortableServer_Export FT_POA_HeartbeatPolicy : public virtual POA_CORBA::Policy { protected: FT_POA_HeartbeatPolicy (void); @@ -330,7 +330,7 @@ public: }; -class TAO_Export FT_POA_tao_thru_poa_collocated_HeartbeatPolicy: +class TAO_PortableServer_Export FT_POA_tao_thru_poa_collocated_HeartbeatPolicy: public virtual FT::HeartbeatPolicy, public virtual POA_CORBA::_tao_thru_poa_collocated_CORBA_Policy { @@ -364,7 +364,7 @@ public: // about it. // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> -class TAO_Export FT_POA_HeartbeatPolicy_tie : public FT_POA_HeartbeatPolicy +class TAO_PortableServer_Export FT_POA_HeartbeatPolicy_tie : public FT_POA_HeartbeatPolicy { public: FT_POA_HeartbeatPolicy_tie (T &t); @@ -441,7 +441,7 @@ private: #endif /* ACE_HAS_USING_KEYWORD */ -class TAO_Export FT_POA_HeartbeatEnabledPolicy : public virtual POA_CORBA::Policy +class TAO_PortableServer_Export FT_POA_HeartbeatEnabledPolicy : public virtual POA_CORBA::Policy { protected: FT_POA_HeartbeatEnabledPolicy (void); @@ -533,7 +533,7 @@ public: }; -class TAO_Export FT_POA_tao_thru_poa_collocated_HeartbeatEnabledPolicy +class TAO_PortableServer_Export FT_POA_tao_thru_poa_collocated_HeartbeatEnabledPolicy : public virtual FT::HeartbeatEnabledPolicy, public virtual POA_CORBA::_tao_thru_poa_collocated_CORBA_Policy { @@ -570,7 +570,7 @@ public: // about it. // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> -class TAO_Export FT_POA_HeartbeatEnabledPolicy_tie : +class TAO_PortableServer_Export FT_POA_HeartbeatEnabledPolicy_tie : public FT_POA_HeartbeatEnabledPolicy { public: diff --git a/TAO/tao/PortableServer/Forwarding_Servant.h b/TAO/tao/PortableServer/Forwarding_Servant.h index 8f6934e4500..0095eba6fd9 100644 --- a/TAO/tao/PortableServer/Forwarding_Servant.h +++ b/TAO/tao/PortableServer/Forwarding_Servant.h @@ -31,7 +31,7 @@ #include "Servant_Base.h" #include "tao/ORB.h" -class TAO_Forwarding_Servant : public TAO_DynamicImplementation +class TAO_PortableServer_Export TAO_Forwarding_Servant : public TAO_DynamicImplementation { public: diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h index b1a430d99d0..98eb947a86b 100644 --- a/TAO/tao/PortableServer/ImplRepoC.h +++ b/TAO/tao/PortableServer/ImplRepoC.h @@ -11,6 +11,7 @@ #define _TAO_IDL_IMPLREPOC_H_ #include "ace/pre.h" +#include "portableserver_export.h" #include "tao/Object.h" #include "tao/Managed_Types.h" #include "tao/Sequence.h" @@ -33,13 +34,13 @@ #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif -#define TAO_EXPORT_MACRO TAO_Export +#define TAO_EXPORT_MACRO TAO_PortableServer_Export #if defined (TAO_EXPORT_NESTED_CLASSES) # if defined (TAO_EXPORT_NESTED_MACRO) # undef TAO_EXPORT_NESTED_MACRO # endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export +# define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export #endif /* TAO_EXPORT_NESTED_CLASSES */ #if defined(_MSC_VER) @@ -64,7 +65,7 @@ TAO_NAMESPACE ImplementationRepository #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___VAR_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___VAR_CH_ - class TAO_Export ServerObject_var : public TAO_Base_var + class TAO_PortableServer_Export ServerObject_var : public TAO_Base_var { public: ServerObject_var (void); // default constructor @@ -99,7 +100,7 @@ TAO_NAMESPACE ImplementationRepository #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___OUT_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___OUT_CH_ - class TAO_Export ServerObject_out + class TAO_PortableServer_Export ServerObject_out { public: ServerObject_out (ServerObject_ptr &); @@ -123,7 +124,7 @@ TAO_NAMESPACE ImplementationRepository #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_ -class TAO_Export ServerObject : public virtual ACE_CORBA_1 (Object) +class TAO_PortableServer_Export ServerObject : public virtual ACE_CORBA_1 (Object) { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -267,7 +268,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerObject; struct EnvironmentVariable; class EnvironmentVariable_var; -struct TAO_Export EnvironmentVariable +struct TAO_PortableServer_Export EnvironmentVariable { #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -280,7 +281,7 @@ struct TAO_Export EnvironmentVariable TAO_String_Manager value; }; -class TAO_Export EnvironmentVariable_var +class TAO_PortableServer_Export EnvironmentVariable_var { public: EnvironmentVariable_var (void); // default constructor @@ -309,7 +310,7 @@ private: EnvironmentVariable *ptr_; }; -class TAO_Export EnvironmentVariable_out +class TAO_PortableServer_Export EnvironmentVariable_out { public: EnvironmentVariable_out (EnvironmentVariable *&); @@ -387,7 +388,7 @@ class EnvironmentList_var; // EnvironmentList // ************************************************************* -class TAO_Export EnvironmentList : public +class TAO_PortableServer_Export EnvironmentList : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList #else /* TAO_USE_SEQUENCE_TEMPLATES */ @@ -423,7 +424,7 @@ public: // class ImplementationRepository::EnvironmentList_var // ************************************************************* -class TAO_Export EnvironmentList_var +class TAO_PortableServer_Export EnvironmentList_var { public: EnvironmentList_var (void); // default constructor @@ -460,7 +461,7 @@ private: #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___OUT_CH_) #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___OUT_CH_ -class TAO_Export EnvironmentList_out +class TAO_PortableServer_Export EnvironmentList_out { public: EnvironmentList_out (EnvironmentList *&); @@ -497,7 +498,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ActivationMode; struct StartupOptions; class StartupOptions_var; -struct TAO_Export StartupOptions +struct TAO_PortableServer_Export StartupOptions { #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -512,7 +513,7 @@ struct TAO_Export StartupOptions ACE_NESTED_CLASS (ImplementationRepository, ActivationMode) activation; }; -class TAO_Export StartupOptions_var +class TAO_PortableServer_Export StartupOptions_var { public: StartupOptions_var (void); // default constructor @@ -541,7 +542,7 @@ private: StartupOptions *ptr_; }; -class TAO_Export StartupOptions_out +class TAO_PortableServer_Export StartupOptions_out { public: StartupOptions_out (StartupOptions *&); @@ -564,7 +565,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StartupOptions; struct ServerInformation; class ServerInformation_var; -struct TAO_Export ServerInformation +struct TAO_PortableServer_Export ServerInformation { #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -579,7 +580,7 @@ struct TAO_Export ServerInformation TAO_String_Manager location; }; -class TAO_Export ServerInformation_var +class TAO_PortableServer_Export ServerInformation_var { public: ServerInformation_var (void); // default constructor @@ -608,7 +609,7 @@ private: ServerInformation *ptr_; }; -class TAO_Export ServerInformation_out +class TAO_PortableServer_Export ServerInformation_out { public: ServerInformation_out (ServerInformation *&); @@ -681,7 +682,7 @@ class ServerInformationList_var; // ServerInformationList // ************************************************************* -class TAO_Export ServerInformationList : public +class TAO_PortableServer_Export ServerInformationList : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList #else /* TAO_USE_SEQUENCE_TEMPLATES */ @@ -717,7 +718,7 @@ public: // class ImplementationRepository::ServerInformationList_var // ************************************************************* -class TAO_Export ServerInformationList_var +class TAO_PortableServer_Export ServerInformationList_var { public: ServerInformationList_var (void); // default constructor @@ -754,7 +755,7 @@ private: #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___OUT_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___OUT_CH_ -class TAO_Export ServerInformationList_out +class TAO_PortableServer_Export ServerInformationList_out { public: ServerInformationList_out (ServerInformationList *&); @@ -791,7 +792,7 @@ typedef ServerInformationIterator *ServerInformationIterator_ptr; #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_ -class TAO_Export ServerInformationIterator_var : public TAO_Base_var +class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_var { public: ServerInformationIterator_var (void); // default constructor @@ -826,7 +827,7 @@ private: #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_ -class TAO_Export ServerInformationIterator_out +class TAO_PortableServer_Export ServerInformationIterator_out { public: ServerInformationIterator_out (ServerInformationIterator_ptr &); @@ -859,7 +860,7 @@ typedef Administration *Administration_ptr; #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CH_ -class TAO_Export Administration_var : public TAO_Base_var +class TAO_PortableServer_Export Administration_var : public TAO_Base_var { public: Administration_var (void); // default constructor @@ -894,7 +895,7 @@ private: #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CH_ -class TAO_Export Administration_out +class TAO_PortableServer_Export Administration_out { public: Administration_out (Administration_ptr &); @@ -918,7 +919,7 @@ private: #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_ -class TAO_Export Administration : public virtual ACE_CORBA_1 (Object) +class TAO_PortableServer_Export Administration : public virtual ACE_CORBA_1 (Object) { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -948,7 +949,7 @@ public: #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_ALREADYREGISTERED_CH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_ALREADYREGISTERED_CH_ - class TAO_Export AlreadyRegistered : public CORBA::UserException + class TAO_PortableServer_Export AlreadyRegistered : public CORBA::UserException { public: @@ -985,7 +986,7 @@ public: #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CANNOTACTIVATE_CH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CANNOTACTIVATE_CH_ - class TAO_Export CannotActivate : public CORBA::UserException + class TAO_PortableServer_Export CannotActivate : public CORBA::UserException { public: @@ -1027,7 +1028,7 @@ public: #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_NOTFOUND_CH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_NOTFOUND_CH_ - class TAO_Export NotFound : public CORBA::UserException + class TAO_PortableServer_Export NotFound : public CORBA::UserException { public: @@ -1348,7 +1349,7 @@ typedef ServerInformationIterator *ServerInformationIterator_ptr; #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_ -class TAO_Export ServerInformationIterator_var : public TAO_Base_var +class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_var { public: ServerInformationIterator_var (void); // default constructor @@ -1383,7 +1384,7 @@ private: #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_ -class TAO_Export ServerInformationIterator_out +class TAO_PortableServer_Export ServerInformationIterator_out { public: ServerInformationIterator_out (ServerInformationIterator_ptr &); @@ -1407,7 +1408,7 @@ private: #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_ -class TAO_Export ServerInformationIterator : public virtual ACE_CORBA_1 (Object) +class TAO_PortableServer_Export ServerInformationIterator : public virtual ACE_CORBA_1 (Object) { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -1556,129 +1557,129 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformationIterator; } TAO_NAMESPACE_CLOSE // module ImplementationRepository -extern TAO_Export ImplementationRepository::ServerObject_ptr (*_TAO_collocation_ImplementationRepository_ServerObject_Stub_Factory_function_pointer) ( +extern TAO_PortableServer_Export ImplementationRepository::ServerObject_ptr (*_TAO_collocation_ImplementationRepository_ServerObject_Stub_Factory_function_pointer) ( CORBA::Object_ptr obj ); // Any operators for interface ImplementationRepository::ServerObject -TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject *&); -TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentVariable &); // copying version -TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentVariable*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentVariable *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentVariable *&); -TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentList &); // copying version -TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentList*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentList *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentList *&); -TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::ActivationMode); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ActivationMode &); -TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::StartupOptions &); // copying version -TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::StartupOptions*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::StartupOptions *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::StartupOptions *&); -TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformation &); // copying version -TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformation*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformation *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformation *&); -TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformationList &); // copying version -TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationList *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformationList *&); -extern TAO_Export ImplementationRepository::Administration_ptr (*_TAO_collocation_ImplementationRepository_Administration_Stub_Factory_function_pointer) ( +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr); +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject *&); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentVariable &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentVariable*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentVariable *&); // deprecated +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentVariable *&); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentList &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentList*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentList *&); // deprecated +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentList *&); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ActivationMode); +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ActivationMode &); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::StartupOptions &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::StartupOptions*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::StartupOptions *&); // deprecated +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::StartupOptions *&); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformation &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformation*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformation *&); // deprecated +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformation *&); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformationList &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationList *&); // deprecated +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformationList *&); +extern TAO_PortableServer_Export ImplementationRepository::Administration_ptr (*_TAO_collocation_ImplementationRepository_Administration_Stub_Factory_function_pointer) ( CORBA::Object_ptr obj ); // Any operators for interface ImplementationRepository::Administration -TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration *&); -TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::AlreadyRegistered &); // copying version -TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::AlreadyRegistered*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::AlreadyRegistered *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::AlreadyRegistered *&); -TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::CannotActivate &); // copying version -TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::CannotActivate*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::CannotActivate *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::CannotActivate *&); -TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::NotFound &); // copying version -TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::NotFound*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::NotFound *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::NotFound *&); -extern TAO_Export ImplementationRepository::ServerInformationIterator_ptr (*_TAO_collocation_ImplementationRepository_ServerInformationIterator_Stub_Factory_function_pointer) ( +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr); +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration *&); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::AlreadyRegistered &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::AlreadyRegistered*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::AlreadyRegistered *&); // deprecated +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::AlreadyRegistered *&); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::CannotActivate &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::CannotActivate*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::CannotActivate *&); // deprecated +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::CannotActivate *&); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::NotFound &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::NotFound*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::NotFound *&); // deprecated +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::NotFound *&); +extern TAO_PortableServer_Export ImplementationRepository::ServerInformationIterator_ptr (*_TAO_collocation_ImplementationRepository_ServerInformationIterator_Stub_Factory_function_pointer) ( CORBA::Object_ptr obj ); // Any operators for interface ImplementationRepository::ServerInformationIterator -TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator *&); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr); +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator *&); #ifndef __ACE_INLINE__ -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerObject_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerObject_ptr &); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::EnvironmentVariable &); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::EnvironmentVariable &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerObject_ptr ); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerObject_ptr &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::EnvironmentVariable &); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::EnvironmentVariable &); #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ -TAO_Export CORBA::Boolean operator<< ( +TAO_PortableServer_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, const ImplementationRepository::EnvironmentList & ); -TAO_Export CORBA::Boolean operator>> ( +TAO_PortableServer_Export CORBA::Boolean operator>> ( TAO_InputCDR &, ImplementationRepository::EnvironmentList & ); #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ */ -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); // -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformation &); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformation &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); // +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformation &); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformation &); #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_ #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_ -TAO_Export CORBA::Boolean operator<< ( +TAO_PortableServer_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, const ImplementationRepository::ServerInformationList & ); -TAO_Export CORBA::Boolean operator>> ( +TAO_PortableServer_Export CORBA::Boolean operator>> ( TAO_InputCDR &, ImplementationRepository::ServerInformationList & ); #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_ */ -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration_ptr &); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::AlreadyRegistered &); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::AlreadyRegistered &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration_ptr ); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration_ptr &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::AlreadyRegistered &); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::AlreadyRegistered &); # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) -TAO_Export ostream& operator<< (ostream &, const ImplementationRepository::Administration::AlreadyRegistered &); +TAO_PortableServer_Export ostream& operator<< (ostream &, const ImplementationRepository::Administration::AlreadyRegistered &); # endif /* ACE_LACKS_IOSTREAM_TOTALLY */ -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::CannotActivate &); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::CannotActivate &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::CannotActivate &); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::CannotActivate &); # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) -TAO_Export ostream& operator<< (ostream &, const ImplementationRepository::Administration::CannotActivate &); +TAO_PortableServer_Export ostream& operator<< (ostream &, const ImplementationRepository::Administration::CannotActivate &); # endif /* ACE_LACKS_IOSTREAM_TOTALLY */ -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::NotFound &); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::NotFound &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::NotFound &); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::NotFound &); # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) -TAO_Export ostream& operator<< (ostream &, const ImplementationRepository::Administration::NotFound &); +TAO_PortableServer_Export ostream& operator<< (ostream &, const ImplementationRepository::Administration::NotFound &); # endif /* ACE_LACKS_IOSTREAM_TOTALLY */ -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr ); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr ); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr &); #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i index eb9e0c35bba..8559027ff8d 100644 --- a/TAO/tao/PortableServer/ImplRepoC.i +++ b/TAO/tao/PortableServer/ImplRepoC.i @@ -1930,11 +1930,11 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_I_ #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_I_ -CORBA::Boolean TAO_Export operator<< ( +CORBA::Boolean TAO_PortableServer_Export operator<< ( TAO_OutputCDR &, const ImplementationRepository::EnvironmentList & ); -CORBA::Boolean TAO_Export operator>> ( +CORBA::Boolean TAO_PortableServer_Export operator>> ( TAO_InputCDR &, ImplementationRepository::EnvironmentList & ); @@ -2020,11 +2020,11 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_ #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_ -CORBA::Boolean TAO_Export operator<< ( +CORBA::Boolean TAO_PortableServer_Export operator<< ( TAO_OutputCDR &, const ImplementationRepository::ServerInformationList & ); -CORBA::Boolean TAO_Export operator>> ( +CORBA::Boolean TAO_PortableServer_Export operator>> ( TAO_InputCDR &, ImplementationRepository::ServerInformationList & ); diff --git a/TAO/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h index 5f3677358cf..c021add5ff8 100644 --- a/TAO/tao/PortableServer/ImplRepoS.h +++ b/TAO/tao/PortableServer/ImplRepoS.h @@ -30,7 +30,7 @@ TAO_NAMESPACE POA_ImplementationRepository { class ServerObject; typedef ServerObject *ServerObject_ptr; - class TAO_Export ServerObject : public virtual PortableServer::ServantBase + class TAO_PortableServer_Export ServerObject : public virtual PortableServer::ServantBase { protected: ServerObject (void); @@ -119,7 +119,7 @@ TAO_NAMESPACE POA_ImplementationRepository #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___THRU_POA_COLLOCATED_SH_) #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___THRU_POA_COLLOCATED_SH_ - class TAO_Export _tao_thru_poa_collocated_ServerObject : public virtual ::ImplementationRepository::ServerObject + class TAO_PortableServer_Export _tao_thru_poa_collocated_ServerObject : public virtual ::ImplementationRepository::ServerObject { public: _tao_thru_poa_collocated_ServerObject ( @@ -159,7 +159,7 @@ TAO_NAMESPACE POA_ImplementationRepository #if defined (ACE_HAS_USING_KEYWORD) // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> - class TAO_Export ServerObject_tie : public ServerObject + class TAO_PortableServer_Export ServerObject_tie : public ServerObject { public: ServerObject_tie (T &t); @@ -220,7 +220,7 @@ private: class Administration; typedef Administration *Administration_ptr; - class TAO_Export Administration : public virtual PortableServer::ServantBase + class TAO_PortableServer_Export Administration : public virtual PortableServer::ServantBase { protected: Administration (void); @@ -445,7 +445,7 @@ private: #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___THRU_POA_COLLOCATED_SH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___THRU_POA_COLLOCATED_SH_ - class TAO_Export _tao_thru_poa_collocated_Administration : public virtual ::ImplementationRepository::Administration + class TAO_PortableServer_Export _tao_thru_poa_collocated_Administration : public virtual ::ImplementationRepository::Administration { public: _tao_thru_poa_collocated_Administration ( @@ -565,7 +565,7 @@ private: #if defined (ACE_HAS_USING_KEYWORD) // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> - class TAO_Export Administration_tie : public Administration + class TAO_PortableServer_Export Administration_tie : public Administration { public: Administration_tie (T &t); @@ -706,7 +706,7 @@ private: class ServerInformationIterator; typedef ServerInformationIterator *ServerInformationIterator_ptr; - class TAO_Export ServerInformationIterator : public virtual PortableServer::ServantBase + class TAO_PortableServer_Export ServerInformationIterator : public virtual PortableServer::ServantBase { protected: ServerInformationIterator (void); @@ -797,7 +797,7 @@ private: #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___THRU_POA_COLLOCATED_SH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___THRU_POA_COLLOCATED_SH_ - class TAO_Export _tao_thru_poa_collocated_ServerInformationIterator : public virtual ::ImplementationRepository::ServerInformationIterator + class TAO_PortableServer_Export _tao_thru_poa_collocated_ServerInformationIterator : public virtual ::ImplementationRepository::ServerInformationIterator { public: _tao_thru_poa_collocated_ServerInformationIterator ( @@ -839,7 +839,7 @@ private: #if defined (ACE_HAS_USING_KEYWORD) // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> - class TAO_Export ServerInformationIterator_tie : public ServerInformationIterator + class TAO_PortableServer_Export ServerInformationIterator_tie : public ServerInformationIterator { public: ServerInformationIterator_tie (T &t); diff --git a/TAO/tao/PortableServer/Key_Adapters.h b/TAO/tao/PortableServer/Key_Adapters.h index bcd1076e5ef..aba2ccdc98b 100644 --- a/TAO/tao/PortableServer/Key_Adapters.h +++ b/TAO/tao/PortableServer/Key_Adapters.h @@ -48,7 +48,7 @@ protected: //////////////////////////////////////////////////////////////////////////////// -class TAO_Export TAO_ObjectId_Hash +class TAO_PortableServer_Export TAO_ObjectId_Hash { // = TITLE // Hashing class for Object Ids. diff --git a/TAO/tao/PortableServer/MessagingS.h b/TAO/tao/PortableServer/MessagingS.h index b103f9499db..2b5fd45a6a9 100644 --- a/TAO/tao/PortableServer/MessagingS.h +++ b/TAO/tao/PortableServer/MessagingS.h @@ -40,7 +40,7 @@ TAO_NAMESPACE POA_Messaging class ReplyHandler; typedef ReplyHandler *ReplyHandler_ptr; - class TAO_Export ReplyHandler : public virtual PortableServer::ServantBase + class TAO_PortableServer_Export ReplyHandler : public virtual PortableServer::ServantBase { protected: ReplyHandler (void); @@ -97,7 +97,7 @@ TAO_NAMESPACE POA_Messaging #if !defined (_MESSAGING_REPLYHANDLER___THRU_POA_COLLOCATED_SH_) #define _MESSAGING_REPLYHANDLER___THRU_POA_COLLOCATED_SH_ - class TAO_Export _tao_thru_poa_collocated_ReplyHandler : public virtual ::Messaging::ReplyHandler + class TAO_PortableServer_Export _tao_thru_poa_collocated_ReplyHandler : public virtual ::Messaging::ReplyHandler { public: _tao_thru_poa_collocated_ReplyHandler ( @@ -121,7 +121,7 @@ TAO_NAMESPACE POA_Messaging #if !defined (_MESSAGING_REPLYHANDLER___DIRECT_COLLOCATED_SH_) #define _MESSAGING_REPLYHANDLER___DIRECT_COLLOCATED_SH_ - class TAO_Export _tao_direct_collocated_ReplyHandler : public virtual Messaging::ReplyHandler, public virtual TAO_Collocated_Object + class TAO_PortableServer_Export _tao_direct_collocated_ReplyHandler : public virtual Messaging::ReplyHandler, public virtual TAO_Collocated_Object { public: _tao_direct_collocated_ReplyHandler ( @@ -151,7 +151,7 @@ TAO_NAMESPACE POA_Messaging #if defined (ACE_HAS_USING_KEYWORD) // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> - class TAO_Export ReplyHandler_tie : public ReplyHandler + class TAO_PortableServer_Export ReplyHandler_tie : public ReplyHandler { public: ReplyHandler_tie (T &t); diff --git a/TAO/tao/PortableServer/ORB_Manager.h b/TAO/tao/PortableServer/ORB_Manager.h index 4372ef431d5..959589542d6 100644 --- a/TAO/tao/PortableServer/ORB_Manager.h +++ b/TAO/tao/PortableServer/ORB_Manager.h @@ -26,7 +26,7 @@ #include "tao/ORB.h" -class TAO_Export TAO_ORB_Manager +class TAO_PortableServer_Export TAO_ORB_Manager { // = TITLE // Helper class for simple ORB/POA initialization and diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index ca922d2453b..09174a39788 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -733,7 +733,7 @@ TAO_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core) *orb_core); } -ACE_FACTORY_DEFINE (TAO, TAO_Object_Adapter_Factory) +ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_Object_Adapter_Factory) ACE_STATIC_SVC_DEFINE (TAO_Object_Adapter_Factory, ACE_TEXT ("TAO_POA"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h index 01c2bcbb704..546e6bbba0a 100644 --- a/TAO/tao/PortableServer/Object_Adapter.h +++ b/TAO/tao/PortableServer/Object_Adapter.h @@ -18,6 +18,7 @@ #define TAO_OBJECT_ADAPTER_H #include "ace/pre.h" +#include "portableserver_export.h" #include "Key_Adapters.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -60,7 +61,7 @@ class TAO_POA_Current_Impl; class TAO_TSS_Resources; class TAO_Transport; -class TAO_Export TAO_POA_Current : +class TAO_PortableServer_Export TAO_POA_Current : public PortableServer::Current, public TAO_Local_RefCounted_Object { @@ -90,7 +91,7 @@ public: // returning a pointer to the existing POA Current state. }; -class TAO_Export TAO_POA_Current_Impl +class TAO_PortableServer_Export TAO_POA_Current_Impl { // = TITLE // @@ -204,7 +205,7 @@ protected: void operator= (const TAO_POA_Current_Impl &); }; -class TAO_Export TAO_Object_Adapter : public TAO_Adapter +class TAO_PortableServer_Export TAO_Object_Adapter : public TAO_Adapter { // = TITLE // Defines the Object Adapter abstraction. @@ -336,7 +337,7 @@ protected: public: - class TAO_Export Hint_Strategy + class TAO_PortableServer_Export Hint_Strategy { // = TITLE // Base class for POA active hint strategy. @@ -366,7 +367,7 @@ public: TAO_Object_Adapter *object_adapter_; }; - class TAO_Export Active_Hint_Strategy : public Hint_Strategy + class TAO_PortableServer_Export Active_Hint_Strategy : public Hint_Strategy { // = TITLE // This class uses active demux hint for POA active hint @@ -402,7 +403,7 @@ public: persistent_poa_system_map persistent_poa_system_map_; }; - class TAO_Export No_Hint_Strategy : public Hint_Strategy + class TAO_PortableServer_Export No_Hint_Strategy : public Hint_Strategy { // = TITLE // This class doesn't use any hints for POA active hint @@ -514,7 +515,7 @@ protected: public: - class TAO_Export poa_name_iterator + class TAO_PortableServer_Export poa_name_iterator { // = TITLE // Iterator for a folded poa name. @@ -543,7 +544,7 @@ public: CORBA::ULong last_separator_; }; - class TAO_Export iteratable_poa_name + class TAO_PortableServer_Export iteratable_poa_name { // = TITLE // This class allows iteration over a folded poa name. @@ -561,7 +562,7 @@ public: const poa_name &folded_name_; }; - class TAO_Export Non_Servant_Upcall + class TAO_PortableServer_Export Non_Servant_Upcall { // = TITLE // This class helps us with a recursive thread lock without @@ -589,7 +590,7 @@ public: friend class Non_Servant_Upcall; - class TAO_Export Servant_Upcall + class TAO_PortableServer_Export Servant_Upcall { // = TITLE // This class finds out the POA and the servant to perform an @@ -703,7 +704,7 @@ public: #if (TAO_HAS_RT_CORBA == 1) - class TAO_Export Priority_Model_Processing + class TAO_PortableServer_Export Priority_Model_Processing { // = TITLE // This class encapsulates processing necessary for @@ -769,7 +770,7 @@ private: // **************************************************************** -class TAO_Export TAO_Object_Adapter_Factory : public TAO_Adapter_Factory +class TAO_PortableServer_Export TAO_Object_Adapter_Factory : public TAO_Adapter_Factory { public: TAO_Object_Adapter_Factory (void); @@ -781,7 +782,7 @@ public: }; ACE_STATIC_SVC_DECLARE (TAO_Object_Adapter_Factory) -ACE_FACTORY_DECLARE (TAO, TAO_Object_Adapter_Factory) +ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_Object_Adapter_Factory) // **************************************************************** diff --git a/TAO/tao/PortableServer/Operation_Table.h b/TAO/tao/PortableServer/Operation_Table.h index 5ec81a40fd3..5619abcf45a 100644 --- a/TAO/tao/PortableServer/Operation_Table.h +++ b/TAO/tao/PortableServer/Operation_Table.h @@ -18,6 +18,7 @@ #define TAO_OPTABLE_H #include "ace/pre.h" +#include "portableserver_export.h" #include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -42,7 +43,7 @@ public: // skeleton pointer }; -class TAO_Export TAO_Operation_Table +class TAO_PortableServer_Export TAO_Operation_Table { // = TITLE // Abstract class for maintaining and lookup of CORBA IDL @@ -63,7 +64,7 @@ public: virtual ~TAO_Operation_Table (void); }; -class TAO_Export TAO_Operation_Table_Factory +class TAO_PortableServer_Export TAO_Operation_Table_Factory { // = TITLE // Factory for producing operation table lookup objects based on @@ -79,7 +80,7 @@ public: // destructor }; -class TAO_Export TAO_Operation_Table_Parameters +class TAO_PortableServer_Export TAO_Operation_Table_Parameters { // = TITLE // Parameters used to create the operation table. @@ -122,7 +123,7 @@ private: // the enumerated value indicating the lookup strategy }; -class TAO_Export TAO_Dynamic_Hash_OpTable : public TAO_Operation_Table +class TAO_PortableServer_Export TAO_Dynamic_Hash_OpTable : public TAO_Operation_Table { // = TITLE // Dynamic Hashing scheme for CORBA IDL operation name lookup. @@ -166,7 +167,7 @@ private: // The hash table data structure. }; -class TAO_Export TAO_Linear_Search_OpTable : public TAO_Operation_Table +class TAO_PortableServer_Export TAO_Linear_Search_OpTable : public TAO_Operation_Table { // = TITLE // Operation table lookup strategy based on @@ -197,7 +198,7 @@ private: virtual const TAO_operation_db_entry* lookup (const char *str) = 0; }; -class TAO_Export TAO_Active_Demux_OpTable_Entry +class TAO_PortableServer_Export TAO_Active_Demux_OpTable_Entry { // = TITLE // Active Demux lookup table entry. @@ -213,7 +214,7 @@ public: // Skeleton pointer corresponding to the index. }; -class TAO_Export TAO_Active_Demux_OpTable : public TAO_Operation_Table +class TAO_PortableServer_Export TAO_Active_Demux_OpTable : public TAO_Operation_Table { // = TITLE // Implements the active demultiplexed lookup strategy. The key is @@ -249,7 +250,7 @@ private: // internal lookup table }; -class TAO_Export TAO_Perfect_Hash_OpTable : public TAO_Operation_Table +class TAO_PortableServer_Export TAO_Perfect_Hash_OpTable : public TAO_Operation_Table { // = TITLE // Helper class for use of perfect hashing operation lookup @@ -289,7 +290,7 @@ private: virtual const TAO_operation_db_entry* lookup (const char *str, unsigned int len) = 0; }; -class TAO_Export TAO_Binary_Search_OpTable : public TAO_Operation_Table +class TAO_PortableServer_Export TAO_Binary_Search_OpTable : public TAO_Operation_Table { // = TITLE // Helper class for using binary search operatin lookup strategy diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h index ee65b68f88e..de2d9860346 100644 --- a/TAO/tao/PortableServer/POA.h +++ b/TAO/tao/PortableServer/POA.h @@ -66,7 +66,7 @@ class TAO_ServerProtocolPolicy; #if (TAO_HAS_MINIMUM_POA == 0) -class TAO_Export TAO_Thread_Policy : +class TAO_PortableServer_Export TAO_Thread_Policy : public PortableServer::ThreadPolicy, public TAO_Local_RefCounted_Object { @@ -91,7 +91,7 @@ protected: #endif /* TAO_HAS_MINIMUM_POA == 0 */ -class TAO_Export TAO_Lifespan_Policy : +class TAO_PortableServer_Export TAO_Lifespan_Policy : public PortableServer::LifespanPolicy, public TAO_Local_RefCounted_Object { @@ -114,7 +114,7 @@ protected: PortableServer::LifespanPolicyValue value_; }; -class TAO_Export TAO_Id_Uniqueness_Policy : +class TAO_PortableServer_Export TAO_Id_Uniqueness_Policy : public PortableServer::IdUniquenessPolicy, public TAO_Local_RefCounted_Object { @@ -137,7 +137,7 @@ protected: PortableServer::IdUniquenessPolicyValue value_; }; -class TAO_Export TAO_Id_Assignment_Policy : +class TAO_PortableServer_Export TAO_Id_Assignment_Policy : public PortableServer::IdAssignmentPolicy, public TAO_Local_RefCounted_Object { @@ -162,7 +162,7 @@ protected: #if (TAO_HAS_MINIMUM_POA == 0) -class TAO_Export TAO_Implicit_Activation_Policy : +class TAO_PortableServer_Export TAO_Implicit_Activation_Policy : public PortableServer::ImplicitActivationPolicy, public TAO_Local_RefCounted_Object { @@ -185,7 +185,7 @@ protected: PortableServer::ImplicitActivationPolicyValue value_; }; -class TAO_Export TAO_Servant_Retention_Policy : +class TAO_PortableServer_Export TAO_Servant_Retention_Policy : public PortableServer::ServantRetentionPolicy, public TAO_Local_RefCounted_Object { @@ -208,7 +208,7 @@ protected: PortableServer::ServantRetentionPolicyValue value_; }; -class TAO_Export TAO_Request_Processing_Policy : +class TAO_PortableServer_Export TAO_Request_Processing_Policy : public PortableServer::RequestProcessingPolicy, public TAO_Local_RefCounted_Object { @@ -233,7 +233,7 @@ protected: #endif /* TAO_HAS_MINIMUM_POA == 0 */ -class TAO_Export TAO_POA_Policies +class TAO_PortableServer_Export TAO_POA_Policies { public: @@ -393,7 +393,7 @@ protected: // Forward Declaration class ServerObject_i; -class TAO_Export TAO_POA : +class TAO_PortableServer_Export TAO_POA : public PortableServer::POA, public TAO_Local_RefCounted_Object { @@ -1047,7 +1047,7 @@ private: #if (TAO_HAS_MINIMUM_POA == 0) -class TAO_Export TAO_Adapter_Activator : public PortableServer::AdapterActivator +class TAO_PortableServer_Export TAO_Adapter_Activator : public PortableServer::AdapterActivator { public: diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h index 80582bb8b3d..21f15e7c455 100644 --- a/TAO/tao/PortableServer/POAManager.h +++ b/TAO/tao/PortableServer/POAManager.h @@ -45,7 +45,7 @@ class TAO_Object_Adapter; #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_Export TAO_POA_Manager : +class TAO_PortableServer_Export TAO_POA_Manager : public PortableServer::POAManager, public TAO_Local_RefCounted_Object { diff --git a/TAO/tao/PortableServer/POA_CORBA.h b/TAO/tao/PortableServer/POA_CORBA.h index bca897f341c..22c4a7a3f84 100644 --- a/TAO/tao/PortableServer/POA_CORBA.h +++ b/TAO/tao/PortableServer/POA_CORBA.h @@ -55,7 +55,7 @@ class IR_InterfaceDef; class POA_CORBA_DomainManager; class POA_CORBA_ConstructionPolicy; -class TAO_Export POA_CORBA +class TAO_PortableServer_Export POA_CORBA { public: @@ -63,7 +63,7 @@ public: class Policy; typedef Policy *Policy_ptr; - class TAO_Export Policy : public virtual PortableServer::ServantBase + class TAO_PortableServer_Export Policy : public virtual PortableServer::ServantBase { protected: Policy (void); @@ -165,7 +165,7 @@ public: }; - class TAO_Export _tao_thru_poa_collocated_CORBA_Policy : public virtual ::CORBA_Policy + class TAO_PortableServer_Export _tao_thru_poa_collocated_CORBA_Policy : public virtual ::CORBA_Policy { public: _tao_thru_poa_collocated_CORBA_Policy ( diff --git a/TAO/tao/PortableServer/PortableServer.h b/TAO/tao/PortableServer/PortableServer.h index 362bd80c3af..825cd148eb4 100644 --- a/TAO/tao/PortableServer/PortableServer.h +++ b/TAO/tao/PortableServer/PortableServer.h @@ -19,14 +19,14 @@ #define TAO_PORTABLESERVER_H #include "ace/pre.h" -// #include "portableserver_export.h" +#include "portableserver_export.h" #include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class TAO_Export /* TAO_Portableserver_Export */ TAO_POA_Initializer +class TAO_PortableServer_Export TAO_POA_Initializer { public: static int init (void); diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h index 95ae83ba283..7d7fcabf9c0 100644 --- a/TAO/tao/PortableServer/PortableServerC.h +++ b/TAO/tao/PortableServer/PortableServerC.h @@ -12,6 +12,7 @@ #include "ace/pre.h" +#include "portableserver_export.h" #include "tao/corbafwd.h" #if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) @@ -30,13 +31,13 @@ #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif -#define TAO_EXPORT_MACRO TAO_Export +#define TAO_EXPORT_MACRO TAO_PortableServer_Export #if defined (TAO_EXPORT_NESTED_CLASSES) # if defined (TAO_EXPORT_NESTED_MACRO) # undef TAO_EXPORT_NESTED_MACRO # endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export +# define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export #endif /* TAO_EXPORT_NESTED_CLASSES */ #if defined(_MSC_VER) @@ -75,7 +76,7 @@ typedef POA *POA_ptr; #if !defined (_PORTABLESERVER_POA___VAR_CH_) #define _PORTABLESERVER_POA___VAR_CH_ - class TAO_Export POA_var : public TAO_Base_var + class TAO_PortableServer_Export POA_var : public TAO_Base_var { public: POA_var (void); // default constructor @@ -110,7 +111,7 @@ typedef POA *POA_ptr; #if !defined (_PORTABLESERVER_POA___OUT_CH_) #define _PORTABLESERVER_POA___OUT_CH_ - class TAO_Export POA_out + class TAO_PortableServer_Export POA_out { public: POA_out (POA_ptr &); @@ -184,7 +185,7 @@ typedef POA *POA_ptr; // POAList // ************************************************************* - class TAO_Export POAList : public + class TAO_PortableServer_Export POAList : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Object_Sequence_PortableServer_POAList #else /* TAO_USE_SEQUENCE_TEMPLATES */ @@ -220,7 +221,7 @@ typedef POA *POA_ptr; // class PortableServer::POAList_var // ************************************************************* - class TAO_Export POAList_var + class TAO_PortableServer_Export POAList_var { public: POAList_var (void); // default constructor @@ -257,7 +258,7 @@ typedef POA *POA_ptr; #if !defined (_PORTABLESERVER_POALIST___OUT_CH_) #define _PORTABLESERVER_POALIST___OUT_CH_ - class TAO_Export POAList_out + class TAO_PortableServer_Export POAList_out { public: POAList_out (POAList *&); @@ -290,7 +291,7 @@ typedef POA *POA_ptr; // ObjectId // ************************************************************* - class TAO_Export ObjectId : public + class TAO_PortableServer_Export ObjectId : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) TAO_Unbounded_Sequence<CORBA::Octet> #else /* TAO_USE_SEQUENCE_TEMPLATES */ @@ -335,7 +336,7 @@ typedef POA *POA_ptr; // class PortableServer::ObjectId_var // ************************************************************* - class TAO_Export ObjectId_var + class TAO_PortableServer_Export ObjectId_var { public: ObjectId_var (void); // default constructor @@ -373,7 +374,7 @@ typedef POA *POA_ptr; #if !defined (_PORTABLESERVER_OBJECTID___OUT_CH_) #define _PORTABLESERVER_OBJECTID___OUT_CH_ - class TAO_Export ObjectId_out + class TAO_PortableServer_Export ObjectId_out { public: ObjectId_out (ObjectId *&); @@ -403,7 +404,7 @@ typedef POA *POA_ptr; #if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_) #define _PORTABLESERVER_FORWARDREQUEST_CH_ - class TAO_Export ForwardRequest : public CORBA::UserException + class TAO_PortableServer_Export ForwardRequest : public CORBA::UserException { public: @@ -483,7 +484,7 @@ typedef ThreadPolicy *ThreadPolicy_ptr; #if !defined (_PORTABLESERVER_THREADPOLICY___VAR_CH_) #define _PORTABLESERVER_THREADPOLICY___VAR_CH_ -class TAO_Export ThreadPolicy_var : public TAO_Base_var +class TAO_PortableServer_Export ThreadPolicy_var : public TAO_Base_var { public: ThreadPolicy_var (void); // default constructor @@ -518,7 +519,7 @@ private: #if !defined (_PORTABLESERVER_THREADPOLICY___OUT_CH_) #define _PORTABLESERVER_THREADPOLICY___OUT_CH_ -class TAO_Export ThreadPolicy_out +class TAO_PortableServer_Export ThreadPolicy_out { public: ThreadPolicy_out (ThreadPolicy_ptr &); @@ -542,7 +543,7 @@ private: #if !defined (_PORTABLESERVER_THREADPOLICY_CH_) #define _PORTABLESERVER_THREADPOLICY_CH_ -class TAO_Export ThreadPolicy: public virtual CORBA::Policy +class TAO_PortableServer_Export ThreadPolicy: public virtual CORBA::Policy { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -614,7 +615,7 @@ typedef LifespanPolicy *LifespanPolicy_ptr; #if !defined (_PORTABLESERVER_LIFESPANPOLICY___VAR_CH_) #define _PORTABLESERVER_LIFESPANPOLICY___VAR_CH_ -class TAO_Export LifespanPolicy_var : public TAO_Base_var +class TAO_PortableServer_Export LifespanPolicy_var : public TAO_Base_var { public: LifespanPolicy_var (void); // default constructor @@ -649,7 +650,7 @@ private: #if !defined (_PORTABLESERVER_LIFESPANPOLICY___OUT_CH_) #define _PORTABLESERVER_LIFESPANPOLICY___OUT_CH_ -class TAO_Export LifespanPolicy_out +class TAO_PortableServer_Export LifespanPolicy_out { public: LifespanPolicy_out (LifespanPolicy_ptr &); @@ -673,7 +674,7 @@ private: #if !defined (_PORTABLESERVER_LIFESPANPOLICY_CH_) #define _PORTABLESERVER_LIFESPANPOLICY_CH_ -class TAO_Export LifespanPolicy: public virtual CORBA::Policy +class TAO_PortableServer_Export LifespanPolicy: public virtual CORBA::Policy { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -743,7 +744,7 @@ typedef IdUniquenessPolicy *IdUniquenessPolicy_ptr; #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CH_) #define _PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CH_ -class TAO_Export IdUniquenessPolicy_var : public TAO_Base_var +class TAO_PortableServer_Export IdUniquenessPolicy_var : public TAO_Base_var { public: IdUniquenessPolicy_var (void); // default constructor @@ -778,7 +779,7 @@ private: #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CH_) #define _PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CH_ -class TAO_Export IdUniquenessPolicy_out +class TAO_PortableServer_Export IdUniquenessPolicy_out { public: IdUniquenessPolicy_out (IdUniquenessPolicy_ptr &); @@ -802,7 +803,7 @@ private: #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY_CH_) #define _PORTABLESERVER_IDUNIQUENESSPOLICY_CH_ -class TAO_Export IdUniquenessPolicy: public virtual CORBA::Policy +class TAO_PortableServer_Export IdUniquenessPolicy: public virtual CORBA::Policy { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -872,7 +873,7 @@ typedef IdAssignmentPolicy *IdAssignmentPolicy_ptr; #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CH_) #define _PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CH_ -class TAO_Export IdAssignmentPolicy_var : public TAO_Base_var +class TAO_PortableServer_Export IdAssignmentPolicy_var : public TAO_Base_var { public: IdAssignmentPolicy_var (void); // default constructor @@ -907,7 +908,7 @@ private: #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CH_) #define _PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CH_ -class TAO_Export IdAssignmentPolicy_out +class TAO_PortableServer_Export IdAssignmentPolicy_out { public: IdAssignmentPolicy_out (IdAssignmentPolicy_ptr &); @@ -931,7 +932,7 @@ private: #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY_CH_) #define _PORTABLESERVER_IDASSIGNMENTPOLICY_CH_ -class TAO_Export IdAssignmentPolicy: public virtual CORBA::Policy +class TAO_PortableServer_Export IdAssignmentPolicy: public virtual CORBA::Policy { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -1004,7 +1005,7 @@ typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr; #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CH_) #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CH_ -class TAO_Export ImplicitActivationPolicy_var : public TAO_Base_var +class TAO_PortableServer_Export ImplicitActivationPolicy_var : public TAO_Base_var { public: ImplicitActivationPolicy_var (void); // default constructor @@ -1039,7 +1040,7 @@ private: #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CH_) #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CH_ -class TAO_Export ImplicitActivationPolicy_out +class TAO_PortableServer_Export ImplicitActivationPolicy_out { public: ImplicitActivationPolicy_out (ImplicitActivationPolicy_ptr &); @@ -1063,7 +1064,7 @@ private: #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_) #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_ -class TAO_Export ImplicitActivationPolicy: public virtual CORBA::Policy +class TAO_PortableServer_Export ImplicitActivationPolicy: public virtual CORBA::Policy { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -1138,7 +1139,7 @@ typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr; #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CH_) #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CH_ -class TAO_Export ServantRetentionPolicy_var : public TAO_Base_var +class TAO_PortableServer_Export ServantRetentionPolicy_var : public TAO_Base_var { public: ServantRetentionPolicy_var (void); // default constructor @@ -1173,7 +1174,7 @@ private: #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CH_) #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CH_ -class TAO_Export ServantRetentionPolicy_out +class TAO_PortableServer_Export ServantRetentionPolicy_out { public: ServantRetentionPolicy_out (ServantRetentionPolicy_ptr &); @@ -1197,7 +1198,7 @@ private: #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_) #define _PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_ -class TAO_Export ServantRetentionPolicy: public virtual CORBA::Policy +class TAO_PortableServer_Export ServantRetentionPolicy: public virtual CORBA::Policy { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -1273,7 +1274,7 @@ typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr; #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CH_) #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CH_ -class TAO_Export RequestProcessingPolicy_var : public TAO_Base_var +class TAO_PortableServer_Export RequestProcessingPolicy_var : public TAO_Base_var { public: RequestProcessingPolicy_var (void); // default constructor @@ -1308,7 +1309,7 @@ private: #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CH_) #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CH_ -class TAO_Export RequestProcessingPolicy_out +class TAO_PortableServer_Export RequestProcessingPolicy_out { public: RequestProcessingPolicy_out (RequestProcessingPolicy_ptr &); @@ -1332,7 +1333,7 @@ private: #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_) #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_ -class TAO_Export RequestProcessingPolicy: public virtual CORBA::Policy +class TAO_PortableServer_Export RequestProcessingPolicy: public virtual CORBA::Policy { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -1394,7 +1395,7 @@ typedef POAManager *POAManager_ptr; #if !defined (_PORTABLESERVER_POAMANAGER___VAR_CH_) #define _PORTABLESERVER_POAMANAGER___VAR_CH_ -class TAO_Export POAManager_var : public TAO_Base_var +class TAO_PortableServer_Export POAManager_var : public TAO_Base_var { public: POAManager_var (void); // default constructor @@ -1429,7 +1430,7 @@ private: #if !defined (_PORTABLESERVER_POAMANAGER___OUT_CH_) #define _PORTABLESERVER_POAMANAGER___OUT_CH_ -class TAO_Export POAManager_out +class TAO_PortableServer_Export POAManager_out { public: POAManager_out (POAManager_ptr &); @@ -1453,7 +1454,7 @@ private: #if !defined (_PORTABLESERVER_POAMANAGER_CH_) #define _PORTABLESERVER_POAMANAGER_CH_ -class TAO_Export POAManager : public virtual CORBA_Object +class TAO_PortableServer_Export POAManager : public virtual CORBA_Object { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -1482,7 +1483,7 @@ public: #if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_) #define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_ - class TAO_Export AdapterInactive : public CORBA::UserException + class TAO_PortableServer_Export AdapterInactive : public CORBA::UserException { public: @@ -1604,7 +1605,7 @@ typedef AdapterActivator *AdapterActivator_ptr; #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___VAR_CH_) #define _PORTABLESERVER_ADAPTERACTIVATOR___VAR_CH_ -class TAO_Export AdapterActivator_var : public TAO_Base_var +class TAO_PortableServer_Export AdapterActivator_var : public TAO_Base_var { public: AdapterActivator_var (void); // default constructor @@ -1639,7 +1640,7 @@ private: #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___OUT_CH_) #define _PORTABLESERVER_ADAPTERACTIVATOR___OUT_CH_ -class TAO_Export AdapterActivator_out +class TAO_PortableServer_Export AdapterActivator_out { public: AdapterActivator_out (AdapterActivator_ptr &); @@ -1663,7 +1664,7 @@ private: #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR_CH_) #define _PORTABLESERVER_ADAPTERACTIVATOR_CH_ -class TAO_Export AdapterActivator : public virtual CORBA_Object +class TAO_PortableServer_Export AdapterActivator : public virtual CORBA_Object { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -1726,7 +1727,7 @@ typedef ServantManager *ServantManager_ptr; #if !defined (_PORTABLESERVER_SERVANTMANAGER___VAR_CH_) #define _PORTABLESERVER_SERVANTMANAGER___VAR_CH_ -class TAO_Export ServantManager_var : public TAO_Base_var +class TAO_PortableServer_Export ServantManager_var : public TAO_Base_var { public: ServantManager_var (void); // default constructor @@ -1761,7 +1762,7 @@ private: #if !defined (_PORTABLESERVER_SERVANTMANAGER___OUT_CH_) #define _PORTABLESERVER_SERVANTMANAGER___OUT_CH_ -class TAO_Export ServantManager_out +class TAO_PortableServer_Export ServantManager_out { public: ServantManager_out (ServantManager_ptr &); @@ -1785,7 +1786,7 @@ private: #if !defined (_PORTABLESERVER_SERVANTMANAGER_CH_) #define _PORTABLESERVER_SERVANTMANAGER_CH_ -class TAO_Export ServantManager : public virtual CORBA_Object +class TAO_PortableServer_Export ServantManager : public virtual CORBA_Object { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -1838,7 +1839,7 @@ typedef ServantActivator *ServantActivator_ptr; #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___VAR_CH_) #define _PORTABLESERVER_SERVANTACTIVATOR___VAR_CH_ -class TAO_Export ServantActivator_var : public TAO_Base_var +class TAO_PortableServer_Export ServantActivator_var : public TAO_Base_var { public: ServantActivator_var (void); // default constructor @@ -1873,7 +1874,7 @@ private: #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___OUT_CH_) #define _PORTABLESERVER_SERVANTACTIVATOR___OUT_CH_ -class TAO_Export ServantActivator_out +class TAO_PortableServer_Export ServantActivator_out { public: ServantActivator_out (ServantActivator_ptr &); @@ -1897,7 +1898,7 @@ private: #if !defined (_PORTABLESERVER_SERVANTACTIVATOR_CH_) #define _PORTABLESERVER_SERVANTACTIVATOR_CH_ -class TAO_Export ServantActivator: public virtual ServantManager +class TAO_PortableServer_Export ServantActivator: public virtual ServantManager { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -1978,7 +1979,7 @@ typedef ServantLocator *ServantLocator_ptr; #if !defined (_PORTABLESERVER_SERVANTLOCATOR___VAR_CH_) #define _PORTABLESERVER_SERVANTLOCATOR___VAR_CH_ -class TAO_Export ServantLocator_var : public TAO_Base_var +class TAO_PortableServer_Export ServantLocator_var : public TAO_Base_var { public: ServantLocator_var (void); // default constructor @@ -2013,7 +2014,7 @@ private: #if !defined (_PORTABLESERVER_SERVANTLOCATOR___OUT_CH_) #define _PORTABLESERVER_SERVANTLOCATOR___OUT_CH_ -class TAO_Export ServantLocator_out +class TAO_PortableServer_Export ServantLocator_out { public: ServantLocator_out (ServantLocator_ptr &); @@ -2037,7 +2038,7 @@ private: #if !defined (_PORTABLESERVER_SERVANTLOCATOR_CH_) #define _PORTABLESERVER_SERVANTLOCATOR_CH_ -class TAO_Export ServantLocator: public virtual ServantManager +class TAO_PortableServer_Export ServantLocator: public virtual ServantManager { public: @@ -2125,7 +2126,7 @@ typedef POA *POA_ptr; #if !defined (_PORTABLESERVER_POA___VAR_CH_) #define _PORTABLESERVER_POA___VAR_CH_ -class TAO_Export POA_var : public TAO_Base_var +class TAO_PortableServer_Export POA_var : public TAO_Base_var { public: POA_var (void); // default constructor @@ -2160,7 +2161,7 @@ private: #if !defined (_PORTABLESERVER_POA___OUT_CH_) #define _PORTABLESERVER_POA___OUT_CH_ -class TAO_Export POA_out +class TAO_PortableServer_Export POA_out { public: POA_out (POA_ptr &); @@ -2184,7 +2185,7 @@ private: #if !defined (_PORTABLESERVER_POA_CH_) #define _PORTABLESERVER_POA_CH_ -class TAO_Export POA : public virtual CORBA_Object +class TAO_PortableServer_Export POA : public virtual CORBA_Object { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -2213,7 +2214,7 @@ public: #if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_) #define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_ - class TAO_Export AdapterAlreadyExists : public CORBA::UserException + class TAO_PortableServer_Export AdapterAlreadyExists : public CORBA::UserException { public: @@ -2248,7 +2249,7 @@ public: #if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_) #define _PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_ -class TAO_Export AdapterNonExistent : public CORBA::UserException +class TAO_PortableServer_Export AdapterNonExistent : public CORBA::UserException { public: @@ -2283,7 +2284,7 @@ static CORBA::Exception *_alloc (void); #if !defined (_PORTABLESERVER_POA_INVALIDPOLICY_CH_) #define _PORTABLESERVER_POA_INVALIDPOLICY_CH_ -class TAO_Export InvalidPolicy : public CORBA::UserException +class TAO_PortableServer_Export InvalidPolicy : public CORBA::UserException { public: @@ -2324,7 +2325,7 @@ static CORBA::Exception *_alloc (void); #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_) #define _PORTABLESERVER_POA_NOSERVANT_CH_ -class TAO_Export NoServant : public CORBA::UserException +class TAO_PortableServer_Export NoServant : public CORBA::UserException { public: @@ -2360,7 +2361,7 @@ static CORBA::Exception *_alloc (void); #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_) #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_ -class TAO_Export ObjectAlreadyActive : public CORBA::UserException +class TAO_PortableServer_Export ObjectAlreadyActive : public CORBA::UserException { public: @@ -2395,7 +2396,7 @@ static CORBA::Exception *_alloc (void); #if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_) #define _PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_ -class TAO_Export ObjectNotActive : public CORBA::UserException +class TAO_PortableServer_Export ObjectNotActive : public CORBA::UserException { public: @@ -2430,7 +2431,7 @@ static CORBA::Exception *_alloc (void); #if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_) #define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_ -class TAO_Export ServantAlreadyActive : public CORBA::UserException +class TAO_PortableServer_Export ServantAlreadyActive : public CORBA::UserException { public: @@ -2465,7 +2466,7 @@ static CORBA::Exception *_alloc (void); #if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_) #define _PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_ -class TAO_Export ServantNotActive : public CORBA::UserException +class TAO_PortableServer_Export ServantNotActive : public CORBA::UserException { public: @@ -2500,7 +2501,7 @@ static CORBA::Exception *_alloc (void); #if !defined (_PORTABLESERVER_POA_WRONGADAPTER_CH_) #define _PORTABLESERVER_POA_WRONGADAPTER_CH_ -class TAO_Export WrongAdapter : public CORBA::UserException +class TAO_PortableServer_Export WrongAdapter : public CORBA::UserException { public: @@ -2535,7 +2536,7 @@ static CORBA::Exception *_alloc (void); #if !defined (_PORTABLESERVER_POA_WRONGPOLICY_CH_) #define _PORTABLESERVER_POA_WRONGPOLICY_CH_ -class TAO_Export WrongPolicy : public CORBA::UserException +class TAO_PortableServer_Export WrongPolicy : public CORBA::UserException { public: @@ -2913,7 +2914,7 @@ typedef Current *Current_ptr; #if !defined (_PORTABLESERVER_CURRENT___VAR_CH_) #define _PORTABLESERVER_CURRENT___VAR_CH_ -class TAO_Export Current_var : public TAO_Base_var +class TAO_PortableServer_Export Current_var : public TAO_Base_var { public: Current_var (void); // default constructor @@ -2948,7 +2949,7 @@ private: #if !defined (_PORTABLESERVER_CURRENT___OUT_CH_) #define _PORTABLESERVER_CURRENT___OUT_CH_ -class TAO_Export Current_out +class TAO_PortableServer_Export Current_out { public: Current_out (Current_ptr &); @@ -2972,7 +2973,7 @@ private: #if !defined (_PORTABLESERVER_CURRENT_CH_) #define _PORTABLESERVER_CURRENT_CH_ -class TAO_Export Current: public virtual CORBA::Current +class TAO_PortableServer_Export Current: public virtual CORBA::Current { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -3001,7 +3002,7 @@ public: #if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT_CH_) #define _PORTABLESERVER_CURRENT_NOCONTEXT_CH_ - class TAO_Export NoContext : public CORBA::UserException + class TAO_PortableServer_Export NoContext : public CORBA::UserException { public: @@ -3073,42 +3074,42 @@ private: } TAO_NAMESPACE_CLOSE // module PortableServer -TAO_Export void operator<<= (CORBA::Any &, const PortableServer::ObjectId &); // copying version -TAO_Export void operator<<= (CORBA::Any &, PortableServer::ObjectId*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ObjectId *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ObjectId *&); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ObjectId &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ObjectId*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ObjectId *&); // deprecated +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ObjectId *&); #if (TAO_HAS_MINIMUM_CORBA == 0) -TAO_Export void operator<<= (CORBA::Any &, const PortableServer::ForwardRequest &); // copying version -TAO_Export void operator<<= (CORBA::Any &, PortableServer::ForwardRequest*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ForwardRequest *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ForwardRequest *&); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ForwardRequest &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ForwardRequest*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ForwardRequest *&); // deprecated +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ForwardRequest *&); #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue); +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &); #endif /* TAO_HAS_MINIMUM_POA == 0 */ -TAO_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicyValue); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicyValue &); -TAO_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicyValue); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicyValue &); -TAO_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicyValue); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicyValue &); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicyValue); +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicyValue &); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicyValue); +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicyValue &); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicyValue); +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicyValue &); #if (TAO_HAS_MINIMUM_POA == 0) -TAO_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &); -TAO_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &); -TAO_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue); -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue); +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue); +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue); +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &); #endif /* TAO_HAS_MINIMUM_POA == 0 */ @@ -3118,11 +3119,11 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Reque #if !defined _TAO_CDR_OP_PortableServer_ObjectId_H_ #define _TAO_CDR_OP_PortableServer_ObjectId_H_ -TAO_Export CORBA::Boolean operator<< ( +TAO_PortableServer_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, const PortableServer::ObjectId & ); -TAO_Export CORBA::Boolean operator>> ( +TAO_PortableServer_Export CORBA::Boolean operator>> ( TAO_InputCDR &, PortableServer::ObjectId & ); @@ -3131,8 +3132,8 @@ TAO_Export CORBA::Boolean operator>> ( #if (TAO_HAS_MINIMUM_CORBA == 0) -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &); #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ @@ -3140,7 +3141,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardReq #if (TAO_HAS_MINIMUM_CORBA == 0) -TAO_Export ostream& operator<< (ostream &, const PortableServer::ForwardRequest &); +TAO_PortableServer_Export ostream& operator<< (ostream &, const PortableServer::ForwardRequest &); #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ @@ -3148,26 +3149,26 @@ TAO_Export ostream& operator<< (ostream &, const PortableServer::ForwardRequest #if (TAO_HAS_MINIMUM_POA == 0) -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); // -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); // +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &); #endif /* TAO_HAS_MINIMUM_POA == 0 */ -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); // -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &); // -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &); // -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); // +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &); // +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &); // +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &); #if (TAO_HAS_MINIMUM_POA == 0) -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); // -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &); // -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &); // -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); // +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &); // +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &); // +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &); #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i index 9611e3a8d91..96d268517be 100644 --- a/TAO/tao/PortableServer/PortableServerC.i +++ b/TAO/tao/PortableServer/PortableServerC.i @@ -3020,11 +3020,11 @@ operator>> ( #if !defined _TAO_CDR_OP_PortableServer_ObjectId_I_ #define _TAO_CDR_OP_PortableServer_ObjectId_I_ -CORBA::Boolean TAO_Export operator<< ( +CORBA::Boolean TAO_PortableServer_Export operator<< ( TAO_OutputCDR &, const PortableServer::ObjectId & ); -CORBA::Boolean TAO_Export operator>> ( +CORBA::Boolean TAO_PortableServer_Export operator>> ( TAO_InputCDR &, PortableServer::ObjectId & ); diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h index ce27687d8a8..433b2b0002a 100644 --- a/TAO/tao/PortableServer/Servant_Base.h +++ b/TAO/tao/PortableServer/Servant_Base.h @@ -26,7 +26,7 @@ class TAO_Operation_Table; -class TAO_Export TAO_ServantBase +class TAO_PortableServer_Export TAO_ServantBase { // = TITLE // Base class for skeletons and servants. @@ -122,7 +122,7 @@ protected: // Reference count for lock. }; -class TAO_Export TAO_RefCountServantBase : public virtual TAO_ServantBase +class TAO_PortableServer_Export TAO_RefCountServantBase : public virtual TAO_ServantBase { // = TITLE // Reference counting mix-in class. @@ -182,7 +182,7 @@ private: // Reference counter. }; -class TAO_Export TAO_ServantBase_var +class TAO_PortableServer_Export TAO_ServantBase_var { // = TITLE // Auto pointer for reference counting servants. @@ -221,14 +221,14 @@ private: TAO_ServantBase *ptr_; }; -class TAO_Export TAO_Servant_Hash +class TAO_PortableServer_Export TAO_Servant_Hash { public: u_long operator () (PortableServer::Servant servant) const; // Returns hash value. }; -class TAO_Export TAO_Local_ServantBase : public virtual TAO_ServantBase +class TAO_PortableServer_Export TAO_Local_ServantBase : public virtual TAO_ServantBase { // = TITLE // Base class for local servants. @@ -254,7 +254,7 @@ protected: #if (TAO_HAS_MINIMUM_CORBA == 0) -class TAO_Export TAO_DynamicImplementation : public virtual TAO_ServantBase +class TAO_PortableServer_Export TAO_DynamicImplementation : public virtual TAO_ServantBase { // = TITLE // Base class for DSI. diff --git a/TAO/tao/PortableServer/TAO_PortableServer.dsp b/TAO/tao/PortableServer/TAO_PortableServer.dsp new file mode 100644 index 00000000000..30a370c42cf --- /dev/null +++ b/TAO/tao/PortableServer/TAO_PortableServer.dsp @@ -0,0 +1,401 @@ +# Microsoft Developer Studio Project File - Name="PortableServer" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=PortableServer - Win32 MFC Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "TAO_PortableServer.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "TAO_PortableServer.mak" CFG="PortableServer - Win32 MFC Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "PortableServer - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "PortableServer - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "PortableServer - Win32 MFC Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "PortableServer - Win32 MFC Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "PortableServer - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Release\PortableServer"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PortableServer_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "TAO_PORTABLESERVER_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 ace.lib TAO.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_PortableServer.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
+!ELSEIF "$(CFG)" == "PortableServer - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Debug\PortableServer"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PortableServer_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_PORTABLESERVER_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_PortableServerd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
+!ELSEIF "$(CFG)" == "PortableServer - Win32 MFC Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "PortableServer___Win32_MFC_Debug"
+# PROP BASE Intermediate_Dir "PortableServer___Win32_MFC_Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Debug\PortableServerMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_EVENT_BUILD_DLL" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D ACE_HAS_MFC=1 /D "TAO_PORTABLESERVER_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 TAOd.lib aced.lib TAO_Svc_Utilsd.lib TAO_RTEventd.lib TAO_RTSchedd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_PortableServerd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 TAOmfcd.lib acemfcd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_PortableServermfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
+!ELSEIF "$(CFG)" == "PortableServer - Win32 MFC Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "PortableServer___Win32_MFC_Release"
+# PROP BASE Intermediate_Dir "PortableServer___Win32_MFC_Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Release\PortableServerMFC"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_EVENT_BUILD_DLL" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D ACE_HAS_MFC=1 /D "TAO_PORTABLESERVER_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 ace.lib TAO.lib TAO_Svc_Utils.lib TAO_RTEvent.lib TAO_RTSched.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_PortableServer.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_PortableServermfc.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
+!ENDIF
+
+# Begin Target
+
+# Name "PortableServer - Win32 Release"
+# Name "PortableServer - Win32 Debug"
+# Name "PortableServer - Win32 MFC Debug"
+# Name "PortableServer - Win32 MFC Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Active_Object_Map.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Collocated_Object.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\DomainS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Forwarding_Servant.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\FT_CORBAS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ImplRepoC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ImplRepoS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Key_Adapters.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\MessagingS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Object_Adapter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Operation_Table.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ORB_Manager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\POA.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\POAManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\PolicyS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\PortableServer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\PortableServerC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Servant_Base.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\Active_Object_Map.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Collocated_Object.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\DomainS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Forwarding_Servant.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\FT_CORBAS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ImplRepoC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ImplRepoS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ImplRepoS_T.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Key_Adapters.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\MessagingS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\MessagingS_T.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Object_Adapter.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Operation_Table.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ORB_Manager.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\POA.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\POA_CORBA.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\poa_macros.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\POAManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\PortableServer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\portableserver_export.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\PortableServerC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Servant_Base.h
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter ".i"
+# Begin Source File
+
+SOURCE=.\Active_Object_Map.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Collocated_Object.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\DomainS.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\FT_CORBAS.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\ImplRepoC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\ImplRepoS.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\ImplRepoS_T.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Key_Adapters.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\MessagingS.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\MessagingS_T.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Object_Adapter.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\POA.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\POAManager.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\PortableServerC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Servant_Base.i
+# End Source File
+# End Group
+# Begin Group "Template Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\ImplRepoS_T.cpp
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=.\MessagingS_T.cpp
+# PROP Exclude_From_Build 1
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tao/PortableServer/TAO_PortableServer_Static.dsp b/TAO/tao/PortableServer/TAO_PortableServer_Static.dsp new file mode 100644 index 00000000000..b264e664c13 --- /dev/null +++ b/TAO/tao/PortableServer/TAO_PortableServer_Static.dsp @@ -0,0 +1,332 @@ +# Microsoft Developer Studio Project File - Name="PortableServer_Static" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=PortableServer_Static - Win32 Static Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "TAO_PortableServer_Static.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "TAO_PortableServer_Static.mak" CFG="PortableServer_Static - Win32 Static Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "PortableServer_Static - Win32 Static Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "PortableServer_Static - Win32 Static Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "PortableServer_Static - Win32 Static Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "LIB\Release\PortableServer"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D TAO_PORTABLESERVER_HAS_DLL=0 /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"TAO_PortableServers.lib"
+
+!ELSEIF "$(CFG)" == "PortableServer_Static - Win32 Static Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "LIB\Debug\PortableServer"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D TAO_PORTABLESERVER_HAS_DLL=0 /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"TAO_PortableServersd.lib"
+
+!ENDIF
+
+# Begin Target
+
+# Name "PortableServer_Static - Win32 Static Release"
+# Name "PortableServer_Static - Win32 Static Debug"
+# Begin Group "Template Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\ImplRepoS_T.cpp
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=.\MessagingS_T.cpp
+# PROP Exclude_From_Build 1
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter "i"
+# Begin Source File
+
+SOURCE=.\Active_Object_Map.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Collocated_Object.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\DomainS.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\FT_CORBAS.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\ImplRepoC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\ImplRepoS.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\ImplRepoS_T.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Key_Adapters.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\MessagingS.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\MessagingS_T.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Object_Adapter.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\POA.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\POAManager.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\PortableServerC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Servant_Base.i
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h"
+# Begin Source File
+
+SOURCE=.\Active_Object_Map.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Collocated_Object.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\DomainS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Forwarding_Servant.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\FT_CORBAS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ImplRepoC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ImplRepoS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ImplRepoS_T.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Key_Adapters.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\MessagingS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\MessagingS_T.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Object_Adapter.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Operation_Table.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ORB_Manager.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\POA.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\POA_CORBA.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\poa_macros.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\POAManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\PortableServer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\portableserver_export.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\PortableServerC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Servant_Base.h
+# End Source File
+# End Group
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp"
+# Begin Source File
+
+SOURCE=.\Active_Object_Map.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Collocated_Object.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\DomainS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Forwarding_Servant.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\FT_CORBAS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ImplRepoC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ImplRepoS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Key_Adapters.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\MessagingS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Object_Adapter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Operation_Table.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ORB_Manager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\POA.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\POAManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\PolicyS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\PortableServer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\PortableServerC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Servant_Base.cpp
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tao/PortableServer/portableserver_export.h b/TAO/tao/PortableServer/portableserver_export.h new file mode 100644 index 00000000000..5a102f0c2c3 --- /dev/null +++ b/TAO/tao/PortableServer/portableserver_export.h @@ -0,0 +1,40 @@ +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by +// generate_export_file.pl +// ------------------------------ +#ifndef TAO_PORTABLESERVER_EXPORT_H +#define TAO_PORTABLESERVER_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (TAO_PORTABLESERVER_HAS_DLL) +#define TAO_PORTABLESERVER_HAS_DLL 1 +#endif /* ! TAO_PORTABLESERVER_HAS_DLL */ + +#if defined (TAO_PORTABLESERVER_HAS_DLL) +# if (TAO_PORTABLESERVER_HAS_DLL == 1) +# if defined (TAO_PORTABLESERVER_BUILD_DLL) +# define TAO_PortableServer_Export ACE_Proper_Export_Flag +# define TAO_PORTABLESERVER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define TAO_PORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else +# define TAO_PortableServer_Export ACE_Proper_Import_Flag +# define TAO_PORTABLESERVER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define TAO_PORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* TAO_PORTABLESERVER_BUILD_DLL */ +# else +# define TAO_PortableServer_Export +# define TAO_PORTABLESERVER_SINGLETON_DECLARATION(T) +# define TAO_PORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* ! TAO_PORTABLESERVER_HAS_DLL == 1 */ +#else +# define TAO_PortableServer_Export +# define TAO_PORTABLESERVER_SINGLETON_DECLARATION(T) +# define TAO_PORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* TAO_PORTABLESERVER_HAS_DLL */ + +#endif /* TAO_PORTABLESERVER_EXPORT_H */ + +// End of auto generated file. diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp index dc61c57a323..53102d74bb6 100644 --- a/TAO/tao/TAO.dsp +++ b/TAO/tao/TAO.dsp @@ -233,6 +233,25 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
+SOURCE=.\Acceptor_Filter.cpp
+
+!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\Acceptor_Registry.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
@@ -252,7 +271,7 @@ SOURCE=.\Acceptor_Registry.cpp # End Source File
# Begin Source File
-SOURCE=.\Active_Object_Map.cpp
+SOURCE=.\Adapter.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
@@ -727,25 +746,6 @@ SOURCE=.\DomainC.cpp # End Source File
# Begin Source File
-SOURCE=.\DomainS.cpp
-
-!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\DynamicC.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
@@ -841,25 +841,6 @@ SOURCE=.\Exclusive_TMS.cpp # End Source File
# Begin Source File
-SOURCE=.\Forwarding_Servant.cpp
-
-!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\FT_CORBAC.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
@@ -879,25 +860,6 @@ SOURCE=.\FT_CORBAC.cpp # End Source File
# Begin Source File
-SOURCE=.\FT_CORBAS.cpp
-
-!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\GIOP_Message_Accept_State.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
@@ -1221,63 +1183,6 @@ SOURCE=.\IIOP_Transport.cpp # End Source File
# Begin Source File
-SOURCE=.\ImplRepoC.cpp
-
-!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\ImplRepoS.cpp
-
-!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\ImplRepoS_T.cpp
-
-!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\InterfaceC.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
@@ -1411,25 +1316,6 @@ SOURCE=.\IORManipulation.cpp # End Source File
# Begin Source File
-SOURCE=.\Key_Adapters.cpp
-
-!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\Leader_Follower.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
@@ -1563,25 +1449,6 @@ SOURCE=.\MessagingC.cpp # End Source File
# Begin Source File
-SOURCE=.\MessagingS.cpp
-
-!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\MProfile.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
@@ -1658,25 +1525,6 @@ SOURCE=.\Object.cpp # End Source File
# Begin Source File
-SOURCE=.\Object_Adapter.cpp
-
-!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\Object_KeyC.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
@@ -1753,25 +1601,6 @@ SOURCE=.\operation_details.cpp # End Source File
# Begin Source File
-SOURCE=.\Operation_Table.cpp
-
-!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\ORB.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
@@ -1886,44 +1715,6 @@ SOURCE=.\Pluggable_Messaging_Utils.cpp # End Source File
# Begin Source File
-SOURCE=.\POA.cpp
-
-!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\POAManager.cpp
-
-!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\Policy_Factory.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
@@ -1981,25 +1772,6 @@ SOURCE=.\PolicyC.cpp # End Source File
# Begin Source File
-SOURCE=.\PolicyS.cpp
-
-!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\PollableC.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
@@ -2095,25 +1867,6 @@ SOURCE=.\PortableInterceptorC.cpp # End Source File
# Begin Source File
-SOURCE=.\PortableServerC.cpp
-
-!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\Principal.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
@@ -2475,25 +2228,6 @@ SOURCE=.\Sequence.cpp # End Source File
# Begin Source File
-SOURCE=.\Servant_Base.cpp
-
-!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\Server_Request.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
@@ -2817,25 +2551,6 @@ SOURCE=.\Tagged_Profile.cpp # End Source File
# Begin Source File
-SOURCE=.\TAO.cpp
-
-!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\TAO_Internal.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
@@ -3315,11 +3030,15 @@ SOURCE=.\WrongTransactionC.cpp # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
# Begin Source File
+SOURCE=.\Acceptor_Filter.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Acceptor_Registry.h
# End Source File
# Begin Source File
-SOURCE=.\Active_Object_Map.h
+SOURCE=.\Adapter.h
# End Source File
# Begin Source File
@@ -3443,18 +3162,10 @@ SOURCE=.\Exclusive_TMS.h # End Source File
# Begin Source File
-SOURCE=.\Forwarding_Servant.h
-# End Source File
-# Begin Source File
-
SOURCE=.\FT_CORBAC.h
# End Source File
# Begin Source File
-SOURCE=.\FT_CORBAS.h
-# End Source File
-# Begin Source File
-
SOURCE=.\ftcorbafwd.h
# End Source File
# Begin Source File
@@ -3511,18 +3222,6 @@ SOURCE=.\IIOP_Transport.h # End Source File
# Begin Source File
-SOURCE=.\ImplRepoC.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ImplRepoS.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ImplRepoS_T.h
-# End Source File
-# Begin Source File
-
SOURCE=.\InterfaceC.h
# End Source File
# Begin Source File
@@ -3599,10 +3298,6 @@ SOURCE=.\object.h # End Source File
# Begin Source File
-SOURCE=.\Object_Adapter.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Object_KeyC.h
# End Source File
# Begin Source File
@@ -3615,10 +3310,6 @@ SOURCE=.\ObjectIDList.h # End Source File
# Begin Source File
-SOURCE=.\Operation_Table.h
-# End Source File
-# Begin Source File
-
SOURCE=.\orb.h
# End Source File
# Begin Source File
@@ -3643,22 +3334,6 @@ SOURCE=.\Pluggable.h # End Source File
# Begin Source File
-SOURCE=.\poa.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\POA_CORBA.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\poa_macros.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\POAManager.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Policy_Factory.h
# End Source File
# Begin Source File
@@ -3691,10 +3366,6 @@ SOURCE=.\PortableInterceptorC.h # End Source File
# Begin Source File
-SOURCE=.\PortableServerC.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Principal.h
# End Source File
# Begin Source File
@@ -3775,10 +3446,6 @@ SOURCE=.\Sequence_T.h # End Source File
# Begin Source File
-SOURCE=.\servant_base.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Server_Request.h
# End Source File
# Begin Source File
@@ -3847,10 +3514,6 @@ SOURCE=.\Tagged_Profile.h # End Source File
# Begin Source File
-SOURCE=.\TAO.h
-# End Source File
-# Begin Source File
-
SOURCE=.\TAO_Export.h
# End Source File
# Begin Source File
@@ -3959,6 +3622,10 @@ SOURCE=.\WrongTransactionC.h # PROP Default_Filter "i"
# Begin Source File
+SOURCE=.\Acceptor_Filter.i
+# End Source File
+# Begin Source File
+
SOURCE=.\Acceptor_Registry.i
# End Source File
# Begin Source File
@@ -3967,6 +3634,10 @@ SOURCE=.\Active_Object_Map.i # End Source File
# Begin Source File
+SOURCE=.\Adapter.i
+# End Source File
+# Begin Source File
+
SOURCE=.\any.i
# End Source File
# Begin Source File
@@ -4087,18 +3758,6 @@ SOURCE=.\IIOP_ORB.i # End Source File
# Begin Source File
-SOURCE=.\ImplRepoC.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\ImplRepoS.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\ImplRepoS_T.i
-# End Source File
-# Begin Source File
-
SOURCE=.\InterfaceC.i
# End Source File
# Begin Source File
diff --git a/TAO/tao/TAO.dsw b/TAO/tao/TAO.dsw index b6309e0748e..87e0b750220 100644 --- a/TAO/tao/TAO.dsw +++ b/TAO/tao/TAO.dsw @@ -33,6 +33,33 @@ Package=<4> ###############################################################################
+Project: "PortableServer"=.\PortableServer\TAO_PortableServer.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name TAO DLL
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "PortableServer_Static"=.\PortableServer\TAO_PortableServer_Static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "TAO DLL"=.\TAO.dsp - Package Owner=<4>
Package=<5>
diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp index 995cf79f164..453a2376f6f 100644 --- a/TAO/tao/TAO_Static.dsp +++ b/TAO/tao/TAO_Static.dsp @@ -87,6 +87,10 @@ LIB32=link.exe -lib # PROP Default_Filter "h"
# Begin Source File
+SOURCE=.\Acceptor_Filter.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Acceptor_Registry.h
# End Source File
# Begin Source File
@@ -95,6 +99,10 @@ SOURCE=.\Active_Object_Map.h # End Source File
# Begin Source File
+SOURCE=.\Adapter.h
+# End Source File
+# Begin Source File
+
SOURCE=.\any.h
# End Source File
# Begin Source File
@@ -283,18 +291,6 @@ SOURCE=.\IIOP_Transport.h # End Source File
# Begin Source File
-SOURCE=.\ImplRepoC.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ImplRepoS.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ImplRepoS_T.h
-# End Source File
-# Begin Source File
-
SOURCE=.\InterfaceC.h
# End Source File
# Begin Source File
@@ -459,10 +455,6 @@ SOURCE=.\PortableInterceptorC.h # End Source File
# Begin Source File
-SOURCE=.\PortableServerC.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Principal.h
# End Source File
# Begin Source File
@@ -719,6 +711,10 @@ SOURCE=.\WrongTransactionC.h # PROP Default_Filter "i"
# Begin Source File
+SOURCE=.\Acceptor_Filter.i
+# End Source File
+# Begin Source File
+
SOURCE=.\Acceptor_Registry.i
# End Source File
# Begin Source File
@@ -727,6 +723,10 @@ SOURCE=.\Active_Object_Map.i # End Source File
# Begin Source File
+SOURCE=.\Adapter.i
+# End Source File
+# Begin Source File
+
SOURCE=.\any.i
# End Source File
# Begin Source File
@@ -843,18 +843,6 @@ SOURCE=.\IIOP_ORB.i # End Source File
# Begin Source File
-SOURCE=.\ImplRepoC.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\ImplRepoS.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\ImplRepoS_T.i
-# End Source File
-# Begin Source File
-
SOURCE=.\InterfaceC.i
# End Source File
# Begin Source File
@@ -967,10 +955,6 @@ SOURCE=.\PortableInterceptorC.i # End Source File
# Begin Source File
-SOURCE=.\PortableServerC.i
-# End Source File
-# Begin Source File
-
SOURCE=.\Priority_Mapping.i
# End Source File
# Begin Source File
@@ -1147,6 +1131,10 @@ SOURCE=.\TAO_Singleton.cpp # PROP Default_Filter "cpp"
# Begin Source File
+SOURCE=.\Acceptor_Filter.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Acceptor_Registry.cpp
# End Source File
# Begin Source File
@@ -1155,6 +1143,10 @@ SOURCE=.\Active_Object_Map.cpp # End Source File
# Begin Source File
+SOURCE=.\Adapter.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Any.cpp
# End Source File
# Begin Source File
@@ -1355,18 +1347,6 @@ SOURCE=.\IIOP_Transport.cpp # End Source File
# Begin Source File
-SOURCE=.\ImplRepoC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ImplRepoS.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ImplRepoS_T.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\InterfaceC.cpp
# End Source File
# Begin Source File
@@ -1395,10 +1375,6 @@ SOURCE=.\IORManipulation.cpp # End Source File
# Begin Source File
-SOURCE=.\Key_Adapters.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\Leader_Follower.cpp
# End Source File
# Begin Source File
@@ -1447,10 +1423,6 @@ SOURCE=.\Object.cpp # End Source File
# Begin Source File
-SOURCE=.\Object_Adapter.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\Object_KeyC.cpp
# End Source File
# Begin Source File
@@ -1467,10 +1439,6 @@ SOURCE=.\operation_details.cpp # End Source File
# Begin Source File
-SOURCE=.\Operation_Table.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\ORB.cpp
# End Source File
# Begin Source File
@@ -1495,14 +1463,6 @@ SOURCE=.\Pluggable_Messaging_Utils.cpp # End Source File
# Begin Source File
-SOURCE=.\POA.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\POAManager.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\Policy_Factory.cpp
# End Source File
# Begin Source File
@@ -1515,10 +1475,6 @@ SOURCE=.\PolicyC.cpp # End Source File
# Begin Source File
-SOURCE=.\PolicyS.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\PollableC.cpp
# End Source File
# Begin Source File
@@ -1535,10 +1491,6 @@ SOURCE=.\PortableInterceptor.cpp # End Source File
# Begin Source File
-SOURCE=.\PortableInterceptorC.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\PortableServerC.cpp
# End Source File
# Begin Source File
@@ -1619,10 +1571,6 @@ SOURCE=.\Sequence.cpp # End Source File
# Begin Source File
-SOURCE=.\Servant_Base.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\Server_Request.cpp
# End Source File
# Begin Source File
@@ -1691,10 +1639,6 @@ SOURCE=.\Tagged_Profile.cpp # End Source File
# Begin Source File
-SOURCE=.\TAO.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\TAO_Internal.cpp
# End Source File
# Begin Source File
|