summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-06-14 23:32:50 +0000
committermarina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-06-14 23:32:50 +0000
commitd80caf4286601748c912f8237617b55cbafcf913 (patch)
tree55741a154881b0d1562b690f3ddb0fc63ae22854
parenta9dd99a7f76b2ab68efccc1264b8f524c68aaa2f (diff)
downloadATCD-d80caf4286601748c912f8237617b55cbafcf913.tar.gz
Fixed warnings about non-virtual destructors.
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h16
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h2
3 files changed, 10 insertions, 10 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
index f528d9ec873..7ad5d9746d6 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
@@ -28,10 +28,10 @@ class TAO_ORBSVCS_Export TAO_Persistent_Context_Index
//
public:
-typedef ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,
- TAO_Persistent_Index_IntId> INDEX;
-typedef ACE_Shared_Hash_Map<TAO_Persistent_ExtId,
- TAO_Persistent_IntId> CONTEXT;
+ typedef ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,
+ TAO_Persistent_Index_IntId> INDEX;
+ typedef ACE_Shared_Hash_Map<TAO_Persistent_ExtId,
+ TAO_Persistent_IntId> CONTEXT;
// = Initialization and termination methods.
TAO_Persistent_Context_Index (CORBA::ORB_ptr orb,
@@ -50,18 +50,18 @@ typedef ACE_Shared_Hash_Map<TAO_Persistent_ExtId,
// destructor, do some cleanup :TBD: last dtor should "compress"
// file
- virtual int bind (const char *poa_id,
+ int bind (const char *poa_id,
ACE_UINT32 *&counter,
CONTEXT *hash_map);
// Create an entry - new context is created.
- virtual int unbind (const char * poa_id);
+ int unbind (const char * poa_id);
// Unbind an entry - a context is destroyed.
- virtual ACE_Allocator *allocator (void);
+ ACE_Allocator *allocator (void);
// accessor.
- virtual CORBA::ORB_ptr orb (void);
+ CORBA::ORB_ptr orb (void);
//
char * root_ior (void);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
index f06f0fb2b91..e37bcdf8163 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
@@ -50,7 +50,7 @@ public:
// The hash map has already been preallocated for us. We just need
// to set our data members take ownership of it.
- ~TAO_Persistent_Bindings_Map (void);
+ virtual ~TAO_Persistent_Bindings_Map (void);
// Destructor. Does not deallocate the hash map: if an instance of
// this class goes out of scope, its hash_map remains in persistent storage.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
index 77f599370fc..7ed16d5c5f2 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
@@ -43,7 +43,7 @@ public:
TAO_Transient_Bindings_Map (size_t hash_table_size);
// Constructor.
- ~TAO_Transient_Bindings_Map (void);
+ virtual ~TAO_Transient_Bindings_Map (void);
// Destructor.
// = Accessors.