ChangeLogTag:Tue Nov 15 23:41:39 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

9 files changed, 54 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 7a12d2182a7..668cd463f89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Tue Nov 15 23:41:39 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* ace/Service_Config.cpp (ACE_FACTORY_DEFINE):
+
+	  Moved this macro call outside of the versioned namespace.  It
+	  should be in the global namespace.
+
+	* ace/Svc_Conf.h:
+	* ace/Svc_Conf.l:
+	* ace/Svc_Conf.y:
+	* ace/Svc_Conf_Lexer_Guard.cpp:
+	* ace/Svc_Conf_Lexer_Guard.h:
+	* ace/Svc_Conf_l.cpp:
+	* ace/Svc_Conf_y.cpp:
+
+	  Added missing versioned namespace macros.
+
 Tue Nov 15 15:41:19 2005  Steve Huston  <shuston@riverace.com>
 
 	* NEWS: Added WinCE, VC8, ACE_Dev_Poll_Reactor, and ACE_RB_Tree notes.
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 88caeb8bdbe..40c17d27c7e 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -46,13 +46,6 @@ ACE_Service_Config::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-// All the factory functions that allocate default statically linked
-// services should be placed below.
-
-// Allocate a Service Manager.
-
-ACE_FACTORY_DEFINE (ACE, ACE_Service_Manager)
-
 // ----------------------------------------
 
 // Set the signal handler to point to the handle_signal() function.
@@ -927,3 +920,10 @@ ACE_Service_Config::start_daemon (void)
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
+
+// All the factory functions that allocate default statically linked
+// services should be placed below.
+
+// Allocate a Service Manager.
+
+ACE_FACTORY_DEFINE (ACE, ACE_Service_Manager)
diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h
index 73dc88b1e3d..002654d322e 100644
--- a/ace/Svc_Conf.h
+++ b/ace/Svc_Conf.h
@@ -30,6 +30,8 @@
 
 #if (ACE_USES_CLASSIC_SVC_CONF == 1)
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 struct ace_yy_buffer_state;
 
@@ -200,6 +202,8 @@ ace_create_service_type (const ACE_TCHAR *,
                          ACE_Service_Object_Exterminator = 0);
 
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_SVC_CONF_H */
diff --git a/ace/Svc_Conf.l b/ace/Svc_Conf.l
index 8943882cdf7..b8755c12881 100644
--- a/ace/Svc_Conf.l
+++ b/ace/Svc_Conf.l
@@ -12,6 +12,8 @@ ACE_RCSID (ace,
 	   Svc_Conf_l,
 	   "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #define token(x)  x
 %}
 
@@ -132,3 +134,5 @@ yy_pop_buffer (yy_buffer_state *buffer)
 
   yy_switch_to_buffer (buffer);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
\ No newline at end of file
diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y
index 005f8ad972a..cb159d68b2f 100644
--- a/ace/Svc_Conf.y
+++ b/ace/Svc_Conf.y
@@ -16,6 +16,7 @@ ACE_RCSID (ace,
            Svc_Conf_y,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Prototypes.
 static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec,
@@ -428,4 +429,7 @@ main (int argc, char *argv[])
   return ::yyparse (&param);
 }
 #endif /* DEBUGGING */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* ACE_USES_CLASSIC_SVC_CONF == 1 */
diff --git a/ace/Svc_Conf_Lexer_Guard.cpp b/ace/Svc_Conf_Lexer_Guard.cpp
index 8429d1ea7f4..12649dbdf80 100644
--- a/ace/Svc_Conf_Lexer_Guard.cpp
+++ b/ace/Svc_Conf_Lexer_Guard.cpp
@@ -10,6 +10,8 @@ ACE_RCSID (ace,
            Svc_Conf_Lexer_Guard,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_Svc_Conf_Lexer_Guard::ACE_Svc_Conf_Lexer_Guard (ACE_Svc_Conf_Param *param)
   : buffer_ (0)
 {
@@ -37,4 +39,6 @@ ACE_Svc_Conf_Lexer_Guard::~ACE_Svc_Conf_Lexer_Guard (void)
   ::ace_yy_pop_buffer (this->buffer_);
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */
diff --git a/ace/Svc_Conf_Lexer_Guard.h b/ace/Svc_Conf_Lexer_Guard.h
index 281ca2a6403..18baa0a50a1 100644
--- a/ace/Svc_Conf_Lexer_Guard.h
+++ b/ace/Svc_Conf_Lexer_Guard.h
@@ -21,6 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Forward declarations
 class ACE_Svc_Conf_Param;
 
@@ -73,6 +75,8 @@ private:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* ACE_SVC_CONF_LEXER_GUARD_H */
diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp
index 7d820243d36..7abadc0b117 100644
--- a/ace/Svc_Conf_l.cpp
+++ b/ace/Svc_Conf_l.cpp
@@ -522,6 +522,8 @@ ACE_RCSID (ace,
            Svc_Conf_l,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 #define token(x)  x
 #define PARAMETERS 1
 
@@ -1847,4 +1849,7 @@ ace_yy_pop_buffer (ace_yy_buffer_state *buffer)
 
   ace_yy_switch_to_buffer (buffer);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_USES_CLASSIC_SVC_CONF = 1 */
diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp
index 8dff0b36c20..deeb98403de 100644
--- a/ace/Svc_Conf_y.cpp
+++ b/ace/Svc_Conf_y.cpp
@@ -37,6 +37,8 @@ ACE_RCSID (ace,
            "$Id$")
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Prototypes.
 static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec,
                                         ACE_Static_Node *svc_type,
@@ -1523,4 +1525,7 @@ main (int argc, ACE_TCHAR *argv[])
   return ::ace_yyparse (&param);
 }
 #endif /* DEBUGGING */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif  /* ACE_USES_CLASSIC_SVC_CONF == 1 */