ChangeLogTag: Mon Mar 5 12:55:06 2001 Frank Hunleth <fhunleth@cs.wustl.edu>

4 files changed, 24 insertions, 23 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 2fe4670b3b7..a6127f524cb 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Mon Mar  5 12:55:06 2001  Frank Hunleth <fhunleth@cs.wustl.edu>
+
+	* examples/PluggableUDP/DIOP/TAO_DIOP_Static.dsp:
+	  Removed bogus files from project file list.
+	
+	* examples/PluggableUDP/DIOP/DIOP_Connector.cpp:
+	* examples/PluggableUDP/DIOP/DIOP_Transport.cpp:
+	  Fixed some comments that were causing warnings with the Windows 
+	  builds.
+		
 Mon Mar  5 12:24:05 2001  Jeff Parsons <parsons@cs.wustl.edu>
 
         * tests/IDL_Test/main.cpp:
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.cpp
index 654bafc9b52..b72d093bc6a 100644
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.cpp
+++ b/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.cpp
@@ -101,7 +101,7 @@ TAO_DIOP_Connector::close (void)
 int
 TAO_DIOP_Connector::connect (TAO_Connection_Descriptor_Interface *desc,
                              TAO_Transport *&transport,
-                             ACE_Time_Value */*max_wait_time*/,
+                             ACE_Time_Value * /*max_wait_time*/,
                              CORBA::Environment &)
 {
   TAO_Endpoint *endpoint = desc->endpoint ();
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.cpp
index 7ee87a3432b..1a3582d958f 100644
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.cpp
+++ b/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.cpp
@@ -91,7 +91,7 @@ TAO_DIOP_Transport::idle (void)
 
 ssize_t
 TAO_DIOP_Transport::send (const ACE_Message_Block *message_block,
-                          const ACE_Time_Value */*max_wait_time*/,
+                          const ACE_Time_Value * /*max_wait_time*/,
                           size_t *bt)
 {
   const ACE_INET_Addr &addr = this->connection_handler_->addr ();
@@ -182,7 +182,7 @@ TAO_DIOP_Transport::send (const ACE_Message_Block *message_block,
 ssize_t
 TAO_DIOP_Transport::recv (char *buf,
                           size_t len,
-                          const ACE_Time_Value */*max_wait_time*/)
+                          const ACE_Time_Value * /*max_wait_time*/)
 {
   ACE_INET_Addr from_addr;
 
diff --git a/TAO/examples/PluggableUDP/DIOP/TAO_DIOP_Static.dsp b/TAO/examples/PluggableUDP/DIOP/TAO_DIOP_Static.dsp
index 88c88fc6216..1c04061945d 100644
--- a/TAO/examples/PluggableUDP/DIOP/TAO_DIOP_Static.dsp
+++ b/TAO/examples/PluggableUDP/DIOP/TAO_DIOP_Static.dsp
@@ -7,19 +7,19 @@
 CFG=TAO_DIOP_Static - Win32 Static Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "TAO_DIOP_Static.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "TAO_DIOP_Static.mak" CFG="TAO_DIOP_Static - Win32 Static Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "TAO_DIOP_Static - Win32 Static Release" (based on "Win32 (x86) Static Library")

 !MESSAGE "TAO_DIOP_Static - Win32 Static Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -40,6 +40,8 @@ RSC=rc.exe
 # PROP Output_Dir ""

 # PROP Intermediate_Dir "LIB\Release\DIOP"

 # PROP Target_Dir ""

+LINK32=link.exe -lib

+MTL=midl.exe

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../tao/" /I "../../../" /I "../../../../" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "TAO_AS_STATIC_LIBS" /D "ACE_AS_STATIC_LIBS" /D "TAO_STRATEGIES_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

@@ -64,6 +66,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir "LIB\Debug\DIOP"

 # PROP Target_Dir ""

+LINK32=link.exe -lib

+MTL=midl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../tao/" /I "../../../" /I "../../../../" /D "_WINDOWS" /D "_CONSOLE" /D "_DEBUG" /D "WIN32" /D "ACE_AS_STATIC_LIBS" /D "TAO_AS_STATIC_LIBS" /FD /c

 # SUBTRACT CPP /YX

@@ -76,7 +80,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo

 # ADD LIB32 /nologo /out:"TAO_DIOPsd.lib"

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -87,10 +91,6 @@ LIB32=link.exe -lib
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE=.\advanced_resource.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\DIOP_Acceptor.cpp

 # End Source File

 # Begin Source File

@@ -117,17 +117,12 @@ SOURCE=.\DIOP_Profile.cpp
 

 SOURCE=.\DIOP_Transport.cpp

 # End Source File

-

 # End Group

 # Begin Group "Header Files"

 

 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=.\advanced_resource.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\DIOP_Acceptor.h

 # End Source File

 # Begin Source File

@@ -160,10 +155,6 @@ SOURCE=.\DIOP_Transport.h
 # PROP Default_Filter ".i"

 # Begin Source File

 

-SOURCE=.\advanced_resource.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\DIOP_Acceptor.i

 # End Source File

 # Begin Source File