diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-21 20:18:12 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-21 20:18:12 +0000 |
| commit | 7d64b920e1746255da9e8a4ef5fa6ea1859bbf87 (patch) | |
| tree | a2d2a88aed0e55bf1d72fae7b069db64607911f5 | |
| parent | f944cd23af83d2d1782aa1995859915f358314ea (diff) | |
| download | ATCD-7d64b920e1746255da9e8a4ef5fa6ea1859bbf87.tar.gz | |
ChangeLogTag:Tue Mar 21 12:16:01 2000 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | TAO/tao/TAO.dsp | 57 |
2 files changed, 6 insertions, 57 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index f564279d8ff..2bd5c822194 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Tue Mar 21 12:16:01 2000 Carlos O'Ryan <coryan@uci.edu> + + * tao/TAO.dsp: + Removed encode.cpp, decode.cpp and deep_free.cpp, i could not + make it on the first commit because there was a conflict. + Tue Mar 21 13:51:23 2000 Carlos O'Ryan <coryan@cs.wustl.edu> * Merged in the changes in the non_interpretive branch. diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp index d178f022e4a..0a1bd80f845 100644 --- a/TAO/tao/TAO.dsp +++ b/TAO/tao/TAO.dsp @@ -575,44 +575,6 @@ SOURCE=.\debug.cpp # End Source File
# Begin Source File
-SOURCE=.\decode.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=.\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"
@@ -879,25 +841,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"
|