changed the order of parameters to avoid breaking legacy code.

5 files changed, 21 insertions, 12 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
index 086e67d52bf..2baa4fc0010 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
@@ -20,10 +20,10 @@ TAO_Naming_Server::TAO_Naming_Server (void)
 
 TAO_Naming_Server::TAO_Naming_Server (CORBA::ORB_ptr orb,
                                       PortableServer::POA_ptr poa,
-                                      LPCTSTR persistence_location,
                                       size_t context_size,
                                       ACE_Time_Value *timeout,
-                                      int resolve_for_existing_naming_service)
+                                      int resolve_for_existing_naming_service,
+                                      LPCTSTR persistence_location)
   : naming_context_impl_ (0),
     naming_context_ (),
     ior_multicast_ (0),
@@ -31,10 +31,10 @@ TAO_Naming_Server::TAO_Naming_Server (CORBA::ORB_ptr orb,
 {
   if (this->init (orb,
                   poa,
-                  persistence_location,
                   context_size,
                   timeout,
-                  resolve_for_existing_naming_service) == -1)
+                  resolve_for_existing_naming_service,
+                  persistence_location) == -1)
     ACE_ERROR ((LM_ERROR,
                 "(%P|%t) %p\n",
                 "TAO_Naming_Server::init"));
@@ -44,10 +44,10 @@ TAO_Naming_Server::TAO_Naming_Server (CORBA::ORB_ptr orb,
 int
 TAO_Naming_Server::init (CORBA::ORB_ptr orb,
                          PortableServer::POA_ptr poa,
-                         LPCTSTR persistence_location,
                          size_t context_size,
                          ACE_Time_Value *timeout,
-                         int resolve_for_existing_naming_service)
+                         int resolve_for_existing_naming_service,
+                         LPCTSTR persistence_location)
 {
   CORBA::Object_var naming_obj;
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
index 206f0a7115f..699c883ab97 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
@@ -48,20 +48,20 @@ public:
 
   TAO_Naming_Server (CORBA::ORB_ptr orb,
                      PortableServer::POA_ptr poa,
-                     LPCTSTR persistence_location,
                      size_t context_size = ACE_DEFAULT_MAP_SIZE,
                      ACE_Time_Value *timeout = 0,
-                     int resolve_for_existing_naming_service = 1);
+                     int resolve_for_existing_naming_service = 1,
+                     LPCTSTR persistence_location = 0);
   // Either find an existing Naming Service or creates one.  Takes the
   // POA under which to register the Naming Service implementation
   // object.
 
   int init (CORBA::ORB_ptr orb,
             PortableServer::POA_ptr poa,
-            LPCTSTR persistence_location = 0,
             size_t context_size = ACE_DEFAULT_MAP_SIZE,
             ACE_Time_Value *timeout = 0,
-            int resolve_for_existing_naming_service = 1);
+            int resolve_for_existing_naming_service = 1,
+            LPCTSTR persistence_location = 0);
   // Either find an existing Naming Service or creates one.  Takes the
   // POA under which to register the Naming Service implementation
   // object.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp
index 5944f4995ed..ea21384647f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp
@@ -204,6 +204,8 @@ TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::init (void)
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
 TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::recreate_all (void)
 {
+  // We can't use our INDEX typedef here because of the broken old g++!
+
   ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,
     TAO_Persistent_Index_IntId>::ITERATOR * index_iter = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
index da9f5e1075e..6b97cbf7a0d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
@@ -480,8 +480,11 @@ TAO_Persistent_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
                    this->poa_id_.c_str (),
                    (*this->counter_)++);
 
-  ACE_DEBUG ((LM_DEBUG, "The poa id of the newly created context is: %s \n", poa_id));
-  ACE_DEBUG ((LM_DEBUG, "The new value of the counter is: %d\n", (*counter_)));
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "Created a new Naming Context with poa_id %s and counter %d\n",
+                poa_id,
+                (*counter_)));
 
   ACE_NEW_THROW_EX (c,
                     TAO_Naming_Context,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/README b/TAO/orbsvcs/orbsvcs/Naming/README
index 17912d42039..e43b9da0167 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/README
+++ b/TAO/orbsvcs/orbsvcs/Naming/README
@@ -25,6 +25,10 @@ Below is the list of player classes:
    'ConcreteImplementor' which uses ACE_Hash_Map_Manager to implement
    NamingContext functionality.
 
+ * A set of classes implementing a persistent version of the Naming
+   Context functionality.  These are the classes in
+   Shared_Hash_Map_T.{h, cpp}, and Persistent* files.
+
 The class structure described above makes it easy to:
 
 1) Create and plug different Naming Service implementations by