ChangeLogTag: Sun Jan 12 02:08:58 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

9 files changed, 51 insertions, 16 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b8a4784cbf2..1d63ec36007 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Sun Jan 12 02:08:58 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/CosEvent.dsp:
+        * orbsvcs/orbsvcs/CosNaming.dsp:
+        * orbsvcs/orbsvcs/CosNotification.dsp:
+        * orbsvcs/orbsvcs/CosTrading.dsp:
+        * orbsvcs/orbsvcs/DsEventLogAdmin.dsp:
+        * orbsvcs/orbsvcs/DsLogAdmin.dsp:
+        * orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp:
+
+	  Turned on RTTI in these projects, since they use the new
+	  Any operators.
+
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp:
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp:
+
+	  Fixed old-style Any internal calls in these files.
+
 Sun Jan 12 02:01:05 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/NVList.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.dsp b/TAO/orbsvcs/orbsvcs/CosNaming.dsp
index d04c5ed934d..d9f9c1c5575 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.dsp
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.dsp
@@ -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 "CosNaming_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_NAMING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_NAMING" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_NAMING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_NAMING" /FD /c

 # SUBTRACT CPP /YX

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

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

diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.dsp b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.dsp
index 6145c5a0fc9..28913182c39 100644
--- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.dsp
+++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.dsp
@@ -70,7 +70,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 "DSEVENTLOGADMIN_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_EVENTLOG_BUILD_DLL" /FR /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_EVENTLOG_BUILD_DLL" /FR /FD /c

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

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

 # ADD BASE RSC /l 0x809 /d "_DEBUG"

diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp b/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp
index ad43533c55b..26424b21e1f 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp
@@ -73,7 +73,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 "DsLogAdmin_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_LOG_BUILD_DLL" /FR /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_LOG_BUILD_DLL" /FR /FD /c

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

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

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp
index eae5a4873d2..1a3c417804a 100644
--- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp
+++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp
@@ -70,7 +70,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 "DSNOTIFYLOGADMIN_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_NOTIFYLOG_BUILD_DLL" /FR /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_NOTIFYLOG_BUILD_DLL" /FR /FD /c

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

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

 # ADD BASE RSC /l 0x809 /d "_DEBUG"

diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
index 753c22372a8..1ef3f6df0f6 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
@@ -6,6 +6,7 @@
 #include "ETCL_y.h"
 #include "tao/Any.h"
 #include "tao/Managed_Types.h"
+#include "tao/Environment.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "ETCL_Constraint.inl"
@@ -38,8 +39,7 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any)
   CORBA::TypeCode_var type = any_ref.type ();
   CORBA::TCKind corba_type = CORBA::tk_null;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
       corba_type = type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -108,7 +108,7 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any)
       break;
     case TAO_ETCL_BOOLEAN:
       {
-        CORBA_Any::to_boolean tmp (this->op_.bool_);
+        CORBA::Any::to_boolean tmp (this->op_.bool_);
         (*any) >>= tmp;
       }
       break;
@@ -306,8 +306,7 @@ TAO_ETCL_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
   TAO_Literal_Type return_value = TAO_UNKNOWN;
   CORBA::TCKind kind = CORBA::tk_null;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
       kind = type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
index dfb9c119959..6c7a50ec24f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
@@ -194,9 +194,17 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
                     {
                       TAO_OutputCDR cdr;
                       cdr.write_ulong ((CORBA::ULong) disc_val);
-                      disc_any._tao_replace (disc_tc.in (),
-                                             TAO_ENCAP_BYTE_ORDER,
-                                             cdr.begin ());
+
+                      TAO::Unknown_IDL_Type *unk = 0;
+                      ACE_NEW_RETURN (unk,
+                                      TAO::Unknown_IDL_Type (
+                                          disc_tc.in (),
+                                          cdr.begin (),
+                                          TAO_ENCAP_BYTE_ORDER
+                                        ),
+                                      -1);
+
+                      disc_any.replace (unk);
                       break;
                     }
                   // @@@ (JP) I don't think ETCL handles 64-bit
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index e7224c069a0..ce7b71e6b61 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -246,9 +246,17 @@ TAO_NS_Constraint_Visitor::visit_union_pos (
                     {
                       TAO_OutputCDR cdr;
                       cdr.write_ulong ((CORBA::ULong) disc_val);
-                      disc_any._tao_replace (disc_tc.in (),
-                                             TAO_ENCAP_BYTE_ORDER,
-                                             cdr.begin ());
+
+                      TAO::Unknown_IDL_Type *unk = 0;
+                      ACE_NEW_RETURN (unk,
+                                      TAO::Unknown_IDL_Type (
+                                          disc_tc.in (),
+                                          cdr.begin (),
+                                          TAO_ENCAP_BYTE_ORDER
+                                        ),
+                                      -1);
+
+                      disc_any.replace (unk);
                       break;
                     }
                   // @@@ (JP) I don't think ETCL handles 64-bit
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
index fc823d74205..154bc2a34dd 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
@@ -342,7 +342,7 @@ TAO_Literal_Constraint (CORBA::Any* any)
       break;
     case TAO_BOOLEAN:
       {
-        CORBA_Any::to_boolean tmp (this->op_.bool_);
+        CORBA::Any::to_boolean tmp (this->op_.bool_);
         (*any) >>= tmp;
       }
     break;