diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2006-05-15 18:21:35 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2006-05-15 18:21:35 +0000 |
| commit | 2c87240c207c439a0c868b8094214fbcaaddd18e (patch) | |
| tree | 2644edc860f5cd1f7225758cba6fad70680ed8fe | |
| parent | 5b0b92a45c3285b74149e09cd27761f9554d1d83 (diff) | |
| download | ATCD-2c87240c207c439a0c868b8094214fbcaaddd18e.tar.gz | |
ChangeLog tag: Mon May 15 18:17:23 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 12 | ||||
| -rw-r--r-- | TAO/tao/Codeset_Manager_Factory_Base.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/Codeset_Manager_Factory_Base.h | 4 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Acceptor_Filter_Factory.h | 5 |
5 files changed, 23 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c90f23b67b9..b59d69446f8 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Mon May 15 18:17:23 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * tao/Codeset_Manager_Factory_Base.h: + * tao/Codeset_Manager_Factory_Base.cpp: + * tao/PortableServer/Acceptor_Filter_Factory.h: + * tao/PortableServer/Acceptor_Filter_Factory.cpp: + + Moved the static initializer from inside the .cpp to the header + file. This change was necesitated by the VC7.1 static build that + was apparently skipping over the static initializer if it wasn't + in the .h. + Mon May 15 13:28:01 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> * tests/AMI_Buffering/AMI_Buffering.h: diff --git a/TAO/tao/Codeset_Manager_Factory_Base.cpp b/TAO/tao/Codeset_Manager_Factory_Base.cpp index 644068d4070..96a37e46d02 100644 --- a/TAO/tao/Codeset_Manager_Factory_Base.cpp +++ b/TAO/tao/Codeset_Manager_Factory_Base.cpp @@ -36,9 +36,11 @@ TAO_Codeset_Manager_Factory_Base::initialize (void) TAO_END_VERSIONED_NAMESPACE_DECL +#if 0 static int TAO_Requires_Codeset_Manager_Factory_Base = TAO_Codeset_Manager_Factory_Base::initialize (); +#endif ACE_FACTORY_DEFINE (TAO, TAO_Codeset_Manager_Factory_Base) ACE_STATIC_SVC_DEFINE (TAO_Codeset_Manager_Factory_Base, diff --git a/TAO/tao/Codeset_Manager_Factory_Base.h b/TAO/tao/Codeset_Manager_Factory_Base.h index 8fcb63d51c3..bb7ed57bb88 100644 --- a/TAO/tao/Codeset_Manager_Factory_Base.h +++ b/TAO/tao/Codeset_Manager_Factory_Base.h @@ -63,6 +63,10 @@ public: static int initialize (void); }; +static int +TAO_Requires_Base_Codeset_Initializer = + TAO_Codeset_Manager_Factory_Base::initialize (); + TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_Codeset_Manager_Factory_Base) diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp index 033aace13b3..06c7b2c22b2 100644 --- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp +++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp @@ -36,10 +36,6 @@ TAO_Acceptor_Filter_Factory::initialize (void) TAO_END_VERSIONED_NAMESPACE_DECL -static int -TAO_Requires_Acceptor_Filter_Factory = -TAO_Acceptor_Filter_Factory::initialize (); - ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_Acceptor_Filter_Factory) ACE_STATIC_SVC_DEFINE (TAO_Acceptor_Filter_Factory, ACE_TEXT ("TAO_Acceptor_Filter_Factory"), diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h index 4c7d2fb2dea..ae855be04da 100644 --- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h +++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h @@ -58,6 +58,11 @@ public: }; + +static int +TAO_Requires_Acceptor_Filter_Factory = +TAO_Acceptor_Filter_Factory::initialize (); + TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_Acceptor_Filter_Factory) |