ChangeLogTag: Mon Sep 11 13:03:17 UTC 2006 Boris Kolpackov <boris@codesynthesis.com>

3 files changed, 10 insertions, 41 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 6648c869193..7ef06f5986d 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,7 +1,15 @@
+Mon Sep 11 13:03:17 UTC 2006  Boris Kolpackov  <boris@codesynthesis.com>
+
+        * ace/Bound_Ptr.h:
+        * protocols/ace/RMCast/Reassemble.cpp:
+
+          Reverted my previous changes (Wed Sep  6) since BCB2006
+          is unable to handle the required C++ constructs.
+
 Sun Sep 10 09:23:04 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * include/makeinclude/platform_g++_common.GNU
-        
+
           Committing a fix provided by Ossama Othman (Ossama_Othman at symantec dot com)
           to fix a problem with symbol visibility when building static libraries.
 
diff --git a/ACE/ace/Bound_Ptr.h b/ACE/ace/Bound_Ptr.h
index 619e0c4eb87..f5eabd68a56 100644
--- a/ACE/ace/Bound_Ptr.h
+++ b/ACE/ace/Bound_Ptr.h
@@ -7,7 +7,6 @@
  *  $Id$
  *
  *  @author Christopher Kohlhoff <chris@kohlhoff.com>
- *  @author Boris Kolpackov <boris@codesynthesis.com>
  */
 //=============================================================================
 
@@ -126,19 +125,6 @@ public:
   /// Constructor binds <this> and <r> to the same object.
   ACE_Strong_Bound_Ptr (const ACE_Weak_Bound_Ptr<X, ACE_LOCK> &r);
 
-  /// Copy constructor binds <this> and <r> to the same object if
-  /// Y* can be implicitly converted to X*.
-  template <class Y>
-  ACE_Strong_Bound_Ptr (const ACE_Strong_Bound_Ptr<Y, ACE_LOCK> &r)
-      : counter_ (r.counter_),
-        ptr_ (dynamic_cast<X*>(r.ptr_))
-  {
-    // This ctor is temporarily defined here to increase our chances
-    // of being accepted by broken compilers.
-    //
-    COUNTER::attach_strong (this->counter_);
-  }
-
   /// Destructor.
   ~ACE_Strong_Bound_Ptr (void);
 
@@ -148,29 +134,6 @@ public:
   /// Assignment operator that binds <this> and <r> to the same object.
   void operator = (const ACE_Weak_Bound_Ptr<X, ACE_LOCK> &r);
 
-  /// Assignment operator that binds <this> and <r> to the same object
-  /// if Y* can be implicitly converted to X*.
-  template <class Y>
-  ACE_Weak_Bound_Ptr<X, ACE_LOCK>&
-  operator= (const ACE_Strong_Bound_Ptr<Y, ACE_LOCK> &r)
-  {
-    // This operator is temporarily defined here to increase our chances
-    // of being accepted by broken compilers.
-    //
-
-    // This will work if &r == this, by first increasing the ref count
-
-    COUNTER *new_counter = r.counter_;
-    X* new_ptr = dynamic_cast<X*> (r.ptr_);
-    COUNTER::attach_strong (new_counter);
-    if (COUNTER::detach_strong (this->counter_) == 0)
-      delete this->ptr_;
-    this->counter_ = new_counter;
-    this->ptr_ = new_ptr;
-
-    return *this;
-  }
-
   /// Equality operator that returns @c true if both
   /// ACE_Strong_Bound_Ptr instances point to the same underlying
   /// object.
diff --git a/ACE/protocols/ace/RMCast/Reassemble.cpp b/ACE/protocols/ace/RMCast/Reassemble.cpp
index ee1837d7ac3..aa5354a40be 100644
--- a/ACE/protocols/ace/RMCast/Reassemble.cpp
+++ b/ACE/protocols/ace/RMCast/Reassemble.cpp
@@ -100,9 +100,7 @@ namespace ACE_RMCast
              * hierarchically compatible, and do this funky cast to get
              * the result we want.
              */
-            //new_msg->add (*(reinterpret_cast<Profile_ptr*> (&new_data)));
-
-            new_msg->add (Profile_ptr (new_data));
+            new_msg->add (*(reinterpret_cast<Profile_ptr*> (&new_data)));
 
             map_.unbind (from);