ChangeLogTag:Thu May 09 10:39:17 2002 Nanbor Wang <nanbor@cs.wustl.edu>

5 files changed, 162 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index fa886c9ccb4..376935b6929 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu May 09 10:39:17 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ace/ace_dll.dsp:
+	* ace/ace_lib.dsp: Fixed link error on win32.  I forgot to merge
+	  these project files differently (they can not be merged.)
+
 Thu May  9 01:07:56 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* ACEXML/common/StrCharStream.h:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index fa886c9ccb4..376935b6929 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Thu May 09 10:39:17 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ace/ace_dll.dsp:
+	* ace/ace_lib.dsp: Fixed link error on win32.  I forgot to merge
+	  these project files differently (they can not be merged.)
+
 Thu May  9 01:07:56 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* ACEXML/common/StrCharStream.h:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index fa886c9ccb4..376935b6929 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Thu May 09 10:39:17 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ace/ace_dll.dsp:
+	* ace/ace_lib.dsp: Fixed link error on win32.  I forgot to merge
+	  these project files differently (they can not be merged.)
+
 Thu May  9 01:07:56 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* ACEXML/common/StrCharStream.h:
diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp
index 3c5073f0d82..790921ede8b 100644
--- a/ace/ace_dll.dsp
+++ b/ace/ace_dll.dsp
@@ -186,6 +186,14 @@ SOURCE=.\ARGV.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Argv_Type_Converter.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Asynch_Connector.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Asynch_IO.cpp

 # End Source File

 # Begin Source File

@@ -194,6 +202,10 @@ SOURCE=.\Asynch_IO_Impl.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Asynch_Pseudo_Task.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\ATM_Acceptor.cpp

 # End Source File

 # Begin Source File

@@ -262,6 +274,10 @@ SOURCE=.\Containers.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Copy_Disabled.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Date_Time.cpp

 # End Source File

 # Begin Source File

@@ -938,6 +954,10 @@ SOURCE=.\Time_Request_Reply.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Time_Value.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Timeprobe.cpp

 # End Source File

 # Begin Source File

@@ -1102,10 +1122,18 @@ SOURCE=.\ARGV.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Argv_Type_Converter.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Asynch_Acceptor.h

 # End Source File

 # Begin Source File

 

+SOURCE=.\Asynch_Connector.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Asynch_IO.h

 # End Source File

 # Begin Source File

@@ -1114,6 +1142,10 @@ SOURCE=.\Asynch_IO_Impl.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Asynch_Pseudo_Task.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\ATM_Acceptor.h

 # End Source File

 # Begin Source File

@@ -1250,6 +1282,10 @@ SOURCE=.\Containers_T.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Copy_Disabled.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Date_Time.h

 # End Source File

 # Begin Source File

@@ -2286,6 +2322,10 @@ SOURCE=.\ARGV.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Argv_Type_Converter.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\Asynch_Acceptor.i

 # End Source File

 # Begin Source File

@@ -3014,6 +3054,10 @@ SOURCE=.\Thread_Manager.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Time_Value.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\Timer_Queue_Adapters.i

 # End Source File

 # Begin Source File

@@ -3114,6 +3158,19 @@ SOURCE=.\Asynch_Acceptor.cpp
 # Begin Source File

 

 SOURCE=.\Atomic_Op.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

@@ -3168,6 +3225,19 @@ SOURCE=.\Dump_T.cpp
 # Begin Source File

 

 SOURCE=.\Framework_Component_T.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

diff --git a/ace/ace_lib.dsp b/ace/ace_lib.dsp
index 13d376dc851..c66ee8eb13e 100644
--- a/ace/ace_lib.dsp
+++ b/ace/ace_lib.dsp
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\LIB\Release"

 # PROP Target_Dir ""

-LINK32=link.exe -lib

 MTL=midl.exe

+LINK32=link.exe -lib

 # ADD BASE CPP /nologo /MD /W3 /GX /O1 /I "../" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MT /W3 /GX /O1 /I "../" /I "../PACE" /D ACE_OS_HAS_DLL=0 /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

@@ -69,8 +69,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\LIB\Debug"

 # PROP Target_Dir ""

-LINK32=link.exe -lib

 MTL=midl.exe

+LINK32=link.exe -lib

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /FD /c

 # SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /Gy /I "../" /I "../PACE" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c

@@ -96,8 +96,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\LIB\Release"

 # PROP Target_Dir ""

-LINK32=link.exe -lib

 MTL=midl.exe

+LINK32=link.exe -lib

 # ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

 # ADD CPP /nologo /MD /W3 /GX /Zi /O1 /I "../" /I "../PACE" /D "_WINDOWS" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

 # SUBTRACT CPP /YX

@@ -122,8 +122,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\LIB\Debug"

 # PROP Target_Dir ""

-LINK32=link.exe -lib

 MTL=midl.exe

+LINK32=link.exe -lib

 # ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /I "../PACE" /D "_WINDOWS" /D "_DEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

 # SUBTRACT CPP /YX

@@ -173,6 +173,14 @@ SOURCE=.\ARGV.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Argv_Type_Converter.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Asynch_Connector.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Asynch_IO.cpp

 # End Source File

 # Begin Source File

@@ -181,6 +189,10 @@ SOURCE=.\Asynch_IO_Impl.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Asynch_Pseudo_Task.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\ATM_Acceptor.cpp

 # End Source File

 # Begin Source File

@@ -249,6 +261,10 @@ SOURCE=.\Containers.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Copy_Disabled.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Date_Time.cpp

 # End Source File

 # Begin Source File

@@ -929,6 +945,10 @@ SOURCE=.\Time_Request_Reply.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Time_Value.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Timeprobe.cpp

 # End Source File

 # Begin Source File

@@ -1093,10 +1113,18 @@ SOURCE=.\ARGV.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Argv_Type_Converter.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Asynch_Acceptor.h

 # End Source File

 # Begin Source File

 

+SOURCE=.\Asynch_Connector.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Asynch_IO.h

 # End Source File

 # Begin Source File

@@ -1105,6 +1133,10 @@ SOURCE=.\Asynch_IO_Impl.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Asynch_Pseudo_Task.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\ATM_Acceptor.h

 # End Source File

 # Begin Source File

@@ -1245,6 +1277,10 @@ SOURCE=.\Containers_T.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Copy_Disabled.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Date_Time.h

 # End Source File

 # Begin Source File

@@ -2281,6 +2317,10 @@ SOURCE=.\ARGV.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Argv_Type_Converter.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\Asynch_Acceptor.i

 # End Source File

 # Begin Source File

@@ -3009,6 +3049,10 @@ SOURCE=.\Thread_Manager.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Time_Value.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\Timer_Queue_Adapters.i

 # End Source File

 # Begin Source File

@@ -3109,6 +3153,19 @@ SOURCE=.\Asynch_Acceptor.cpp
 # Begin Source File

 

 SOURCE=.\Atomic_Op.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

@@ -3163,6 +3220,19 @@ SOURCE=.\Dump_T.cpp
 # Begin Source File

 

 SOURCE=.\Framework_Component_T.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+# PROP Exclude_From_Build 1

+

+!ENDIF 

+

 # End Source File

 # Begin Source File