ChangeLogTag:Mon Nov 4 16:14:21 UTC 2002 Don Hinton <dhinton@ieee.org>

6 files changed, 200 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 56da4cba2a2..008ef5e3d3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Mon Nov  4 16:14:21 UTC 2002  Don Hinton  <dhinton@ieee.org>
+
+	* tests/Multicast_Test.cpp (get_handle): Made return type of 
+	  definition ACE_HANDLE to match the declaration.  Thanks to 
+	  Ed Skees <eskees@dctd.saic.com> for reporting this.
+
+	* tests/Multicast_Test.dsp:
+	* tests/tests.dsw:  Added new dsp.  Thanks again to Ed Skees
+	  for providing this.
+
+	* THANKS:  Added Ed Skees to hall of fame...
+
 Mon Nov  4 09:28:34 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
 	* ace/SOCK_Dgram.cpp (recv): Corrected method signature in .cpp to 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 56da4cba2a2..008ef5e3d3e 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,15 @@
+Mon Nov  4 16:14:21 UTC 2002  Don Hinton  <dhinton@ieee.org>
+
+	* tests/Multicast_Test.cpp (get_handle): Made return type of 
+	  definition ACE_HANDLE to match the declaration.  Thanks to 
+	  Ed Skees <eskees@dctd.saic.com> for reporting this.
+
+	* tests/Multicast_Test.dsp:
+	* tests/tests.dsw:  Added new dsp.  Thanks again to Ed Skees
+	  for providing this.
+
+	* THANKS:  Added Ed Skees to hall of fame...
+
 Mon Nov  4 09:28:34 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
 	* ace/SOCK_Dgram.cpp (recv): Corrected method signature in .cpp to 
diff --git a/THANKS b/THANKS
index 3224e0051fe..5ba99f719eb 100644
--- a/THANKS
+++ b/THANKS
@@ -1602,6 +1602,7 @@ Mike Curtis <mcurtis@wt.net>
 Artashes Ghazaryan <arty@unicad.am>
 Thomas Devanneaux <tdevanne@akamai.com>
 Paul Marquis <pmarquis@pobox.com>
+Ed Skees <eskees@dctd.saic.com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/tests/Multicast_Test.cpp b/tests/Multicast_Test.cpp
index 0a6fd26d878..fbb1f196509 100644
--- a/tests/Multicast_Test.cpp
+++ b/tests/Multicast_Test.cpp
@@ -547,7 +547,7 @@ MCT_Event_Handler::handle_close (ACE_HANDLE /*fd*/,
   return 0;
 }
 
-int
+ACE_HANDLE
 MCT_Event_Handler::get_handle (void) const
 {
   return this->mcast_.get_handle ();
diff --git a/tests/Multicast_Test.dsp b/tests/Multicast_Test.dsp
new file mode 100644
index 00000000000..6bcd158a666
--- /dev/null
+++ b/tests/Multicast_Test.dsp
@@ -0,0 +1,162 @@
+# Microsoft Developer Studio Project File - Name="Multicast_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Multicast_Test - Win32 Release

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

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Multicast_Test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

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

+!MESSAGE 

+!MESSAGE NMAKE /f "Multicast_Test.mak" CFG="Multicast_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Multicast_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Multicast_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Multicast_Test - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Multicast_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "Multicast_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Static_Debug"

+# PROP BASE Intermediate_Dir "Static_Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Static_Debug"

+# PROP Intermediate_Dir "Static_Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

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

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

+

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

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Static_Release"

+# PROP BASE Intermediate_Dir "Static_Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Static_Release"

+# PROP Intermediate_Dir "Static_Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\ace"

+

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

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\ace"

+

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

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

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

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Multicast_Test - Win32 Static Debug"

+# Name "Multicast_Test - Win32 Static Release"

+# Name "Multicast_Test - Win32 Release"

+# Name "Multicast_Test - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=.\Multicast_Test.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

+# Begin Source File

+

+SOURCE=.\test_config.h

+# End Source File

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

+# End Group

+# End Target

+# End Project

diff --git a/tests/tests.dsw b/tests/tests.dsw
index 3d23d0440ce..47a6f8d263e 100644
--- a/tests/tests.dsw
+++ b/tests/tests.dsw
@@ -681,6 +681,18 @@ Package=<4>
 

 ###############################################################################

 

+Project: "Multicast_Test"=".\Multicast_Test.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Project: "Message_Queue_Test_Ex"=".\Message_Queue_Test_Ex.dsp" - Package Owner=<4>

 

 Package=<5>