ChangeLogTag:Wed Jul 10 11:24:39 2002 Steve Huston <shuston@riverace.com>

5 files changed, 145 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index b65181c211c..2cc59bd5304 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jul 10 11:24:39 2002  Steve Huston  <shuston@riverace.com>
+
+        * examples/C++NPv2/AIO_CLD.dsp:
+        * examples/C++NPv2/examples.dsw: Added AIO_CLD project.
+
+        * examples/C++NPv2/AIO_Client_Logging_Daemon.cpp: Fix Win32 compile
+          problems.
+
 Wed Jul 10 07:22:24 2002  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/MakeProjectCreator/modules/TemplateParser.pm:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index b65181c211c..2cc59bd5304 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,11 @@
+Wed Jul 10 11:24:39 2002  Steve Huston  <shuston@riverace.com>
+
+        * examples/C++NPv2/AIO_CLD.dsp:
+        * examples/C++NPv2/examples.dsw: Added AIO_CLD project.
+
+        * examples/C++NPv2/AIO_Client_Logging_Daemon.cpp: Fix Win32 compile
+          problems.
+
 Wed Jul 10 07:22:24 2002  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/MakeProjectCreator/modules/TemplateParser.pm:
diff --git a/examples/C++NPv2/AIO_CLD.dsp b/examples/C++NPv2/AIO_CLD.dsp
new file mode 100644
index 00000000000..e526ec574cf
--- /dev/null
+++ b/examples/C++NPv2/AIO_CLD.dsp
@@ -0,0 +1,113 @@
+# Microsoft Developer Studio Project File - Name="AIO_CLD" - Package Owner=<4>

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

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+

+CFG=AIO_CLD - Win32 Debug

+!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 "AIO_CLD.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 "AIO_CLD.mak" CFG="AIO_CLD - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "AIO_CLD - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "AIO_CLD - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "AIO_CLD - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "AIO_CLD___Win32_Release"

+# PROP BASE Intermediate_Dir "AIO_CLD___Win32_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 /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "AIO_CLD_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "AIO_CLD_EXPORTS" /D "AIO_CLD_BUILD_DLL" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# 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 /dll /machine:I386

+# ADD LINK32 ace.lib libeay32.lib ssleay32.lib /nologo /dll /machine:I386 /libpath:"..\..\ace"

+

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

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "AIO_CLD___Win32_Debug"

+# PROP BASE Intermediate_Dir "AIO_CLD___Win32_Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "Debug"

+# 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 "AIO_CLD_EXPORTS" /YX /FD  /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "AIO_CLD_EXPORTS" /D "AIO_CLD_BUILD_DLL" /FD  /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# 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 /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib libeay32.lib ssleay32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "AIO_CLD - Win32 Release"

+# Name "AIO_CLD - Win32 Debug"

+# Begin Group "Source Files"

+

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

+# Begin Source File

+

+SOURCE=.\AIO_Client_Logging_Daemon.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

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

+# Begin Source File

+

+SOURCE=.\AIO_CLD_export.h

+# End Source File

+# End Group

+# Begin Group "Resource Files"

+

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

+# End Group

+# End Target

+# End Project

diff --git a/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp b/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
index 05a736d5a00..923ea7bfe67 100644
--- a/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
+++ b/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
@@ -233,7 +233,7 @@ void AIO_Output_Handler::handle_write_stream
   ACE_Message_Block &mblk = result.message_block ();
   if (!result.success ()) {
     mblk.rd_ptr (mblk.base ());
-    ungetq (mblk);
+    ungetq (&mblk);
   }
   else {
     can_write_ = handle () == result.handle ();
@@ -242,7 +242,7 @@ void AIO_Output_Handler::handle_write_stream
       if (can_write_) start_write ();
     }
     else if (can_write_) start_write (&mblk);
-    else { mblk.rd_ptr (mblk.base ()); ungetq (mblk); }
+    else { mblk.rd_ptr (mblk.base ()); ungetq (&mblk); }
   }
 }
 
@@ -364,7 +364,8 @@ int AIO_CLD_Connector::validate_connection
   }
 
   SSL_clear (ssl_);
-  SSL_set_fd (ssl_, result.connect_handle ());
+  SSL_set_fd
+    (ssl_, ACE_reinterpret_cast (int, result.connect_handle ()));
 
   SSL_set_verify (ssl_, SSL_VERIFY_PEER, 0);
 
diff --git a/examples/C++NPv2/examples.dsw b/examples/C++NPv2/examples.dsw
index 9133ec7d50f..9a2c1d55526 100644
--- a/examples/C++NPv2/examples.dsw
+++ b/examples/C++NPv2/examples.dsw
@@ -15,6 +15,18 @@ Package=<4>
 

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

 

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

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

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

+

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

 

 Package=<5>