*** empty log message ***

6 files changed, 88 insertions, 51 deletions

diff --git a/ChangeLog-96b b/ChangeLog-96b
index b75d2fdf59d..1b8286d70a6 100644
--- a/ChangeLog-96b
+++ b/ChangeLog-96b
@@ -1,3 +1,24 @@
+Sun Dec  1 00:15:45 1996  Irfan Pyarali  <irfan@flamenco.cs.wustl.edu>
+
+	* ace/Synch.h: Repositioned ACE_Semaphore such that there are no
+	  problems in compiling ACE_Process_Semaphore under Win32. 
+
+	* ace/config-win32-msvc4.0.h: Changed ACE_HAS_STL to
+ 	  ACE_HAS_STANDARD_CPP_LIBRARY which is more descriptive (and what
+ 	  is expected by stdcpp.h).
+
+	* ace/Registry.h: Added the setting of NOMINMAX and
+ 	  VC_PLUS_PLUS_NESTED_CLASS_PROBLEM flags so that STL behaves
+ 	  properly.
+
+	* ace/Log_Msg.cpp (open): Fixed a small bug such that msg_ostream
+ 	  is only set this to cerr if it hasn't already been set.
+
+	* STL: Updated the STL directory will latest code from
+ 	  http://www.rahul.net/terris/ and also added the original
+ 	  readme2.stl file.  Created ACE_Changes which has the list of
+ 	  changes made to the STL distribution.
+
 Sat Nov 30 12:02:00 1996  Douglas C. Schmidt  <schmidt@lambada.cs.wustl.edu>
 
 	* ace/OS.h: Added a new pragma that disables warning #4097 in
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index 5537f2ce2f0..e1d83470190 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -337,7 +337,9 @@ ACE_Log_Msg::open (const char *prog_name,
   if (ACE_BIT_ENABLED (flags, ACE_Log_Msg::OSTREAM))
     {
       ACE_SET_BITS (ACE_Log_Msg::flags_, ACE_Log_Msg::OSTREAM);
-      ACE_LOG_MSG->msg_ostream (&cerr);
+      // Only set this to cerr if it hasn't already been set.
+      if (ACE_LOG_MSG->msg_ostream () == 0)
+	ACE_LOG_MSG->msg_ostream (&cerr);
     }
   if (ACE_BIT_ENABLED (flags, ACE_Log_Msg::SILENT))
     ACE_SET_BITS (ACE_Log_Msg::flags_, ACE_Log_Msg::SILENT);
diff --git a/ace/README b/ace/README
index 76ac10ecdbb..195a38f4691 100644
--- a/ace/README
+++ b/ace/README
@@ -80,7 +80,7 @@ ACE_HAS_SOCKIO_H                	Compiler/platform provides the sockio.h file
 ACE_HAS_SPARCWORKS_401_SIGNALS 		Compiler has brain-damaged SPARCwork SunOS 4.x signal prototype...
 ACE_HAS_SSIZE_T				Compiler supports the ssize_t typedef
 ACE_HAS_STHREADS			Platform supports Solaris threads
-ACE_HAS_STL				Platform/compiler supports STL
+ACE_HAS_STANDARD_CPP_LIBRARY		Platform/compiler supports Standard C++ Library
 ACE_HAS_STRBUF_T			Compiler/platform supports struct strbuf
 ACE_HAS_STREAMS				Platform supports STREAMS
 ACE_HAS_STREAM_PIPES			Platform supports STREAM pipes
diff --git a/ace/Registry.h b/ace/Registry.h
index 890aec1f37f..c7ff05a7bec 100644
--- a/ace/Registry.h
+++ b/ace/Registry.h
@@ -17,11 +17,20 @@
 #if !defined (ACE_REGISTRY_H)
 #define ACE_REGISTRY_H
 
+#if !defined (NOMINMAX)
+#define NOMINMAX
+#define ACE_TURN_NOMINMAX_OFF
+#endif
+
 #include "ace/OS.h"
 
 #if defined (ACE_WIN32)
 // This only works on Win32 platforms
 
+#if !defined (VC_PLUS_PLUS_NESTED_CLASS_PROBLEM)
+#define VC_PLUS_PLUS_NESTED_CLASS_PROBLEM
+#endif
+
 #include "vector.h"
 #include "bstring.h"
 // You must configure the STL components in order to use this wrapper.
@@ -503,5 +512,10 @@ private:
 
 };
 
+#if defined (ACE_TURN_NOMINMAX_OFF)
+#undef NOMINMAX
+#undef ACE_TURN_NOMINMAX_OFF
+#endif
+
 #endif /* ACE_WIN32 */
 #endif /* ACE_REGISTRY_H */
diff --git a/ace/Synch.h b/ace/Synch.h
index bcc3e52c1a6..a948b3fd285 100644
--- a/ace/Synch.h
+++ b/ace/Synch.h
@@ -105,6 +105,54 @@ protected:
   ACE_File_Lock (const ACE_File_Lock &) {}
 };
 
+class ACE_Export ACE_Semaphore
+  // = TITLE
+  //     Wrapper for Dijkstra style general semaphores.
+{
+public:
+  // = Initialization and termination.
+  ACE_Semaphore (u_int count, 
+		 int type = USYNC_THREAD, 
+		 LPCTSTR name = 0, 
+		 void * = 0,
+		 int max = 0x7fffffff);
+  // Initialize the semaphore, with default value of "count".
+
+  ~ACE_Semaphore (void);       
+  // Implicitly destroy the semaphore.
+
+  int remove (void);
+  // Explicitly destroy the semaphore.
+
+  int acquire (void);
+  // Block the thread until the semaphore count becomes
+  // greater than 0, then decrement it.
+
+  int tryacquire (void);
+  // Conditionally decrement the semaphore if count is greater 
+  // than 0 (i.e., won't block).
+
+  int release (void);
+  // Increment the semaphore, potentially unblocking
+  // a waiting thread.
+
+  void dump (void) const;
+  // Dump the state of an object.
+
+  ACE_ALLOC_HOOK_DECLARE;
+  // Declare the dynamic allocation hooks.
+
+  const ACE_sema_t &lock (void) const;
+  // Return the underlying lock.
+
+private:
+  ACE_sema_t semaphore_;
+
+  // = Prevent assignment and initialization.
+  void operator= (const ACE_Semaphore &) {}
+  ACE_Semaphore (const ACE_Semaphore &) {}
+};
+
 class ACE_Export ACE_Process_Semaphore
   // = TITLE
   //     Wrapper for Dijkstra style general semaphores that work
@@ -656,54 +704,6 @@ public:
   // Declare the dynamic allocation hooks.
 };
 
-class ACE_Export ACE_Semaphore
-  // = TITLE
-  //     Wrapper for Dijkstra style general semaphores.
-{
-public:
-  // = Initialization and termination.
-  ACE_Semaphore (u_int count, 
-		 int type = USYNC_THREAD, 
-		 LPCTSTR name = 0, 
-		 void * = 0,
-		 int max = 0x7fffffff);
-  // Initialize the semaphore, with default value of "count".
-
-  ~ACE_Semaphore (void);       
-  // Implicitly destroy the semaphore.
-
-  int remove (void);
-  // Explicitly destroy the semaphore.
-
-  int acquire (void);
-  // Block the thread until the semaphore count becomes
-  // greater than 0, then decrement it.
-
-  int tryacquire (void);
-  // Conditionally decrement the semaphore if count is greater 
-  // than 0 (i.e., won't block).
-
-  int release (void);
-  // Increment the semaphore, potentially unblocking
-  // a waiting thread.
-
-  void dump (void) const;
-  // Dump the state of an object.
-
-  ACE_ALLOC_HOOK_DECLARE;
-  // Declare the dynamic allocation hooks.
-
-  const ACE_sema_t &lock (void) const;
-  // Return the underlying lock.
-
-private:
-  ACE_sema_t semaphore_;
-
-  // = Prevent assignment and initialization.
-  void operator= (const ACE_Semaphore &) {}
-  ACE_Semaphore (const ACE_Semaphore &) {}
-};
-
 class ACE_Export ACE_Thread_Semaphore : public ACE_Semaphore
   // = TITLE
   //     Wrapper for Dijkstra style general semaphores that work
diff --git a/ace/config-win32-msvc4.0.h b/ace/config-win32-msvc4.0.h
index 9272a1d09c0..fd4674a094a 100644
--- a/ace/config-win32-msvc4.0.h
+++ b/ace/config-win32-msvc4.0.h
@@ -91,7 +91,7 @@
 #endif /* _MSC_VER */
 
 #define ACE_HAS_UNICODE
-#define ACE_HAS_STL
+//#define ACE_HAS_STANDARD_CPP_LIBRARY
 
 // Uncomment these if you want to integrate ACE and Orbix in Win32.
 // #define ACE_HAS_ORBIX