ChangeLogTag: Thu Dec 12 23:45:14 2002 Jeff Parsons <j.parsons@vanderbilt.edu>

5 files changed, 29 insertions, 13 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 07f85e69b03..2a644dc2f1f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Thu Dec 12 23:45:14 2002  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Any.cpp:
+        * tao/Any_T.cpp:
+        * tao/Any_T.h:
+
+	  More changes related to the 'const' qualifier, to get more
+	  compilers happy with the template code.
+
+        * tao/TypeCodeFactory/TypeCodeFactory.dsp:
+
+	  Turned on RTTI in this project.
+
 Thu Dec 12 17:24:41 2002  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/Typecode.h:
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index d6308298b4d..b56c2e4d660 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -894,7 +894,7 @@ operator>>= (const CORBA::Any &any, const char *&s)
       any,
       TAO::Any_Impl::_tao_any_string_destructor,
       CORBA::_tc_string,
-      s
+      ACE_const_cast (char *&, s)
     );
 }
 
@@ -905,7 +905,7 @@ operator>>= (const CORBA::Any &any, const CORBA::WChar *&ws)
       any,
       TAO::Any_Impl::_tao_any_wstring_destructor,
       CORBA::_tc_wstring,
-      ws
+      ACE_const_cast (CORBA::WChar *&, ws)
     );
 }
 
diff --git a/TAO/tao/Any_T.cpp b/TAO/tao/Any_T.cpp
index 312aa990e8d..a05219bf5d1 100644
--- a/TAO/tao/Any_T.cpp
+++ b/TAO/tao/Any_T.cpp
@@ -48,7 +48,7 @@ template<typename T> CORBA::Boolean
 TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
                              _tao_destructor destructor,
                              CORBA::TypeCode_ptr tc,
-                             const T *& _tao_elem)
+                             T *& _tao_elem)
 {
   _tao_elem = 0;
 
@@ -71,7 +71,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
 
       if (narrow_impl != 0)
         {
-          _tao_elem = (const T *&) narrow_impl->value_;
+          _tao_elem = (T *) narrow_impl->value_;
           return 1;
         }
 
@@ -91,7 +91,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
 
       if (result == 1)
         {
-          _tao_elem = ACE_const_cast (const T *&, replacement->value_);
+          _tao_elem = ACE_const_cast (T *, replacement->value_);
           ACE_const_cast (CORBA::Any &, any).replace (replacement);
           replacement_safety.release ();
           return result;
@@ -145,8 +145,11 @@ TAO::Any_Impl_T<T>::widen (const CORBA::Any & any,
           if (mb == 0)
             {
               _tao_elem = 
-                ACE_const_cast (T *, 
-                                ACE_reinterpret_cast (const T *, impl->value ()));
+                ACE_const_cast (
+                    T *, 
+                    ACE_reinterpret_cast (const T *, 
+                                          impl->value ())
+                  );
               return 1;
             }
         }
@@ -171,7 +174,7 @@ TAO::Any_Impl_T<T>::widen (const CORBA::Any & any,
 
       if (result == 1)
         {
-          _tao_elem = ACE_reinterpret_cast (T *&, replacement->value_);
+          _tao_elem = replacement->value_;
           ACE_const_cast (CORBA::Any &, any).replace (replacement);
           replacement_safety.release ();
           return result;
diff --git a/TAO/tao/Any_T.h b/TAO/tao/Any_T.h
index 1ac8d16bc71..8991f7debdc 100644
--- a/TAO/tao/Any_T.h
+++ b/TAO/tao/Any_T.h
@@ -49,7 +49,7 @@ namespace TAO
     static CORBA::Boolean extract (const CORBA::Any &,
                                    _tao_destructor,
                                    CORBA::TypeCode_ptr,
-                                   const T *&);
+                                   T *&);
     static CORBA::Boolean widen (const CORBA::Any &,
                                  _tao_destructor,
                                  CORBA::TCKind,
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.dsp b/TAO/tao/TypeCodeFactory/TypeCodeFactory.dsp
index 12f204f286b..c258159da11 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.dsp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TYPECODEFACTORY_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_TYPECODEFACTORY_BUILD_DLL" /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_TYPECODEFACTORY_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TYPECODEFACTORY_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\.." /D TAO_TYPECODEFACTORY_HAS_DLL=1 /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\.." /I "..\..\.." /D TAO_TYPECODEFACTORY_HAS_DLL=1 /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -100,7 +100,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\.." /D TAO_TYPECODEFACTORY_HAS_DLL=1 /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\.." /D TAO_TYPECODEFACTORY_HAS_DLL=1 /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\.." /I "..\..\.." /D TAO_TYPECODEFACTORY_HAS_DLL=1 /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -128,7 +128,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_TYPECODEFACTORY_BUILD_DLL" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_TYPECODEFACTORY_BUILD_DLL" /D ACE_HAS_MFC=1 /D "_WINDLL" /D "_AFXDLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32