This commit was manufactured by cvs2svn to create branchtypecode-overhaul

'typecode-overhaul'.

1 files changed, 8 insertions, 88 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
index a8d6c62f634..d7353f68281 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
@@ -16,6 +16,7 @@
 
 #include "Hash_Naming_Context.h"
 #include "ace/Hash_Map_Manager.h"
+#include "Persistent_Entries.h"
 
 #include "Storable.h"
 
@@ -23,87 +24,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_Naming_Serv_Export TAO_Storable_IntId
-{
-public:
-  // = Initialization and termination methods.
-  /// Constructor.
-  TAO_Storable_IntId (void);
-
-  /// Constructor.
-  TAO_Storable_IntId (/* in */ const char * ior,
-                        CosNaming::BindingType type /* = CosNaming::nobject */);
-
-  /// Copy constructor.
-  TAO_Storable_IntId (const TAO_Storable_IntId & rhs);
-
-  /// Destructor.
-  ~TAO_Storable_IntId (void);
-
-  /// Assignment operator.
-  void operator= (const TAO_Storable_IntId & rhs);
-
-  // = Data members.
-
-  /// Stringified IOR to be stored in a Persistent Naming Context.
-  CORBA::String_var  ref_;
-
-  /// Binding type for <ref_>.
-  CosNaming::BindingType type_;
-};
-
-class TAO_Naming_Serv_Export TAO_Storable_ExtId
-{
-public:
-  // = Initialization and termination methods.
-
-  /// Constructor.
-  TAO_Storable_ExtId (void);
-
-  /// Constructor.
-  TAO_Storable_ExtId (/* in */ const char *id,
-                        /* in */ const char *kind);
-
-  /// Copy constructor.
-  TAO_Storable_ExtId (const TAO_Storable_ExtId & rhs);
-
-  /// Destructor.
-  ~TAO_Storable_ExtId (void);
-
-  // = Assignment and comparison methods.
-
-  /// Assignment operator (does copy memory).
-  void operator= (const TAO_Storable_ExtId & rhs);
-
-  /// Equality comparison operator (must match both id_ and kind_).
-  bool operator== (const TAO_Storable_ExtId &rhs) const;
-
-  /// Inequality comparison operator.
-  bool operator!= (const TAO_Storable_ExtId &rhs) const;
-
-  /// <hash> function is required in order for this class to be usable by
-  /// ACE_Hash_Map_Manager.
-  u_long hash (void) const;
-
-  // = Data members.
-
-  /// <id> portion of the name to be associated with some object
-  /// reference in a Storable Naming Context.
-  CORBA::String_var id_;
-
-  /// <kind> portion of the name to be associated with some object
-  /// reference in a Storable Naming Context.
-  CORBA::String_var kind_;
-
-  // Accessors.
-  // follow the mapping rules!
-
-  const char * id (void);
-  const char * kind (void);
-
-};
-
-
 /**
  * @class TAO_Storable_Bindings_Map
  *
@@ -113,13 +33,13 @@ public:
  * A thin wrapper on top of ACE_Hash_Map_Manager.  Supports
  * TAO_Bindings_Map interface.  Used by TAO_Transient_Naming_Context.
  */
-class TAO_Naming_Serv_Export TAO_Storable_Bindings_Map : public TAO_Bindings_Map
+class TAO_Naming_Export TAO_Storable_Bindings_Map : public TAO_Bindings_Map
 {
 public:
 
   /// Underlying data structure - typedef for ease of use.
-  typedef ACE_Hash_Map_Manager<TAO_Storable_ExtId,
-                               TAO_Storable_IntId,
+  typedef ACE_Hash_Map_Manager<TAO_Persistent_ExtId,
+                               TAO_Persistent_IntId,
                                ACE_Null_Mutex> HASH_MAP;
 
   // = Initialization and termination methods.
@@ -196,7 +116,7 @@ private:
   /// Hash map used for storage.
   HASH_MAP map_;
 
-  CORBA::ORB_var orb_;
+  CORBA::ORB_ptr orb_;
 
 };
 
@@ -213,7 +133,7 @@ private:
  * TAO_Hash_Naming_Context and uses TAO_Storable_Bindings_Map to
  * store name to object bindings.
  */
-class TAO_Naming_Serv_Export TAO_Storable_Naming_Context : public TAO_Hash_Naming_Context
+class TAO_Naming_Export TAO_Storable_Naming_Context : public TAO_Hash_Naming_Context
 {
 
 public:
@@ -377,7 +297,7 @@ protected:
    */
   TAO_Storable_Bindings_Map *storable_context_;
 
-  CORBA::ORB_var orb_;
+  CORBA::ORB_ptr orb_;
 
   ACE_CString name_;
 
@@ -400,7 +320,7 @@ protected:
   static const char * root_name_;
 
   /// The pointer to the global file used to allocate new contexts
-  static ACE_Auto_Ptr<TAO_Storable_Base> gfl_;
+  static TAO_Storable_Base *gfl_;
 
 /**
  * @class File_Open_Lock_and_Check