diff options
| author | Marc Laukien <marc@zeroc.com> | 2001-09-26 03:54:09 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2001-09-26 03:54:09 +0000 |
| commit | 530f5a257276d99fa1c4d703b3927b7449943f6c (patch) | |
| tree | baa4d9337c867bd4ac942d25a7d562817285608e /cpp | |
| parent | Application class (diff) | |
| download | ice-530f5a257276d99fa1c4d703b3927b7449943f6c.tar.bz2 ice-530f5a257276d99fa1c4d703b3927b7449943f6c.tar.xz ice-530f5a257276d99fa1c4d703b3927b7449943f6c.zip | |
fixes
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/demo/Freeze/phonebook/Client.cpp | 2 | ||||
| -rw-r--r-- | cpp/demo/Freeze/phonebook/Server.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/ice.dsp | 60 |
3 files changed, 36 insertions, 28 deletions
diff --git a/cpp/demo/Freeze/phonebook/Client.cpp b/cpp/demo/Freeze/phonebook/Client.cpp index 9f7758de244..ba16356e766 100644 --- a/cpp/demo/Freeze/phonebook/Client.cpp +++ b/cpp/demo/Freeze/phonebook/Client.cpp @@ -166,5 +166,5 @@ int main(int argc, char* argv[]) { PhoneBookClient app; - app.main(argc, argv, "config"); + return app.main(argc, argv, "config"); } diff --git a/cpp/demo/Freeze/phonebook/Server.cpp b/cpp/demo/Freeze/phonebook/Server.cpp index 325979d60a0..40e6bc78b0e 100644 --- a/cpp/demo/Freeze/phonebook/Server.cpp +++ b/cpp/demo/Freeze/phonebook/Server.cpp @@ -136,5 +136,5 @@ int main(int argc, char* argv[]) { PhoneBookServer app; - app.main(argc, argv, "config"); + return app.main(argc, argv, "config"); } diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp index e1fbee37f16..44c16933524 100644 --- a/cpp/src/Ice/ice.dsp +++ b/cpp/src/Ice/ice.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /Ze /W3 /GR /GX /O2 /I ".." /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_USRDLL" /D "ICE_API_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_USRDLL" /D "ICE_API_EXPORTS" /YX /FD /c
# SUBTRACT CPP /Fr
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -75,7 +75,7 @@ PostBuild_Cmds=copy Release\ice001.* ..\..\lib # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /Ze /W3 /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_USRDLL" /D "ICE_API_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_USRDLL" /D "ICE_API_EXPORTS" /YX /FD /GZ /c
# SUBTRACT CPP /Fr
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -108,6 +108,10 @@ SOURCE=.\Acceptor.cpp # End Source File
# Begin Source File
+SOURCE=.\Application.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Collector.cpp
# End Source File
# Begin Source File
@@ -212,6 +216,14 @@ SOURCE=.\Reference.cpp # End Source File
# Begin Source File
+SOURCE=.\ServantFactory.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ServantFactoryManager.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\SslAcceptor.cpp
# End Source File
# Begin Source File
@@ -258,14 +270,6 @@ SOURCE=.\Transceiver.cpp SOURCE=.\UdpTransceiver.cpp
# End Source File
-# Begin Source File
-
-SOURCE=.\ServantFactory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ServantFactoryManager.cpp
-# End Source File
# End Group
# Begin Group "Header Files"
@@ -280,6 +284,10 @@ SOURCE=.\Ice\AcceptorF.h # End Source File
# Begin Source File
+SOURCE=..\..\include\Ice\Application.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\include\Ice\Buffer.h
# End Source File
# Begin Source File
@@ -488,6 +496,22 @@ SOURCE=..\..\include\Ice\ReferenceF.h # End Source File
# Begin Source File
+SOURCE=..\..\include\Ice\ServantFactory.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\Ice\ServantFactoryF.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Ice\ServantFactoryManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Ice\ServantFactoryManagerF.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Ice\SslAcceptor.h
# End Source File
# Begin Source File
@@ -546,22 +570,6 @@ SOURCE=.\Ice\TransceiverF.h SOURCE=.\Ice\UdpTransceiver.h
# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\Ice\ServantFactory.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\Ice\ServantFactoryF.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Ice\ServantFactoryManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Ice\ServantFactoryManagerF.h
-# End Source File
# End Group
# Begin Group "Resource Files"
|