Various fixes.

5 files changed, 10 insertions, 10 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
index 2e42074c48d..dfb84ee231d 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
@@ -134,8 +134,8 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
       << "}\n\n";
 
   *os << "CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
-      << "const CORBA::Any &_tao_any, const " << be_nl
-      << node->name () << " *&_tao_elem" << be_uidt_nl
+      << "const CORBA::Any &_tao_any," << be_nl
+      << "const " << node->name () << " *&_tao_elem" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "ACE_TRY_NEW_ENV" << be_nl
@@ -268,7 +268,7 @@ gen_extraction (TAO_OutStream *os,
       << "((CORBA::Any *)&_tao_any)->_tao_replace (" << be_idt << be_idt_nl
       << node->tc_name () << "," << be_nl
       << "1," << be_nl
-      << "ACE_reinterpret_cast(void*,_tao_elem)," << be_nl
+      << "_tao_elem," << be_nl
       << "ACE_TRY_ENV" << be_uidt_nl
       << ");" << be_uidt_nl
       << "ACE_TRY_CHECK;" << be_nl;
@@ -284,7 +284,7 @@ gen_const_extraction (TAO_OutStream *os,
       << "((CORBA::Any *)&_tao_any)->_tao_replace (" << be_idt << be_idt_nl
       << node->tc_name () << "," << be_nl
       << "1," << be_nl
-      << "ACE_reinterpret_cast(void*,_tao_elem)," << be_nl
+      << "_tao_elem," << be_nl
       << "ACE_TRY_ENV" << be_uidt_nl
       << ");" << be_uidt_nl
       << "ACE_TRY_CHECK;" << be_nl;
diff --git a/TAO/performance-tests/Latency/deferred_synch_client.dsp b/TAO/performance-tests/Latency/deferred_synch_client.dsp
index 8374ec2236b..de8477531d9 100644
--- a/TAO/performance-tests/Latency/deferred_synch_client.dsp
+++ b/TAO/performance-tests/Latency/deferred_synch_client.dsp
@@ -65,8 +65,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

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

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

 BSC32=bscmake.exe

@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

 

 !ENDIF 

 

diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.dsp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.dsp
index 62fdd8b8beb..2bb9eff598f 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.dsp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.dsp
@@ -137,7 +137,7 @@ InputPath=.\test.idl
 InputName=test

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	tao_idl -Ge 1 $(InputName).idl

+	..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 # End Custom Build

 

diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.dsp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.dsp
index e16cf024015..8017fc8c354 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.dsp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.dsp
@@ -161,7 +161,7 @@ InputPath=.\test.idl
 InputName=test

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	tao_idl -Ge 1 $(InputName).idl

+	..\..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 # End Custom Build

 

diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index 6614a3e669a..a755ffb1eba 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -1436,7 +1436,7 @@ CORBA_Any::operator>>= (const CORBA::Any *&a) const
                 }
               else
                 {
-                  delete a;
+                  delete ACE_const_cast (CORBA::Any *, a);
                   a = 0;
                   return 0;
                 }