ChangeLogTag:Wed Jul 2 22:17:15 UTC 2003 Don Hinton <dhinton@dresystems.com>

10 files changed, 30 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 52b7668c657..4895bdfabb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jul  2 22:17:15 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * ace/config-all.h/
+          Added test for ACE_HAS_ANSI_CASTS != 0, not just its existence
+          since this is the way it is used.
+
 Wed Jul 02 14:57:00 2003  Justin Michel  <michel_j@ociweb.com>
 
         * examples/Registry/Registry.mpc
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d411076ff0c..5b0c7da0123 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Wed Jul  2 22:17:15 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:
+          Changed raw usage of the C++ cast operators to use the
+          ACE_* variety, e.g., ACE_dynamic_cast instead of
+          dynamic_cast.  This clears up warnings on Windows when
+          RTTI is not turned on.
+
 Wed Jul 02 14:57:00 2003  Justin Michel  <michel_j@ociweb.com>
 
         * examples/AMH/Sink_Server/Sink_Server.mpc
diff --git a/TAO/tao/Any_Array_Impl_T.cpp b/TAO/tao/Any_Array_Impl_T.cpp
index d3804a5a718..c3b210afa2b 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 =
-            dynamic_cast <TAO::Any_Array_Impl_T<T_slice, T_forany> *> (impl);
+            ACE_dynamic_cast ((TAO::Any_Array_Impl_T<T_slice, T_forany> *), impl);
 
           if (narrow_impl == 0)
             {
               return 0;
             }
 
-          _tao_elem = reinterpret_cast<const T_slice*>(narrow_impl->value_) ;
+          _tao_elem = ACE_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 = reinterpret_cast<const T_slice*>(replacement->value_) ;
+          _tao_elem = ACE_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 88c55a7e04b..0d9e9570d44 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 =
-            dynamic_cast <TAO::Any_Basic_Impl_T<T> *> (impl);
+            ACE_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 0fa43342773..f09ba061c8a 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 =
-            dynamic_cast <TAO::Any_Dual_Impl_T<T> *> (impl);
+            ACE_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 28abc307b4b..7d119725560 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 =
-            dynamic_cast <TAO::Any_Impl_T<T> *> (impl);
+            ACE_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 d34d8db4f80..199c307f164 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 =
-            dynamic_cast <UNSIGNED_CHAR_ANY_IMPL *> (impl);
+            ACE_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 92a2ef99c40..c0958518594 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 =
-        dynamic_cast <BOUNDED_TSTRING_ANY_IMPL *> (impl);
+        ACE_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 2bf47d6c33d..5489ee7ace9 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 (const_cast<const ACE_TCHAR *>(flag), ACE_LIB_TEXT(#sym)) == 0) \
+  else if (ACE_OS::strcmp (ACE_const_cast (const ACE_TCHAR *, flag), ACE_LIB_TEXT(#sym)) == 0) \
   ACE_SET_BITS (this->thread_flags_, sym)
 #define TAO_ENDCHECK
 
diff --git a/ace/config-all.h b/ace/config-all.h
index 5266c83f42e..77ec2510075 100644
--- a/ace/config-all.h
+++ b/ace/config-all.h
@@ -246,7 +246,7 @@
 // *_cast<> operators
 // ============================================================================
 
-# if defined (ACE_HAS_ANSI_CASTS)
+# if defined (ACE_HAS_ANSI_CASTS) && ACE_HAS_ANSI_CASTS != 0
 
 #   define ACE_sap_any_cast(TYPE)                                      reinterpret_cast<TYPE> (const_cast<ACE_Addr &> (ACE_Addr::sap_any))