Versioned namespace fixes

    * ACE/ace/Logging_Strategy.cpp:
    * ACE/ace/Logging_Strategy.h:
    * ACE/ace/Naming_Context.cpp:
    * ACE/ace/Naming_Context.h:

4 files changed, 9 insertions, 9 deletions

diff --git a/ACE/ace/Logging_Strategy.cpp b/ACE/ace/Logging_Strategy.cpp
index b520b0f1abb..78f5ac0acf7 100644
--- a/ACE/ace/Logging_Strategy.cpp
+++ b/ACE/ace/Logging_Strategy.cpp
@@ -614,8 +614,6 @@ ACE_Logging_Strategy::log_msg (ACE_Log_Msg *log_msg)
   this->log_msg_  = log_msg;
 }
 
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 // The following is a "Factory" used by the ACE_Service_Config and
 // svc.conf file to dynamically initialize the state of the
 // Logging_Strategy.
@@ -629,6 +627,8 @@ ACE_STATIC_SVC_DEFINE (ACE_Logging_Strategy,
 
 ACE_FACTORY_DEFINE (ACE, ACE_Logging_Strategy)
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 // _get_dll_unload_policy() prevents ACE from being unloaded and having its
 // framework components run down if/when the Logging Strategy is unloaded.
 extern "C" ACE_Export int
diff --git a/ACE/ace/Logging_Strategy.h b/ACE/ace/Logging_Strategy.h
index 5ef1b7b3d04..140e3352a23 100644
--- a/ACE/ace/Logging_Strategy.h
+++ b/ACE/ace/Logging_Strategy.h
@@ -203,10 +203,10 @@ protected:
   ACE_Log_Msg *log_msg_;
 };
 
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 ACE_STATIC_SVC_DECLARE_EXPORT(ACE, ACE_Logging_Strategy)
 
 ACE_FACTORY_DECLARE (ACE, ACE_Logging_Strategy)
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_LOGGING_STRATEGY_H */
diff --git a/ACE/ace/Naming_Context.cpp b/ACE/ace/Naming_Context.cpp
index ddfad7f9653..52f70b31d1c 100644
--- a/ACE/ace/Naming_Context.cpp
+++ b/ACE/ace/Naming_Context.cpp
@@ -664,8 +664,6 @@ ACE_Name_Options::parse_args (int argc, ACE_TCHAR *argv[])
       }
 }
 
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 // The following Factory is used by the ACE_Service_Config and
 // svc.conf file to dynamically initialize the state of the Name
 // Server client.
@@ -679,3 +677,5 @@ ACE_STATIC_SVC_DEFINE (ACE_Naming_Context,
                        ACE_Service_Type::DELETE_OBJ,
                        0)
 ACE_STATIC_SVC_REQUIRE (ACE_Naming_Context)
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Naming_Context.h b/ACE/ace/Naming_Context.h
index 5fded00ca4c..ec85bb6450e 100644
--- a/ACE/ace/Naming_Context.h
+++ b/ACE/ace/Naming_Context.h
@@ -373,14 +373,14 @@ private:
   ACE_Naming_Context::Context_Scope_Type context_;
 };
 
+ACE_FACTORY_DECLARE (ACE, ACE_Naming_Context)
+ACE_STATIC_SVC_DECLARE_EXPORT (ACE, ACE_Naming_Context)
+
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "ace/Naming_Context.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_FACTORY_DECLARE (ACE, ACE_Naming_Context)
-ACE_STATIC_SVC_DECLARE_EXPORT (ACE, ACE_Naming_Context)
-
 #include /**/ "ace/post.h"
 #endif /* ACE_NAMING_CONTEXT_H */