ChangeLogTag: Sun Sep 17 06:32:15 2000 Balachandran Natarajan <bala@cs.wustl.edu>

6 files changed, 309 insertions, 301 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 1fce02c53da..72cff61bba3 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Sun Sep 17 06:32:15 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* tao/IORManipulation/IORManipulation.cpp:
+	* tao/IORManipulation/IORManipulation.h:
+	* tao/IORManipulation/IORC.h:
+	* tao/IORManipulation/IORC.cpp:
+	* tao/IORManipulation/IORC.i: Added some methods for FT CORBA
+	  stuff.
+
 Sat Sep 16 23:51:27 2000  Marina Spivak  <marina@cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp:
diff --git a/TAO/tao/IOR.pidl b/TAO/tao/IOR.pidl
index 85d2ad47398..cd6c1bc33cc 100644
--- a/TAO/tao/IOR.pidl
+++ b/TAO/tao/IOR.pidl
@@ -41,7 +41,7 @@ module TAO_IOP
 
       boolean set_primary (in Object ior1,
                            in Object ior2)
-        raises (Duplicate);
+        raises (Duplicate, NotFound);
       // Sets the profile ior1, in the profile ior2 to be a
       // primary.
 
diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp
index a2f9f48bd6a..e2a6fb6289a 100644
--- a/TAO/tao/IORManipulation/IORC.cpp
+++ b/TAO/tao/IORManipulation/IORC.cpp
@@ -10,7 +10,7 @@
 #include "IORC.h"
 #include "tao/Typecode.h"
 #include "tao/Any.h"
-#include  "tao/ORB.h"
+#include "tao/ORB.h"
 
 #if !defined (__ACE_INLINE__)
 #include "IORC.i"
@@ -570,8 +570,6 @@ const char* TAO_IOP::TAO_IOR_Property::_interface_repository_id (void) const
 }
 
 
-
-
 // default constructor
 TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
 {}
@@ -769,8 +767,6 @@ const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
   return "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0";
 }
 
-
-
 void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::EmptyProfileList &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h
index ecac6d80200..a4e7475f9d3 100644
--- a/TAO/tao/IORManipulation/IORC.h
+++ b/TAO/tao/IORManipulation/IORC.h
@@ -346,7 +346,8 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
-        TAO_IOP::Duplicate
+        TAO_IOP::Duplicate,
+        TAO_IOP::NotFound
       )) = 0;
 
     virtual CORBA::Object_ptr get_primary (
@@ -378,7 +379,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
   private:
     TAO_IOR_Property (const TAO_IOR_Property &);
     void operator= (const TAO_IOR_Property &);
-};
+  };
 
 
 #endif /* end #if !defined */
@@ -387,8 +388,8 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___PTR_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION___PTR_CH_
 
-class TAO_IOR_Manipulation;
-typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
+  class TAO_IOR_Manipulation;
+  typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
 
 #endif /* end #if !defined */
 
@@ -396,33 +397,33 @@ typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___VAR_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION___VAR_CH_
 
-class TAO_IORManip_Export TAO_IOR_Manipulation_var : public TAO_Base_var
-{
-public:
-  TAO_IOR_Manipulation_var (void); // default constructor
-  TAO_IOR_Manipulation_var (TAO_IOR_Manipulation_ptr p) : ptr_ (p) {}
-  TAO_IOR_Manipulation_var (const TAO_IOR_Manipulation_var &); // copy constructor
-  ~TAO_IOR_Manipulation_var (void); // destructor
-
-  TAO_IOR_Manipulation_var &operator= (TAO_IOR_Manipulation_ptr);
-  TAO_IOR_Manipulation_var &operator= (const TAO_IOR_Manipulation_var &);
-  TAO_IOR_Manipulation_ptr operator-> (void) const;
-
-  operator const TAO_IOR_Manipulation_ptr &() const;
-  operator TAO_IOR_Manipulation_ptr &();
-  // in, inout, out, _retn
-  TAO_IOR_Manipulation_ptr in (void) const;
-  TAO_IOR_Manipulation_ptr &inout (void);
-  TAO_IOR_Manipulation_ptr &out (void);
-  TAO_IOR_Manipulation_ptr _retn (void);
-  TAO_IOR_Manipulation_ptr ptr (void) const;
-
-private:
-  TAO_IOR_Manipulation_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  TAO_IOR_Manipulation_var (const TAO_Base_var &rhs);
-  TAO_IOR_Manipulation_var &operator= (const TAO_Base_var &rhs);
-};
+  class TAO_IORManip_Export TAO_IOR_Manipulation_var : public TAO_Base_var
+  {
+  public:
+    TAO_IOR_Manipulation_var (void); // default constructor
+    TAO_IOR_Manipulation_var (TAO_IOR_Manipulation_ptr p) : ptr_ (p) {}
+    TAO_IOR_Manipulation_var (const TAO_IOR_Manipulation_var &); // copy constructor
+    ~TAO_IOR_Manipulation_var (void); // destructor
+
+    TAO_IOR_Manipulation_var &operator= (TAO_IOR_Manipulation_ptr);
+    TAO_IOR_Manipulation_var &operator= (const TAO_IOR_Manipulation_var &);
+    TAO_IOR_Manipulation_ptr operator-> (void) const;
+
+    operator const TAO_IOR_Manipulation_ptr &() const;
+    operator TAO_IOR_Manipulation_ptr &();
+    // in, inout, out, _retn
+    TAO_IOR_Manipulation_ptr in (void) const;
+    TAO_IOR_Manipulation_ptr &inout (void);
+    TAO_IOR_Manipulation_ptr &out (void);
+    TAO_IOR_Manipulation_ptr _retn (void);
+    TAO_IOR_Manipulation_ptr ptr (void) const;
+
+  private:
+    TAO_IOR_Manipulation_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    TAO_IOR_Manipulation_var (const TAO_Base_var &rhs);
+    TAO_IOR_Manipulation_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -431,22 +432,22 @@ private:
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___OUT_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION___OUT_CH_
 
-class TAO_IORManip_Export TAO_IOR_Manipulation_out
-{
-public:
-  TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_ptr &);
-  TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_var &);
-  TAO_IOR_Manipulation_out (const TAO_IOR_Manipulation_out &);
-  TAO_IOR_Manipulation_out &operator= (const TAO_IOR_Manipulation_out &);
-  TAO_IOR_Manipulation_out &operator= (const TAO_IOR_Manipulation_var &);
-  TAO_IOR_Manipulation_out &operator= (TAO_IOR_Manipulation_ptr);
-  operator TAO_IOR_Manipulation_ptr &();
-  TAO_IOR_Manipulation_ptr &ptr (void);
-  TAO_IOR_Manipulation_ptr operator-> (void);
-
-private:
-  TAO_IOR_Manipulation_ptr &ptr_;
-};
+  class TAO_IORManip_Export TAO_IOR_Manipulation_out
+  {
+  public:
+    TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_ptr &);
+    TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_var &);
+    TAO_IOR_Manipulation_out (const TAO_IOR_Manipulation_out &);
+    TAO_IOR_Manipulation_out &operator= (const TAO_IOR_Manipulation_out &);
+    TAO_IOR_Manipulation_out &operator= (const TAO_IOR_Manipulation_var &);
+    TAO_IOR_Manipulation_out &operator= (TAO_IOR_Manipulation_ptr);
+    operator TAO_IOR_Manipulation_ptr &();
+    TAO_IOR_Manipulation_ptr &ptr (void);
+    TAO_IOR_Manipulation_ptr operator-> (void);
+
+  private:
+    TAO_IOR_Manipulation_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -456,29 +457,29 @@ private:
 #define _TAO_IOP_TAO_IOR_MANIPULATION_CH_
 
 class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef TAO_IOR_Manipulation_ptr _ptr_type;
-  typedef TAO_IOR_Manipulation_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+  {
+  public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef TAO_IOR_Manipulation_ptr _ptr_type;
+    typedef TAO_IOR_Manipulation_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  // the static operations
-  static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj);
-  static TAO_IOR_Manipulation_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static TAO_IOR_Manipulation_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static TAO_IOR_Manipulation_ptr _nil (void)
-    {
-      return (TAO_IOR_Manipulation_ptr)0;
-    }
+    // the static operations
+    static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj);
+    static TAO_IOR_Manipulation_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+    static TAO_IOR_Manipulation_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+    static TAO_IOR_Manipulation_ptr _nil (void)
+      {
+        return (TAO_IOR_Manipulation_ptr)0;
+      }
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
@@ -486,38 +487,38 @@ public:
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
 
-    class _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-
-      _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void);
-      _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum);
-      _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum,
-        CORBA::ULong length,
-        CORBA::Object* *value,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList(const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs);
-      virtual ~_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void);
-      _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &operator= (const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs);
-      TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index) const;
-      static CORBA::Object **allocbuf (CORBA::ULong nelems);
-      static void freebuf (CORBA::Object **buffer);
-      // The Base_Sequence functions, please see tao/Sequence.h
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      CORBA::Object* *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA::Object* *get_buffer (void) const;
-      virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-      virtual void _downcast (
-          void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        );
-      virtual CORBA_Object* _upcast (void *src) const;
-
-    };
+      class _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList : public TAO_Unbounded_Base_Sequence
+      {
+      public:
+        // = Initialization and termination methods.
+
+        _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void);
+        _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum);
+        _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum,
+          CORBA::ULong length,
+          CORBA::Object* *value,
+          CORBA::Boolean release = 0);
+        _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList(const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs);
+        virtual ~_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void);
+        _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &operator= (const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs);
+        TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index) const;
+        static CORBA::Object **allocbuf (CORBA::ULong nelems);
+        static void freebuf (CORBA::Object **buffer);
+        // The Base_Sequence functions, please see tao/Sequence.h
+        virtual void _allocate_buffer (CORBA::ULong length);
+        virtual void _deallocate_buffer (void);
+        CORBA::Object* *get_buffer (CORBA::Boolean orphan = 0);
+        const CORBA::Object* *get_buffer (void) const;
+        virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
+        virtual void _downcast (
+            void* target,
+            CORBA_Object *src,
+            CORBA_Environment &ACE_TRY_ENV =
+              TAO_default_environment ()
+          );
+        virtual CORBA_Object* _upcast (void *src) const;
+
+      };
 
 #endif /* end #if !defined */
 
@@ -527,38 +528,38 @@ public:
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
 
-  class IORList;
-  class IORList_var;
+    class IORList;
+    class IORList_var;
 
-  // *************************************************************
-  // IORList
-  // *************************************************************
+    // *************************************************************
+    // IORList
+    // *************************************************************
 
-  class TAO_IORManip_Export IORList : public
+    class TAO_IORManip_Export IORList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
+      _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
+      TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  {
-  public:
-    IORList (void); // default ctor
-    IORList (CORBA::ULong max); // uses max size
-    IORList (
-      CORBA::ULong max,
-      CORBA::ULong length,
-      CORBA::Object_ptr *buffer,
-      CORBA::Boolean release=0
-    );
-    IORList (const IORList &); // copy ctor
-    ~IORList (void);
-    static void _tao_any_destructor (void*);
+    {
+    public:
+      IORList (void); // default ctor
+      IORList (CORBA::ULong max); // uses max size
+      IORList (
+        CORBA::ULong max,
+        CORBA::ULong length,
+        CORBA::Object_ptr *buffer,
+        CORBA::Boolean release=0
+      );
+      IORList (const IORList &); // copy ctor
+      ~IORList (void);
+      static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef IORList_var _var_type;
+      typedef IORList_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  };
+    };
 
 #endif /* end #if !defined */
 
@@ -566,39 +567,39 @@ public:
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___VAR_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___VAR_CH_
 
-  // *************************************************************
-  // class TAO_IOP::TAO_IOR_Manipulation::IORList_var
-  // *************************************************************
-
-  class TAO_IORManip_Export IORList_var
-  {
-  public:
-    IORList_var (void); // default constructor
-    IORList_var (IORList *);
-    IORList_var (const IORList_var &); // copy constructor
-    ~IORList_var (void); // destructor
-
-    IORList_var &operator= (IORList *);
-    IORList_var &operator= (const IORList_var &);
-    IORList *operator-> (void);
-    const IORList *operator-> (void) const;
-
-    operator const IORList &() const;
-    operator IORList &();
-    operator IORList &() const;
-    operator IORList *&(); // variable-size base types only
-
-    TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-    // in, inout, out, _retn
-    const IORList &in (void) const;
-    IORList &inout (void);
-    IORList *&out (void);
-    IORList *_retn (void);
-    IORList *ptr (void) const;
+    // *************************************************************
+    // class TAO_IOP::TAO_IOR_Manipulation::IORList_var
+    // *************************************************************
 
-  private:
-    IORList *ptr_;
-  };
+    class TAO_IORManip_Export IORList_var
+    {
+    public:
+      IORList_var (void); // default constructor
+      IORList_var (IORList *);
+      IORList_var (const IORList_var &); // copy constructor
+      ~IORList_var (void); // destructor
+
+      IORList_var &operator= (IORList *);
+      IORList_var &operator= (const IORList_var &);
+      IORList *operator-> (void);
+      const IORList *operator-> (void) const;
+
+      operator const IORList &() const;
+      operator IORList &();
+      operator IORList &() const;
+      operator IORList *&(); // variable-size base types only
+
+      TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
+      // in, inout, out, _retn
+      const IORList &in (void) const;
+      IORList &inout (void);
+      IORList *&out (void);
+      IORList *_retn (void);
+      IORList *ptr (void) const;
+
+    private:
+      IORList *ptr_;
+    };
 
 
 #endif /* end #if !defined */
@@ -607,146 +608,146 @@ public:
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___OUT_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST___OUT_CH_
 
-  class TAO_IORManip_Export IORList_out
-  {
-  public:
-    IORList_out (IORList *&);
-    IORList_out (IORList_var &);
-    IORList_out (const IORList_out &);
-    IORList_out &operator= (const IORList_out &);
-    IORList_out &operator= (IORList *);
-    operator IORList *&();
-    IORList *&ptr (void);
-    IORList *operator-> (void);
-    TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-
-  private:
-    IORList *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const IORList_var &);
-  };
+    class TAO_IORManip_Export IORList_out
+    {
+    public:
+      IORList_out (IORList *&);
+      IORList_out (IORList_var &);
+      IORList_out (const IORList_out &);
+      IORList_out &operator= (const IORList_out &);
+      IORList_out &operator= (IORList *);
+      operator IORList *&();
+      IORList *&ptr (void);
+      IORList *operator-> (void);
+      TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
+
+    private:
+      IORList *&ptr_;
+      // assignment from T_var not allowed
+      void operator= (const IORList_var &);
+    };
 
 
 #endif /* end #if !defined */
 
-  virtual CORBA::Object_ptr merge_iors (
-      const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      TAO_IOP::EmptyProfileList,
-      TAO_IOP::Duplicate,
-      TAO_IOP::Invalid_IOR
-    )) = 0;
-
-  virtual CORBA::Object_ptr add_profiles (
-      CORBA::Object_ptr ior1,
-      CORBA::Object_ptr ior2,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      TAO_IOP::EmptyProfileList,
-      TAO_IOP::Duplicate,
-      TAO_IOP::Invalid_IOR
-    )) = 0;
-
-  virtual CORBA::Object_ptr remove_profiles (
-      CORBA::Object_ptr ior1,
-      CORBA::Object_ptr ior2,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      TAO_IOP::Invalid_IOR,
-      TAO_IOP::EmptyProfileList,
-      TAO_IOP::NotFound
-    )) = 0;
-
-  virtual CORBA::Boolean set_property (
-      TAO_IOP::TAO_IOR_Property_ptr prop,
-      CORBA::Object_ptr ior,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      TAO_IOP::Invalid_IOR,
-      TAO_IOP::Duplicate
-    )) = 0;
-
-  virtual CORBA::Boolean set_primary (
-      TAO_IOP::TAO_IOR_Property_ptr prop,
-      CORBA::Object_ptr ior1,
-      CORBA::Object_ptr ior2,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      TAO_IOP::Invalid_IOR,
-      TAO_IOP::Duplicate,
-      TAO_IOP::MultiProfileList,
-      TAO_IOP::NotFound
-    )) = 0;
-
-  virtual CORBA::Object_ptr get_primary (
-      TAO_IOP::TAO_IOR_Property_ptr prop,
-      CORBA::Object_ptr ior,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      TAO_IOP::NotFound
-    )) = 0;
-
-  virtual CORBA::Boolean is_primary_set (
-      TAO_IOP::TAO_IOR_Property_ptr prop,
-      CORBA::Object_ptr ior,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual CORBA::ULong is_in_ior (
-      CORBA::Object_ptr ior1,
-      CORBA::Object_ptr ior2,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      TAO_IOP::NotFound
-    )) = 0;
-
-  virtual CORBA::ULong get_profile_count (
-      CORBA::Object_ptr ior,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      TAO_IOP::EmptyProfileList
-    )) = 0;
-
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-  TAO_IOR_Manipulation (void);
-  virtual ~TAO_IOR_Manipulation (void);
-private:
-  TAO_IOR_Manipulation (const TAO_IOR_Manipulation &);
-  void operator= (const TAO_IOR_Manipulation &);
-};
+    virtual CORBA::Object_ptr merge_iors (
+        const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        TAO_IOP::EmptyProfileList,
+        TAO_IOP::Duplicate,
+        TAO_IOP::Invalid_IOR
+      )) = 0;
+
+    virtual CORBA::Object_ptr add_profiles (
+        CORBA::Object_ptr ior1,
+        CORBA::Object_ptr ior2,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        TAO_IOP::EmptyProfileList,
+        TAO_IOP::Duplicate,
+        TAO_IOP::Invalid_IOR
+      )) = 0;
+
+    virtual CORBA::Object_ptr remove_profiles (
+        CORBA::Object_ptr ior1,
+        CORBA::Object_ptr ior2,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        TAO_IOP::Invalid_IOR,
+        TAO_IOP::EmptyProfileList,
+        TAO_IOP::NotFound
+      )) = 0;
+
+    virtual CORBA::Boolean set_property (
+        TAO_IOP::TAO_IOR_Property_ptr prop,
+        CORBA::Object_ptr ior,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        TAO_IOP::Invalid_IOR,
+        TAO_IOP::Duplicate
+      )) = 0;
+
+    virtual CORBA::Boolean set_primary (
+        TAO_IOP::TAO_IOR_Property_ptr prop,
+        CORBA::Object_ptr ior1,
+        CORBA::Object_ptr ior2,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        TAO_IOP::Invalid_IOR,
+        TAO_IOP::Duplicate,
+        TAO_IOP::MultiProfileList,
+        TAO_IOP::NotFound
+      )) = 0;
+
+    virtual CORBA::Object_ptr get_primary (
+        TAO_IOP::TAO_IOR_Property_ptr prop,
+        CORBA::Object_ptr ior,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        TAO_IOP::NotFound
+      )) = 0;
+
+    virtual CORBA::Boolean is_primary_set (
+        TAO_IOP::TAO_IOR_Property_ptr prop,
+        CORBA::Object_ptr ior,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual CORBA::ULong is_in_ior (
+        CORBA::Object_ptr ior1,
+        CORBA::Object_ptr ior2,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        TAO_IOP::NotFound
+      )) = 0;
+
+    virtual CORBA::ULong get_profile_count (
+        CORBA::Object_ptr ior,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        TAO_IOP::EmptyProfileList
+      )) = 0;
+
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+    virtual const char* _interface_repository_id (void) const;
+
+  protected:
+    TAO_IOR_Manipulation (void);
+    virtual ~TAO_IOR_Manipulation (void);
+  private:
+    TAO_IOR_Manipulation (const TAO_IOR_Manipulation &);
+    void operator= (const TAO_IOR_Manipulation &);
+  };
 
 
 #endif /* end #if !defined */
@@ -805,5 +806,4 @@ TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiPro
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#include "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp
index df3d7bce710..218c3fe200f 100644
--- a/TAO/tao/IORManipulation/IORManipulation.cpp
+++ b/TAO/tao/IORManipulation/IORManipulation.cpp
@@ -306,9 +306,10 @@ TAO_IOR_Manipulation_impl::set_primary (
                       0);
 
   // Make sure we have only one profile in IOR1
-  if (ior1->_stubobj ()->base_profiles ().profile_count () > 1)
+  // @@ Will fail if the object has been
+  /*if (ior1->_stubobj ()->base_profiles ().profile_count () > 1)
     ACE_THROW_RETURN (TAO_IOP::MultiProfileList (),
-                      0);
+    0);*/
 
   // Call the callback object to do the rest of the processing.
   return prop->set_primary (ior1,
diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h
index e175231cc43..87227b48869 100644
--- a/TAO/tao/IORManipulation/IORManipulation.h
+++ b/TAO/tao/IORManipulation/IORManipulation.h
@@ -155,6 +155,8 @@ public:
         CORBA::SystemException,
         TAO_IOP::EmptyProfileList
       ));
+private:
+
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)