Commented out code to just get it to compile now.

2 files changed, 44 insertions, 40 deletions

diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
index 05255e6ffca..4c5fc4e5456 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
@@ -508,7 +508,7 @@ ImplRepo_i::list (CORBA::ULong how_many,
     n = this->repository_.get_repository_size ();
 
 
-  
+/*  
   // A pointer to BindingIterator servant.
   TAO_Hash_Binding_Iterator *bind_iter = 0;
 
@@ -573,7 +573,7 @@ ImplRepo_i::list (CORBA::ULong how_many,
         }
       ACE_ENDTRY;
       ACE_CHECK;
-    }
+    }*/
 }
 
 
@@ -779,51 +779,55 @@ IR_Iterator::next_n (CORBA::ULong how_many,
                      ImplementationRepository::ServerInformationList_out server_list,
                      CORBA::Environment &ACE_TRY_ENV)
 {
-  // We perform an allocation before obtaining the lock so that an out
-  // parameter is allocated in case we fail to obtain the lock.
-  ACE_NEW_THROW_EX (bl,
-                    CosNaming::BindingList (0),
-                    CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-  // Obtain a lock.
-  ACE_GUARD_THROW_EX (ACE_Lock,
-                      ace_mon,
-                      *this->lock_,
-                      CORBA::INTERNAL (CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
+/*  // We perform an allocation before obtaining the lock so that an out
+// parameter is allocated in case we fail to obtain the lock.
+ACE_NEW_THROW_EX (bl,
+CosNaming::BindingList (0),
+CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
+ACE_CHECK_RETURN (0);
+// Obtain a lock.
+ACE_GUARD_THROW_EX (ACE_Lock,
+ace_mon,
+*this->lock_,
+CORBA::INTERNAL (CORBA::COMPLETED_NO));
+ACE_CHECK_RETURN (0);
 
   // If there are no more bindings...
   if (hash_iter_->done ())
-      return 0;
+  return 0;
   else
-    {
-      // Initially assume that iterator has the requested number of
-      // bindings.
-      bl->length (how_many);
-
-      TAO_Hash_Naming_Context::HASH_MAP::ENTRY *hash_entry;
-
+  {
+  // Initially assume that iterator has the requested number of
+  // bindings.
+  bl->length (how_many);
+  
+    TAO_Hash_Naming_Context::HASH_MAP::ENTRY *hash_entry;
+    
       // Iterate and populate the BindingList.
-
-      for (CORBA::ULong i = 0; i < how_many; i++)
+      
+        for (CORBA::ULong i = 0; i < how_many; i++)
         {
-          hash_iter_->next (hash_entry);
-
+        hash_iter_->next (hash_entry);
+        
           if (TAO_Hash_Naming_Context::populate_binding (hash_entry, bl[i]) == 0)
-            ACE_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), 0);
-
-          if (hash_iter_->advance () == 0)
+          ACE_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), 0);
+          
+            if (hash_iter_->advance () == 0)
             {
-              // If no more bindings left, reset length to the actual
-              // number of bindings populated and get out of the loop.
-              bl->length (i + 1);
-              break;
+            // If no more bindings left, reset length to the actual
+            // number of bindings populated and get out of the loop.
+            bl->length (i + 1);
+            break;
             }
-        }
-      return 1;
-    }
+            }
+            return 1;
+}*/
+  return 0;
 }
 
-void IR_Iterator::destroy (CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-  // Destroys the iterator.
 
+// Destroys the iterator.
+
+void IR_Iterator::destroy (CORBA::Environment &ACE_TRY_ENV)
+{
+}
diff --git a/TAO/orbsvcs/ImplRepo_Service/Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Repository.cpp
index a184a34017e..1d7fa9b552d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Repository.cpp
@@ -201,7 +201,7 @@ Server_Repository::remove (const ACE_TString POA_name)
 
 // Returns a new iterator that travels over the repository.
 
-HASH_IR_ITER *
+Server_Repository::HASH_IR_ITER *
 Server_Repository::new_iterator ()
 {
   HASH_IR_ITER *hash_iter;
@@ -215,7 +215,7 @@ Server_Repository::new_iterator ()
 // Returns the number of entries in the repository.
 
 size_t 
-get_repository_size ()
+Server_Repository::get_repository_size ()
 {
   return this->repository_.current_size ();
 }