removed warnings

2 files changed, 14 insertions, 18 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.h
index 3fdd4a1dd5d..0ef047598ff 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.h
@@ -54,27 +54,27 @@ public:
   size_t current_size (void);
   // return the size of the underlying hash map.
 
-  virtual int bind (const char *id,
-                    const char *kind,
-                    CORBA::Object_ptr obj,
-                    CosNaming::BindingType type);
+  int bind (const char *id,
+            const char *kind,
+            CORBA::Object_ptr obj,
+            CosNaming::BindingType type);
   // Bind a new name to a naming context
 
-  virtual int rebind (const char *id,
-                      const char *kind,
-                      CORBA::Object_ptr obj,
-                      CosNaming::BindingType type);
+  int rebind (const char *id,
+              const char *kind,
+              CORBA::Object_ptr obj,
+              CosNaming::BindingType type);
   // Overwrite the value or type of an existing name in a
   // ACE_Local_Name_Space or bind a new name to the context, if it
   // didn't exist yet. (Wide charcter strings interface).
 
-  virtual int unbind (const char * id,
-                      const char * kind);
+  int unbind (const char * id,
+              const char * kind);
 
-  virtual int find (const char * id,
-                    const char * kind,
-                    CORBA::Object_ptr & obj,
-                    CosNaming::BindingType &type);
+  int find (const char * id,
+            const char * kind,
+            CORBA::Object_ptr & obj,
+            CosNaming::BindingType &type);
 
   //A method to get the iterator.
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
index 2ff603b3d41..cb7d499deda 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
@@ -20,10 +20,6 @@
 
 #define TAO_NAME_CONTEXTS_INDEX "Naming_Service_Index"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "Persistent_Entries.h"
 
 class TAO_Index