*** empty log message ***

author: irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 1998-05-25 19:24:55 +0000
committer: irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 1998-05-25 19:24:55 +0000
commit: 7135c1b124c77a9c21c8354b35f5d67ef480ad5f (patch)
tree: 8901f26d1ba662351b8e50b79f4e63d4a5805752
parent: a6d71a3d9cc64176ae6199c70fe1e991e274a643 (diff)
download: ATCD-7135c1b124c77a9c21c8354b35f5d67ef480ad5f.tar.gz
13 files changed, 1101 insertions, 1140 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b
index 297d9b793ba..ebcfc3d9f1c 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -1,8 +1,39 @@
+Sat Apr 18 01:28:36 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* ace/Timeprobe.h (class ACE_Timeprobe): Changed ACE_Timeprobe to
+ 	  use ACE_OS::gethrtime().
+
+Thu Apr 16 04:14:53 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* ace/Timeprobe: 
+
+	  This class is used to instrument code.  This is accomplished by
+ 	  inserting time probes at different location in the code.
+  	  ACE_Timeprobe then measures the time difference between two time
+ 	  probes.
+	  
+	  This class provides a lightweight implementation for measuring
+ 	  the time required to execute code between two time probes.  When
+ 	  a time probe executes, it records the time, the id of the
+ 	  calling thread, and an event description.  The event description
+ 	  can either be an unsigned long or a string (char *).  If string
+ 	  are used, care must be taken cause only pointer copies are done
+ 	  and the string data is *not* copied.
+        
+	  The recorded time probes can then be printed by calling
+ 	  print_times().  If you have used unsigned longs as event
+ 	  descriptions in any of your time probes, you must provide an
+ 	  event description table that maps the unsigned longs to readable
+ 	  strings.  This map is a simple array of strings, and the event
+ 	  number is used as the index into the array when looking for the
+ 	  event description.  If you have only used strings for the event
+ 	  description, this map is not necessary.
+
 Sat May 23 21:52:49 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
 	* ace/Message_Block.h: 
 	* ace/Message_Block.i: 
-	  The rd_ptr() and wr_ptr() are cont methods now.
+	  The rd_ptr() and wr_ptr() are const methods now.
 
 Sat May 23 00:18:58 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
 
@@ -35,7 +66,7 @@ Fri May 22 12:20:11 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
           the correct IO_Vector class provided by the platform.
 
           writev() and readv() were being emulated on Win32 in ACE.  A new
-          ACE_OS::writev() and ACE_OS::readv() has been added to ACE to
+          ACE_OS::writev() and ACE_OS::readv() has been added to ACE
           that uses WSASend() and WSARecv() respectively.  However, in
           order for you to exploit these new functions, you must use
           ACE_IO_Vector instead of iovec.  The ideal situation would have
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 5d70cebe3a9..b1fc3d22e29 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,10 @@
+Sat Apr 18 01:27:52 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* tao/Timeprobe.h: Added more timeprobes to POA, ORB, and GIOP.
+
+	* TAO: Change the use of time probes.  The new ACE scheme is now
+ 	  used.
+
 Mon May 25 11:58:35 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
 	* tests/Quoter/client.cpp: 
diff --git a/TAO/tao/Connect.cpp b/TAO/tao/Connect.cpp
index 16ee358bc77..7d10504bab4 100644
--- a/TAO/tao/Connect.cpp
+++ b/TAO/tao/Connect.cpp
@@ -109,59 +109,6 @@ TAO_Server_Connection_Handler::svc (void)
   return result;
 }
 
-// Extract a message from the stream associated with <peer()> and
-// place it into <input>.  Return 0 if success, -1 with <errno> and
-// <env> set if problems.
-
-TAO_Server_Connection_Handler::RequestStatus
-TAO_Server_Connection_Handler::recv_request (TAO_InputCDR &input,
-                                             CORBA::Environment &env)
-{
-  RequestStatus which = Error;
-
-  TAO_SVC_HANDLER *this_ptr = this;
-
-  switch (TAO_GIOP::recv_request (this_ptr, input, env))
-    {
-    case TAO_GIOP::Request:
-      // Received a request...just exit for further processing!
-      which = Request;
-      break;
-
-    case TAO_GIOP::LocateRequest:
-      // Received a request...just exit for further processing!
-      which = LocateRequest;
-      break;
-
-      // These messages should never be sent to the server; it's an
-      // error if the peer tries.  Set the environment accordingly, as
-      // it's not yet been reported as an error.
-    case TAO_GIOP::Reply:
-    case TAO_GIOP::LocateReply:
-    case TAO_GIOP::CloseConnection:
-    default:                                    // Unknown message
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) Illegal message received by server\n"));
-      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_NO));
-      // FALLTHROUGH
-
-    case TAO_GIOP::EndOfFile:
-      errno = EPIPE;
-      // FALLTHROUGH
-
-      // recv_request () has already set some error in the environment
-      // for all "MessageError" cases, so don't clobber it.
-      //
-      // General error recovery is to send MessageError to the peer
-      // just in case (it'll fail on EOF) and then close the
-      // connection.
-    case TAO_GIOP::MessageError:
-      break;
-    }
-
-  return which;
-}
-
 // Handle processing of the request residing in <input>, setting
 // <response_required> to zero if the request is for a oneway or
 // non-zero if for a two-way and <output> to any necessary response
@@ -293,11 +240,12 @@ TAO_Server_Connection_Handler::handle_input (ACE_HANDLE)
   int result = 0;
   int error_encountered = 0;
   int response_required;
+  TAO_SVC_HANDLER *this_ptr = this;
   CORBA::Environment env;
 
-  switch (this->recv_request (input, env))
+  switch (TAO_GIOP::recv_request (this_ptr, input))
     {
-    case Request:
+    case TAO_GIOP::Request:
       // Message was successfully read, so handle it.  If we encounter
       // any errors, <output> will be set appropriately by the called
       // code, and -1 will be returned.
@@ -305,27 +253,32 @@ TAO_Server_Connection_Handler::handle_input (ACE_HANDLE)
         error_encountered = 1;
       break;
 
-    case LocateRequest:
+    case TAO_GIOP::LocateRequest:
       if (this->handle_locate (input, output, response_required, env) == -1)
         error_encountered = 1;
       break;
 
-    case -1:
-      // Check errno and/or env for details
-      if (env.exception ())
-        {
-          TAO_GIOP::make_error (output /* ...other information... */ );
-          error_encountered = 1;
-          // Of course, we must be careful to properly process
-          // end-of-file and other communications-related conditions
-          // here so that handle_input() returns the correct value.
-        }
-      else if (errno == EPIPE)
-        {
-          // Got a EOF
-          response_required = error_encountered = 0;
-          result = -1;
-        }
+    case TAO_GIOP::EndOfFile:
+      // Got a EOF
+      errno = EPIPE;
+      response_required = error_encountered = 0;
+      result = -1;
+      break;
+
+      // These messages should never be sent to the server; it's an
+      // error if the peer tries.  Set the environment accordingly, as
+      // it's not yet been reported as an error.
+    case TAO_GIOP::Reply:
+    case TAO_GIOP::LocateReply:
+    case TAO_GIOP::CloseConnection:
+    default:                                    // Unknown message
+      ACE_DEBUG ((LM_DEBUG,
+                  "(%P|%t) Illegal message received by server\n"));
+      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_NO));
+      // FALLTHROUGH
+
+    case TAO_GIOP::MessageError:
+      error_encountered = 1;      
       break;
     }
 
diff --git a/TAO/tao/Connect.h b/TAO/tao/Connect.h
index 0efd8a61bfe..26e8b62b63a 100644
--- a/TAO/tao/Connect.h
+++ b/TAO/tao/Connect.h
@@ -97,19 +97,6 @@ public:
 
   // = Template Methods Called by <handle_input>
 
-  enum RequestStatus
-  {
-    Error = -1,
-    Request,      // A CORBA Request was received
-    LocateRequest // A CORBA LocateRequest was received
-  };
-
-  virtual RequestStatus recv_request (TAO_InputCDR &msg,
-				      CORBA::Environment &env);
-  // Extract a message from the stream associated with <peer()> and
-  // place it into <msg>.  Return either <Request> or <LocateRequest>
-  // if success, <Error> with <errno> and <env> set if problems.
-
   virtual int handle_message (TAO_InputCDR &msg,
                               TAO_OutputCDR &response,
 			      int &response_required,
diff --git a/TAO/tao/GIOP.cpp b/TAO/tao/GIOP.cpp
index 35ee2e2d733..3a397c1a713 100644
--- a/TAO/tao/GIOP.cpp
+++ b/TAO/tao/GIOP.cpp
@@ -354,8 +354,7 @@ TAO_GIOP::read_buffer (TAO_SOCK_Stream &peer,
 
 TAO_GIOP::Message_Type
 TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
-                        TAO_InputCDR &msg,
-                        CORBA::Environment &env)
+                        TAO_InputCDR &msg)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_GIOP_RECV_REQUEST_START);
 
@@ -375,10 +374,7 @@ TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
 
   CDR::mb_align (msg.start_);
   if (CDR::grow (msg.start_, TAO_GIOP_HEADER_LEN) == -1)
-    {
-      env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-      return TAO_GIOP::MessageError;
-    }
+    return TAO_GIOP::MessageError;
 
   char *header = msg.start_->rd_ptr ();
   ssize_t len = TAO_GIOP::read_buffer (connection,
@@ -413,7 +409,6 @@ TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
           /* NOTREACHED */
         }
 
-      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_NO));
       return TAO_GIOP::MessageError;
     }
 
@@ -428,7 +423,6 @@ TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
         && header [2] == 'O'
         && header [3] == 'P'))
     {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
       ACE_DEBUG ((LM_DEBUG, "bad header, magic word\n"));
       return TAO_GIOP::MessageError;
     }
@@ -439,7 +433,6 @@ TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
   if (!(header [4] == TAO_GIOP_MessageHeader::MY_MAJOR
         && header [5] <= TAO_GIOP_MessageHeader::MY_MINOR))
     {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
       ACE_DEBUG ((LM_DEBUG, "bad header, version\n"));
       return TAO_GIOP::MessageError;
     }
@@ -466,10 +459,7 @@ TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
   assert (message_size <= UINT_MAX);
 
   if (CDR::grow (msg.start_, TAO_GIOP_HEADER_LEN + message_size) == -1)
-    {
-      env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-      return TAO_GIOP::MessageError;
-    }
+    return TAO_GIOP::MessageError;
 
   // Growing the buffer may have reset the rd_ptr(), but we want to
   // leave it just after the GIOP header (that was parsed already);
@@ -510,7 +500,6 @@ TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
         }
 
       // clean up, and ...
-      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_NO));
       ACE_DEBUG ((LM_DEBUG, "couldn't read rest of message\n"));
       return TAO_GIOP::MessageError;
     }
@@ -829,8 +818,7 @@ TAO_GIOP_Invocation::invoke (CORBA::ExceptionList &exceptions,
 
   TAO_SVC_HANDLER *handler = this->handler_;
   TAO_GIOP::Message_Type m = TAO_GIOP::recv_request (handler,
-                                                     this->inp_stream_,
-                                                     env);
+                                                     this->inp_stream_);
   switch (m)
     {
     case TAO_GIOP::Reply:
@@ -1181,8 +1169,7 @@ TAO_GIOP_Invocation::invoke (TAO_Exception_Data *excepts,
 
   TAO_SVC_HANDLER *handler = this->handler_;
   TAO_GIOP::Message_Type m = TAO_GIOP::recv_request (handler,
-                                                     this->inp_stream_,
-                                                     env);
+                                                     this->inp_stream_);
   switch (m)
     {
     case TAO_GIOP::Reply:
diff --git a/TAO/tao/GIOP.h b/TAO/tao/GIOP.h
index 00f2a70291f..a20daf56c15 100644
--- a/TAO/tao/GIOP.h
+++ b/TAO/tao/GIOP.h
@@ -379,8 +379,7 @@ public:
   // Send message, returns TRUE if success, else FALSE.
 
   static TAO_GIOP::Message_Type recv_request (TAO_SVC_HANDLER *&handler,
-					      TAO_InputCDR &msg,
-					      CORBA::Environment &env);
+					      TAO_InputCDR &msg);
   // Reads message, returns message type from header.
 
   static void make_error (TAO_OutputCDR &msg, ...);
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index 228ad7dbd01..0fe42f90efd 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -60,8 +60,7 @@ ORBCORE_SRCS = \
 	skip \
 	TAO_Internal \
 	Typecode_Constants \
-	TAO \
-	Timeprobe
+	TAO 
 
 FILES	 = $(ORBCORE_SRCS)
 
diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp
index 4cea5adf527..7a77ea398de 100644
--- a/TAO/tao/POA.cpp
+++ b/TAO/tao/POA.cpp
@@ -1,8 +1,6 @@
 // @(#) $Id$
 
-#define POA_NO_TIMESTAMP
-
-# include "tao/corba.h"
+#include "tao/corba.h"
 
 // Timeprobes class
 #include "tao/Timeprobe.h"
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 651b3b638b9..6cc56d47fbb 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -1,599 +1,599 @@
-# Microsoft Developer Studio Project File - Name="TAO" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=TAO - 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 "TAO.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 "TAO.mak" CFG="TAO - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "TAO - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "TAO - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "TAO - 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 ""
-# 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" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /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 /subsystem:windows /dll /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\ace"
-# SUBTRACT LINK32 /incremental:yes
-
-!ELSEIF  "$(CFG)" == "TAO - 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 /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /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 /subsystem:windows /dll /debug /machine:I386
-# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\ace"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "TAO - Win32 Release"
-# Name "TAO - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=.\Any.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\append.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CDR.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Client_Strategy_Factory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Connect.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\debug.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\decode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\deep_copy.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\deep_free.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\default_client.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\default_server.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\encode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Exception.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Forwarding_Servant.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\GIOP.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\IIOP_Interpreter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\IIOP_Object.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\IIOP_ORB.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Marshal.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\NVList.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Object.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Object_KeyC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Object_Table.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Operation_Table.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ORB.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ORB_Core.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\params.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\POA.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\POAC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\POAS.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\PolicyC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\PolicyS.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Principal.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Request.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Sequence.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Servant_Base.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Server_Request.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Server_Strategy_Factory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\skip.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Stub.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TAO.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TAO_Internal.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Typecode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Typecode_Constants.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=.\align.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\any.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\arg_shifter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cdr.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Client_Strategy_Factory.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\connect.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\corba.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\default_client.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\default_server.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Exception.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Forwarding_Servant.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\giop.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\IIOP_Interpreter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\IIOP_Object.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\IIOP_ORB.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\compat\initguid.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\marshal.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nvlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\compat\objbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\object.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Object_KeyC.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Object_Table.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Operation_Table.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\orb.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\orb_core.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ORB_Strategies_T.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\orbconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\params.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\poa.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\poa_macros.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\poa_T.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\poaC.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\poaS.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\PolicyC.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\PolicyS.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Principal.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\request.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sequence.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Sequence_T.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\servant_base.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Server_Request.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Server_Strategy_Factory.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\singletons.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\stub.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\TAO.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\TAO_Internal.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Timeprobe.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\typecode.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\varout.h
-# End Source File
-# End Group
-# Begin Group "Inline Files"
-
-# PROP Default_Filter "*.i"
-# Begin Source File
-
-SOURCE=.\any.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\cdr.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\connect.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\default_client.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\default_server.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Exception.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\giop.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\IIOP_Object.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\IIOP_ORB.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\marshal.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\NVList.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\object.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Object_KeyC.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\ORB.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\orb_core.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\ORB_Strategies_T.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\params.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\poaC.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\poaS.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\PolicyC.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\PolicyS.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Request.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\sequence.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Sequence_T.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Server_Request.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\stub.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\TAO_Internal.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\Timeprobe.i
-# End Source File
-# Begin Source File
-
-SOURCE=.\typecode.i
-# 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
+# Microsoft Developer Studio Project File - Name="TAO" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=TAO - 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 "TAO.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 "TAO.mak" CFG="TAO - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "TAO - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "TAO - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "TAO - 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 ""
+# 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" /YX /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /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 /subsystem:windows /dll /machine:I386
+# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\ace"
+# SUBTRACT LINK32 /incremental:yes
+
+!ELSEIF  "$(CFG)" == "TAO - 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 /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /YX /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /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 /subsystem:windows /dll /debug /machine:I386
+# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\ace"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "TAO - Win32 Release"
+# Name "TAO - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# Begin Source File
+
+SOURCE=.\Any.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\append.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\CDR.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Client_Strategy_Factory.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Connect.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\debug.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\decode.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\deep_copy.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\deep_free.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\default_client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\default_server.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\encode.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Exception.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Forwarding_Servant.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\GIOP.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\IIOP_Interpreter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\IIOP_Object.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\IIOP_ORB.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Marshal.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\NVList.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Object.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Object_KeyC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Object_Table.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Operation_Table.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ORB.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ORB_Core.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\params.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\POA.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\POAC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\POAS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\PolicyC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\PolicyS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Principal.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Request.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Sequence.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Servant_Base.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Server_Request.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Server_Strategy_Factory.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\skip.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Stub.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TAO.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TAO_Internal.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Typecode.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Typecode_Constants.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# Begin Source File
+
+SOURCE=.\align.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\any.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\arg_shifter.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\cdr.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Client_Strategy_Factory.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\connect.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\corba.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\debug.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\default_client.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\default_server.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Exception.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Forwarding_Servant.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\giop.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IIOP_Interpreter.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IIOP_Object.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IIOP_ORB.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\compat\initguid.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\marshal.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\nvlist.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\compat\objbase.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\object.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Object_KeyC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Object_Table.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Operation_Table.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\orb.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\orb_core.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ORB_Strategies_T.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\orbconf.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\params.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\poa.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\poa_macros.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\poa_T.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\poaC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\poaS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\PolicyC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\PolicyS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Principal.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\request.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\sequence.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Sequence_T.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\servant_base.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Server_Request.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Server_Strategy_Factory.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\singletons.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\stub.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\TAO.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\TAO_Internal.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Timeprobe.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\typecode.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\varout.h
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter "*.i"
+# Begin Source File
+
+SOURCE=.\any.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\cdr.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\connect.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\default_client.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\default_server.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Exception.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\giop.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\IIOP_Object.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\IIOP_ORB.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\marshal.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\NVList.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\object.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Object_KeyC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\ORB.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\orb_core.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\ORB_Strategies_T.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\params.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\poaC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\poaS.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\PolicyC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\PolicyS.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Request.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\sequence.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Sequence_T.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Server_Request.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\stub.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\TAO_Internal.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Timeprobe.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\typecode.i
+# 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/TAO/tests/POA/Generic_Servant/Generic_Servant.dsw b/TAO/tests/POA/Generic_Servant/Generic_Servant.dsw
index f6006d20cb7..512c7d017db 100644
--- a/TAO/tests/POA/Generic_Servant/Generic_Servant.dsw
+++ b/TAO/tests/POA/Generic_Servant/Generic_Servant.dsw
@@ -1,41 +1,41 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "client"=.\client.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "server"=.\server.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 5.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "client"=.\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "server"=.\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/TAO/tests/POA/Generic_Servant/client.dsp b/TAO/tests/POA/Generic_Servant/client.dsp
index 2bf2fea4ffb..4ee9d087ee9 100644
--- a/TAO/tests/POA/Generic_Servant/client.dsp
+++ b/TAO/tests/POA/Generic_Servant/client.dsp
@@ -1,164 +1,164 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=client - 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 "client.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 "client.mak" CFG="client - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "client - 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 ""
-# 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" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# 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 tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "client__"
-# PROP BASE Intermediate_Dir "client__"
-# 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 "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# 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 tao.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "client - Win32 Release"
-# Name "client - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\client.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Foo.idl
-
-!IF  "$(CFG)" == "client - Win32 Release"
-
-# Begin Custom Build
-InputPath=.\Foo.idl
-InputName=Foo
-
-BuildCmds= \
-	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
-
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
-
-# Begin Custom Build
-InputPath=.\Foo.idl
-InputName=Foo
-
-BuildCmds= \
-	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
-
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\FooC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\FooS.cpp
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=client - 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 "client.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 "client.mak" CFG="client - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "client - 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 ""
+# 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" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# 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 tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "client - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "client__"
+# PROP BASE Intermediate_Dir "client__"
+# 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 "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# 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 tao.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF 
+
+# Begin Target
+
+# Name "client - Win32 Release"
+# Name "client - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Foo.idl
+
+!IF  "$(CFG)" == "client - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\Foo.idl
+InputName=Foo
+
+BuildCmds= \
+	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
+ -Wb,export_include=generic_servant_export.h $(InputName).idl
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "client - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\Foo.idl
+InputName=Foo
+
+BuildCmds= \
+	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
+ -Wb,export_include=generic_servant_export.h $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\FooC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\FooS.cpp
+# End Source File
+# End Target
+# End Project
diff --git a/TAO/tests/POA/Generic_Servant/server.dsp b/TAO/tests/POA/Generic_Servant/server.dsp
index a6c4b1e4167..abb9706bd3b 100644
--- a/TAO/tests/POA/Generic_Servant/server.dsp
+++ b/TAO/tests/POA/Generic_Servant/server.dsp
@@ -1,183 +1,183 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=server - 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 "server.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 "server.mak" CFG="server - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "server - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "server__"
-# PROP BASE Intermediate_Dir "server__"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# 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" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D GENERIC_SERVANT_HAS_DLL=1 /D "GENERIC_SERVANT_BUILD_DLL" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /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 /subsystem:windows /dll /machine:I386
-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-# Begin Special Build Tool
-SOURCE=$(InputPath)
-PostBuild_Desc=Copying DLL to ..\Explicit_Activation and\
-  ..\On_Demand_Activation
-PostBuild_Cmds=copy server.dll ..\Explicit_Activation	copy server.dll\
-  ..\On_Demand_Activation
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "server_0"
-# PROP BASE Intermediate_Dir "server_0"
-# 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 /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D GENERIC_SERVANT_HAS_DLL=1 /D "GENERIC_SERVANT_BUILD_DLL" /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 tao.lib aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-# Begin Special Build Tool
-SOURCE=$(InputPath)
-PostBuild_Desc=Copying DLL to ..\Explicit_Activation and\
-  ..\On_Demand_Activation
-PostBuild_Cmds=copy server.dll ..\Explicit_Activation	copy server.dll\
-  ..\On_Demand_Activation
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "server - Win32 Release"
-# Name "server - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\Foo.idl
-
-!IF  "$(CFG)" == "server - Win32 Release"
-
-# Begin Custom Build
-InputPath=.\Foo.idl
-InputName=Foo
-
-BuildCmds= \
-	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
-  -Wb,export_include=generic_servant_export.h $(InputName).idl
-
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
-
-# Begin Custom Build
-InputPath=.\Foo.idl
-InputName=Foo
-
-BuildCmds= \
-	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
-  -Wb,export_include=generic_servant_export.h $(InputName).idl
-
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\FooC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\FooS.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\MyFooServant.cpp
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=server - 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 "server.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 "server.mak" CFG="server - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "server - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "server__"
+# PROP BASE Intermediate_Dir "server__"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# 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" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D GENERIC_SERVANT_HAS_DLL=1 /D "GENERIC_SERVANT_BUILD_DLL" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /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 /subsystem:windows /dll /machine:I386
+# ADD LINK32 ace.lib tao.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+SOURCE=$(InputPath)
+PostBuild_Desc=Copying DLL to ..\Explicit_Activation and\
+  ..\On_Demand_Activation
+PostBuild_Cmds=copy server.dll ..\Explicit_Activation	copy server.dll\
+  ..\On_Demand_Activation
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "server - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "server_0"
+# PROP BASE Intermediate_Dir "server_0"
+# 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 /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D GENERIC_SERVANT_HAS_DLL=1 /D "GENERIC_SERVANT_BUILD_DLL" /YX /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 tao.lib aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+SOURCE=$(InputPath)
+PostBuild_Desc=Copying DLL to ..\Explicit_Activation and\
+  ..\On_Demand_Activation
+PostBuild_Cmds=copy server.dll ..\Explicit_Activation	copy server.dll\
+  ..\On_Demand_Activation
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "server - Win32 Release"
+# Name "server - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\Foo.idl
+
+!IF  "$(CFG)" == "server - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\Foo.idl
+InputName=Foo
+
+BuildCmds= \
+	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
+  -Wb,export_include=generic_servant_export.h $(InputName).idl
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "server - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\Foo.idl
+InputName=Foo
+
+BuildCmds= \
+	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
+  -Wb,export_include=generic_servant_export.h $(InputName).idl
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\FooC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\FooS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\MyFooServant.cpp
+# End Source File
+# End Target
+# End Project
diff --git a/ace/ace.dsw b/ace/ace.dsw
index 5ab4340091f..97d8bfd3e00 100644
--- a/ace/ace.dsw
+++ b/ace/ace.dsw
@@ -1,41 +1,41 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "ACE dynamic library"=.\ace_dll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ACE static library"=.\ace_lib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 5.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "ACE dynamic library"=.\ace_dll.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "ACE static library"=.\ace_lib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
author	irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	1998-05-25 19:24:55 +0000
committer	irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	1998-05-25 19:24:55 +0000
commit	7135c1b124c77a9c21c8354b35f5d67ef480ad5f (patch)
tree	8901f26d1ba662351b8e50b79f4e63d4a5805752
parent	a6d71a3d9cc64176ae6199c70fe1e991e274a643 (diff)
download	ATCD-7135c1b124c77a9c21c8354b35f5d67ef480ad5f.tar.gz