From 30ca8138b918ffea4878baba6ed2e56c14c497f3 Mon Sep 17 00:00:00 2001 From: parsons Date: Fri, 10 Mar 2000 17:24:24 +0000 Subject: Added BoundsC.* to the projects and cast away the constness of the internal char * in the ACE_THROW_RETURN statement in get_string(). --- TAO/tao/DynAny_i.cpp | 2 +- TAO/tao/TAO.dsp | 51 ++++++++++++++++++-------------------------------- TAO/tao/TAO_Static.dsp | 20 ++++++++++++-------- 3 files changed, 31 insertions(+), 42 deletions(-) diff --git a/TAO/tao/DynAny_i.cpp b/TAO/tao/DynAny_i.cpp index 5189137cd04..a86667aaca4 100644 --- a/TAO/tao/DynAny_i.cpp +++ b/TAO/tao/DynAny_i.cpp @@ -677,7 +677,7 @@ TAO_DynAny_i::get_string (CORBA::Environment &ACE_TRY_ENV) if (!(this->value_ >>= val)) { ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (), - val); + ACE_const_cast (char *, val)); } return CORBA::string_dup (val); diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp index 5006b704ec2..bff4ad50a4b 100644 --- a/TAO/tao/TAO.dsp +++ b/TAO/tao/TAO.dsp @@ -328,7 +328,7 @@ SOURCE=.\Asynch_Invocation.cpp # End Source File # Begin Source File -SOURCE=.\Buffering_Constraint_Policy.cpp +SOURCE=.\BoundsC.cpp !IF "$(CFG)" == "TAO DLL - Win32 Release" @@ -347,7 +347,7 @@ SOURCE=.\Buffering_Constraint_Policy.cpp # End Source File # Begin Source File -SOURCE=.\CDR.cpp +SOURCE=.\Buffering_Constraint_Policy.cpp !IF "$(CFG)" == "TAO DLL - Win32 Release" @@ -366,7 +366,7 @@ SOURCE=.\CDR.cpp # End Source File # Begin Source File -SOURCE=.\CDR_Interpreter.cpp +SOURCE=.\CDR.cpp !IF "$(CFG)" == "TAO DLL - Win32 Release" @@ -385,7 +385,7 @@ SOURCE=.\CDR_Interpreter.cpp # End Source File # Begin Source File -SOURCE=.\Client_Priority_Policy.cpp +SOURCE=.\CDR_Interpreter.cpp !IF "$(CFG)" == "TAO DLL - Win32 Release" @@ -404,7 +404,7 @@ SOURCE=.\Client_Priority_Policy.cpp # End Source File # Begin Source File -SOURCE=.\Client_Strategy_Factory.cpp +SOURCE=.\Client_Priority_Policy.cpp !IF "$(CFG)" == "TAO DLL - Win32 Release" @@ -423,7 +423,7 @@ SOURCE=.\Client_Strategy_Factory.cpp # End Source File # Begin Source File -SOURCE=.\Connector_Registry.cpp +SOURCE=.\Client_Strategy_Factory.cpp !IF "$(CFG)" == "TAO DLL - Win32 Release" @@ -442,7 +442,7 @@ SOURCE=.\Connector_Registry.cpp # End Source File # Begin Source File -SOURCE=.\Context.cpp +SOURCE=.\Connector_Registry.cpp !IF "$(CFG)" == "TAO DLL - Win32 Release" @@ -461,7 +461,7 @@ SOURCE=.\Context.cpp # End Source File # Begin Source File -SOURCE=.\CONV_FRAMEC.cpp +SOURCE=.\Context.cpp !IF "$(CFG)" == "TAO DLL - Win32 Release" @@ -480,7 +480,7 @@ SOURCE=.\CONV_FRAMEC.cpp # End Source File # Begin Source File -SOURCE=.\CONV_FRAMES.cpp +SOURCE=.\CONV_FRAMEC.cpp !IF "$(CFG)" == "TAO DLL - Win32 Release" @@ -499,7 +499,7 @@ SOURCE=.\CONV_FRAMES.cpp # End Source File # Begin Source File -SOURCE=.\corbafwd.cpp +SOURCE=.\CONV_FRAMES.cpp !IF "$(CFG)" == "TAO DLL - Win32 Release" @@ -518,7 +518,7 @@ SOURCE=.\corbafwd.cpp # End Source File # Begin Source File -SOURCE=.\CurrentC.cpp +SOURCE=.\corbafwd.cpp !IF "$(CFG)" == "TAO DLL - Win32 Release" @@ -537,7 +537,7 @@ SOURCE=.\CurrentC.cpp # End Source File # Begin Source File -SOURCE=.\CurrentS.cpp +SOURCE=.\CurrentC.cpp !IF "$(CFG)" == "TAO DLL - Win32 Release" @@ -556,7 +556,7 @@ SOURCE=.\CurrentS.cpp # End Source File # Begin Source File -SOURCE=.\debug.cpp +SOURCE=.\CurrentS.cpp !IF "$(CFG)" == "TAO DLL - Win32 Release" @@ -575,7 +575,7 @@ SOURCE=.\debug.cpp # End Source File # Begin Source File -SOURCE=.\decode.cpp +SOURCE=.\debug.cpp !IF "$(CFG)" == "TAO DLL - Win32 Release" @@ -879,25 +879,6 @@ SOURCE=.\DynUnion_i.cpp # End Source File # Begin Source File -SOURCE=.\encode.cpp - -!IF "$(CFG)" == "TAO DLL - Win32 Release" - -!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug" - -!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Release" - -!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug" - -!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug" - -!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release" - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=.\Environment.cpp !IF "$(CFG)" == "TAO DLL - Win32 Release" @@ -3450,6 +3431,10 @@ SOURCE=.\Asynch_Invocation.i # End Source File # Begin Source File +SOURCE=.\BoundsC.i +# End Source File +# Begin Source File + SOURCE=.\Buffering_Constraint_Policy.i # End Source File # Begin Source File diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp index 18d9d0e793b..29c65dfc1ac 100644 --- a/TAO/tao/TAO_Static.dsp +++ b/TAO/tao/TAO_Static.dsp @@ -106,6 +106,10 @@ SOURCE=.\Asynch_Invocation.cpp # End Source File # Begin Source File +SOURCE=.\BoundsC.cpp +# End Source File +# Begin Source File + SOURCE=.\Buffering_Constraint_Policy.cpp # End Source File # Begin Source File @@ -158,10 +162,6 @@ SOURCE=.\debug.cpp # End Source File # Begin Source File -SOURCE=.\decode.cpp -# End Source File -# Begin Source File - SOURCE=.\deep_free.cpp # End Source File # Begin Source File @@ -222,10 +222,6 @@ SOURCE=.\DynUnion_i.cpp # End Source File # Begin Source File -SOURCE=.\encode.cpp -# End Source File -# Begin Source File - SOURCE=.\Environment.cpp # End Source File # Begin Source File @@ -666,6 +662,10 @@ SOURCE=.\Asynch_Invocation.h # End Source File # Begin Source File +SOURCE=.\BoundsC.h +# End Source File +# Begin Source File + SOURCE=.\Buffering_Constraint_Policy.h # End Source File # Begin Source File @@ -1210,6 +1210,10 @@ SOURCE=.\Asynch_Invocation.i # End Source File # Begin Source File +SOURCE=.\BoundsC.i +# End Source File +# Begin Source File + SOURCE=.\Buffering_Constraint_Policy.i # End Source File # Begin Source File -- cgit v1.2.1