ChangeLogTag:Thu Jul 3 02:34:49 UTC 2003 Don Hinton <dhinton@dresystems.com>

8 files changed, 23 insertions, 9 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 31ede5e89ca..e95449805e8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Thu Jul  3 02:34:49 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * tao/Any_Array_Impl_T.cpp:
+        * tao/Any_Basic_Impl_T.cpp:
+        * tao/Any_Dual_Impl_T.cpp:
+        * tao/Any_Impl_T.cpp:
+        * tao/Any_Special_Basic_Impl_T.cpp:
+        * tao/Any_Special_Impl_T.cpp:
+        * tao/default_server.cpp:
+          Rolled back Wed Jul  2 22:17:15 UTC 2003  Don Hinton
+          <dhinton@dresystems.com>.  As Bala pointed out, Any's require
+          dynamic_cast and RTTI to work properly.  The warnings on Windows
+          should be fixed by enabling RTTI, which will be the next change.
+
 Wed Jul 02 22:10:59 2003  Pradeep Gore  <pradeep@oomworks.com>
 
 	* orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp:
diff --git a/TAO/tao/Any_Array_Impl_T.cpp b/TAO/tao/Any_Array_Impl_T.cpp
index bb5324fc308..54a00bcf6fb 100644
--- a/TAO/tao/Any_Array_Impl_T.cpp
+++ b/TAO/tao/Any_Array_Impl_T.cpp
@@ -77,14 +77,14 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
       if (mb == 0)
         {
           TAO::Any_Array_Impl_T<T_slice, T_forany> *narrow_impl =
-            ACE_dynamic_cast_2_ptr (TAO::Any_Array_Impl_T, T_slice, T_forany, impl);
+            dynamic_cast <TAO::Any_Array_Impl_T <T_slice, T_forany> *> (impl);
 
           if (narrow_impl == 0)
             {
               return 0;
             }
 
-          _tao_elem = ACE_reinterpret_cast (const T_slice*, narrow_impl->value_);
+          _tao_elem = reinterpret_cast <const T_slice*> (narrow_impl->value_);
           return 1;
         }
 
@@ -117,7 +117,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
 
       if (result == 1)
         {
-          _tao_elem = ACE_reinterpret_cast (const T_slice*, replacement->value_);
+          _tao_elem = reinterpret_cast <const T_slice*> (replacement->value_);
           ACE_const_cast (CORBA::Any &, any).replace (replacement);
           replacement_safety.release ();
           return result;
diff --git a/TAO/tao/Any_Basic_Impl_T.cpp b/TAO/tao/Any_Basic_Impl_T.cpp
index 0d9e9570d44..88c55a7e04b 100644
--- a/TAO/tao/Any_Basic_Impl_T.cpp
+++ b/TAO/tao/Any_Basic_Impl_T.cpp
@@ -68,7 +68,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
       if (mb == 0)
         {
           TAO::Any_Basic_Impl_T<T> *narrow_impl =
-            ACE_dynamic_cast (TAO::Any_Basic_Impl_T<T> *, impl);
+            dynamic_cast <TAO::Any_Basic_Impl_T<T> *> (impl);
 
           if (narrow_impl == 0)
             {
diff --git a/TAO/tao/Any_Dual_Impl_T.cpp b/TAO/tao/Any_Dual_Impl_T.cpp
index f09ba061c8a..0fa43342773 100644
--- a/TAO/tao/Any_Dual_Impl_T.cpp
+++ b/TAO/tao/Any_Dual_Impl_T.cpp
@@ -107,7 +107,7 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
       if (mb == 0)
         {
           TAO::Any_Dual_Impl_T<T> *narrow_impl =
-            ACE_dynamic_cast (TAO::Any_Dual_Impl_T<T> *, impl);
+            dynamic_cast <TAO::Any_Dual_Impl_T<T> *> (impl);
 
           if (narrow_impl == 0)
             {
diff --git a/TAO/tao/Any_Impl_T.cpp b/TAO/tao/Any_Impl_T.cpp
index 7d119725560..28abc307b4b 100644
--- a/TAO/tao/Any_Impl_T.cpp
+++ b/TAO/tao/Any_Impl_T.cpp
@@ -74,7 +74,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
       if (mb == 0)
         {
           TAO::Any_Impl_T<T> *narrow_impl =
-            ACE_dynamic_cast (TAO::Any_Impl_T<T> *, impl);
+            dynamic_cast <TAO::Any_Impl_T<T> *> (impl);
 
           if (narrow_impl == 0)
             {
diff --git a/TAO/tao/Any_Special_Basic_Impl_T.cpp b/TAO/tao/Any_Special_Basic_Impl_T.cpp
index 199c307f164..d34d8db4f80 100644
--- a/TAO/tao/Any_Special_Basic_Impl_T.cpp
+++ b/TAO/tao/Any_Special_Basic_Impl_T.cpp
@@ -79,7 +79,7 @@ TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::extract (
       if (mb == 0)
         {
           TAO::Any_Special_Basic_Impl_T<T, from_T, to_T> *narrow_impl =
-            ACE_dynamic_cast (UNSIGNED_CHAR_ANY_IMPL *, impl);
+            dynamic_cast <UNSIGNED_CHAR_ANY_IMPL *> (impl);
 
           if (narrow_impl == 0)
             {
diff --git a/TAO/tao/Any_Special_Impl_T.cpp b/TAO/tao/Any_Special_Impl_T.cpp
index c0958518594..92a2ef99c40 100644
--- a/TAO/tao/Any_Special_Impl_T.cpp
+++ b/TAO/tao/Any_Special_Impl_T.cpp
@@ -122,7 +122,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
         BOUNDED_TSTRING_ANY_IMPL;
 
       TAO::Any_Special_Impl_T<T, from_T, to_T> *narrow_impl =
-        ACE_dynamic_cast (BOUNDED_TSTRING_ANY_IMPL *, impl);
+        dynamic_cast <BOUNDED_TSTRING_ANY_IMPL *> (impl);
 
       if (narrow_impl != 0)
         {
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
index 5489ee7ace9..bc856f92bb0 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -63,7 +63,7 @@ TAO_Default_Server_Strategy_Factory::server_connection_thread_count (void)
 // Evil macros b/c I'm lazy!
 #define TAO_BEGINCHECK  if (0)
 #define TAO_CHECKANDSET(sym) \
-  else if (ACE_OS::strcmp (ACE_const_cast (const ACE_TCHAR *, flag), ACE_LIB_TEXT(#sym)) == 0) \
+  else if (ACE_OS::strcmp (const_cast <const ACE_TCHAR *> ( flag), ACE_LIB_TEXT(#sym)) == 0) \
   ACE_SET_BITS (this->thread_flags_, sym)
 #define TAO_ENDCHECK