diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-13 23:38:45 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-13 23:38:45 +0000 |
| commit | f622d6c5b2e2b0a2c41deb42da3936bccedf1fc7 (patch) | |
| tree | 1140d1b42398e7e51f6d98dbb7b56dd0c3c89db4 | |
| parent | a500b423a3a441335380c2102573b83673b44281 (diff) | |
| download | ATCD-f622d6c5b2e2b0a2c41deb42da3936bccedf1fc7.tar.gz | |
ChangeLogTag:Mon Mar 13 15:37:05 2000 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 9 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/TAO.dsp | 19 | ||||
| -rw-r--r-- | TAO/tao/TAO_Static.dsp | 4 |
4 files changed, 11 insertions, 25 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 4245ff504ba..df7780c5dc1 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,12 @@ +Mon Mar 13 15:37:05 2000 Carlos O'Ryan <coryan@uci.edu> + + * tao/TAO.dsp: + * tao/TAO_Static.dsp: + Removed the deep_free.cpp file from the projects. + + * TAO_IDL/be/be_visitor_union/any_op_cs.cpp: + Corrected indentation. + Mon Mar 13 14:19:27 2000 Carlos O'Ryan <coryan@uci.edu> * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp: 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 7f660113241..1ae318512d6 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 @@ -82,7 +82,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) << "stream.begin ()," << be_nl << "1," << be_nl << "_tao_elem," << be_nl - << node->name () << "::_tao_any_destructor" << be_nl + << node->name () << "::_tao_any_destructor" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}" << be_uidt_nl << "}\n" << be_nl; @@ -95,7 +95,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) << "return _tao_any >>= ACE_const_cast(" << be_idt << be_idt_nl << "const " << node->name () << "*&," << be_nl << "_tao_elem" << be_uidt_nl - << ");" << be_uidt_nl + << ");" << be_uidt << be_uidt_nl << "}\n\n"; *os << "CORBA::Boolean operator>>= (" << be_idt << be_idt_nl diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp index bff4ad50a4b..51330fa0745 100644 --- a/TAO/tao/TAO.dsp +++ b/TAO/tao/TAO.dsp @@ -594,25 +594,6 @@ SOURCE=.\debug.cpp # End Source File
# Begin Source File
-SOURCE=.\deep_free.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=.\default_client.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Release"
diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp index 29c65dfc1ac..b960e5abd3e 100644 --- a/TAO/tao/TAO_Static.dsp +++ b/TAO/tao/TAO_Static.dsp @@ -162,10 +162,6 @@ SOURCE=.\debug.cpp # End Source File
# Begin Source File
-SOURCE=.\deep_free.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\default_client.cpp
# End Source File
# Begin Source File
|