Thu Sep 28 14:55:06 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>

2 files changed, 12 insertions, 7 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 88052615b33..0c1a0553b53 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 28 14:55:06 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tests/Bug_2188_Regression/broken_i.cpp:
+          Silence the Borland warning.
+
 Wed Sep 27 07:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         Merged in the patch from bugzilla bug 2425, this fixes the crashing
diff --git a/TAO/tests/Bug_2188_Regression/broken_i.cpp b/TAO/tests/Bug_2188_Regression/broken_i.cpp
index a0efd8b9ed5..24a80a371e6 100644
--- a/TAO/tests/Bug_2188_Regression/broken_i.cpp
+++ b/TAO/tests/Bug_2188_Regression/broken_i.cpp
@@ -105,7 +105,7 @@ ArrayTest_i::~ArrayTest_i (void)
     CORBA::SystemException
   ))
 {
-  p3 = LongArray_dup(p2);
+  ::LongArray_copy(p3,p2);
   return LongArray_dup(p1);
 }
 
@@ -119,7 +119,7 @@ ArrayTest_i::~ArrayTest_i (void)
   ))
 {
   // Add your implementation here
-  p3 = StringArray_dup(p2);
+  ::StringArray_copy(p3,p2);
   return StringArray_dup(p1);
 }
 
@@ -132,7 +132,7 @@ ArrayTest_i::~ArrayTest_i (void)
     CORBA::SystemException
   ))
 {
-  p3 = ShortArray_dup(p2);
+  ::ShortArray_copy(p3,p2);
   return ShortArray_dup(p1);
   // Add your implementation here
 }
@@ -147,7 +147,7 @@ ArrayTest_i::~ArrayTest_i (void)
   ))
 {
   // Add your implementation here
-  p3 = UShortArray_dup(p2);
+  ::UShortArray_copy(p3,p2);
   return UShortArray_dup(p1);
 }
 
@@ -161,7 +161,7 @@ ArrayTest_i::~ArrayTest_i (void)
   ))
 {
   // Add your implementation here
-  p3 = CharArray_dup(p2);
+  ::CharArray_copy(p3,p2);
   return CharArray_dup(p1);
 
 }
@@ -176,7 +176,7 @@ ArrayTest_i::~ArrayTest_i (void)
   ))
 {
   // Add your implementation here
-  p3 = OctetArray_dup(p2);
+  ::OctetArray_copy(p3,p2);
   return OctetArray_dup(p1);
 }
 
@@ -190,7 +190,7 @@ ArrayTest_i::~ArrayTest_i (void)
   ))
 {
   // Add your implementation here
-  p3 = DoubleArray_dup(p2);
+  ::DoubleArray_copy(p3,p2);
   return DoubleArray_dup(p1);
 }