ChangeLogTag:Fri Sep 14 05:28:13 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>

12 files changed, 94 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index 7b739a8bb16..c887e1206c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Fri Sep 14 05:28:13 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* THANKS: We now have over 1,300 contributors to ACE+TAO!
+
+	* ace/Basic_Types.{h,i}: Added "const" to various operators and 
+	  methods.  Thanks to Alain Decamps for reporting this.
+
+Thu Sep 13 11:02:41 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Singleton.cpp: If we're not compiling with threading enabled, 
+	  don't call the get_singleton_lock() code.  Thanks to Charles
+ 	  Frasch <cfrasch@spawar.navy.mil> for contributing this.
+
+Tue Sep 11 06:23:08 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Array_Base.h: Changed current_ from u_int to size_t.  Thanks
+	  to Johnny Willemsen for reporting this.
+
 Fri Sep 14 17:18:37 2001  Steve Huston  <shuston@riverace.com>
 
         * tests/High_Res_Timer_Test.cpp (check_micro_nano): If the
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 7b739a8bb16..c887e1206c8 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,21 @@
+Fri Sep 14 05:28:13 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* THANKS: We now have over 1,300 contributors to ACE+TAO!
+
+	* ace/Basic_Types.{h,i}: Added "const" to various operators and 
+	  methods.  Thanks to Alain Decamps for reporting this.
+
+Thu Sep 13 11:02:41 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Singleton.cpp: If we're not compiling with threading enabled, 
+	  don't call the get_singleton_lock() code.  Thanks to Charles
+ 	  Frasch <cfrasch@spawar.navy.mil> for contributing this.
+
+Tue Sep 11 06:23:08 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Array_Base.h: Changed current_ from u_int to size_t.  Thanks
+	  to Johnny Willemsen for reporting this.
+
 Fri Sep 14 17:18:37 2001  Steve Huston  <shuston@riverace.com>
 
         * tests/High_Res_Timer_Test.cpp (check_micro_nano): If the
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 7b739a8bb16..c887e1206c8 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,21 @@
+Fri Sep 14 05:28:13 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* THANKS: We now have over 1,300 contributors to ACE+TAO!
+
+	* ace/Basic_Types.{h,i}: Added "const" to various operators and 
+	  methods.  Thanks to Alain Decamps for reporting this.
+
+Thu Sep 13 11:02:41 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Singleton.cpp: If we're not compiling with threading enabled, 
+	  don't call the get_singleton_lock() code.  Thanks to Charles
+ 	  Frasch <cfrasch@spawar.navy.mil> for contributing this.
+
+Tue Sep 11 06:23:08 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Array_Base.h: Changed current_ from u_int to size_t.  Thanks
+	  to Johnny Willemsen for reporting this.
+
 Fri Sep 14 17:18:37 2001  Steve Huston  <shuston@riverace.com>
 
         * tests/High_Res_Timer_Test.cpp (check_micro_nano): If the
diff --git a/THANKS b/THANKS
index d037c8ff520..7edb82aac7c 100644
--- a/THANKS
+++ b/THANKS
@@ -1326,11 +1326,11 @@ Massimo Pichini <massimo@webbridges.it>
 Eyal Neuman <eyal@tradertools.com>
 Peter Phillips <pphillip@opentext.com>
 Dave Hale <d.hale@rane.net>
+Giulio Agostini <giulio.agostini@db.com>
 Werner Buchert <w.buchert@medat.de>
 Kevin Cline <krc@one.com>
 Mahesh Varadarajan <mahesh.varadarajan@divatv.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
 scheme that underlies this distribution and also spent countless hours
diff --git a/ace/Array_Base.h b/ace/Array_Base.h
index 042e6061fad..de2a4a46136 100644
--- a/ace/Array_Base.h
+++ b/ace/Array_Base.h
@@ -6,11 +6,10 @@
  *
  *  $Id$
  *
- *  @author Doug Schmidt
+ *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
 //=============================================================================
 
-
 #ifndef ACE_ARRAY_BASE_H
 #define ACE_ARRAY_BASE_H
 #include "ace/pre.h"
@@ -185,7 +184,7 @@ public:
 
 private:
   /// Pointer to the current item in the iteration.
-  u_int current_;
+  size_t current_;
 
   /// Pointer to the Array we're iterating over.
   ACE_Array_Base<T> &array_;
diff --git a/ace/Basic_Types.cpp b/ace/Basic_Types.cpp
index 479b341dd05..a1863c6116b 100644
--- a/ace/Basic_Types.cpp
+++ b/ace/Basic_Types.cpp
@@ -112,17 +112,11 @@ operator<< (ostream& os, const ACE_U_LongLong& ll)
   char buffer[32];
 
   if ((flags & ios::oct) != 0)
-    {
-      os << ll.as_string (buffer, 8);
-    }
+    os << ll.as_string (buffer, 8);
   else if ((flags & ios::hex) != 0)
-    {
-      os << ll.as_string (buffer, 16, (flags & ios::uppercase));
-    }
+    os << ll.as_string (buffer, 16, (flags & ios::uppercase));
   else
-    {
-      os << ll.as_string (buffer);
-    }
+    os << ll.as_string (buffer);
   return os;
 }
 #endif
diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h
index ed85a9fe134..5eddc55fe4c 100644
--- a/ace/Basic_Types.h
+++ b/ace/Basic_Types.h
@@ -310,7 +310,7 @@ typedef ACE_UINT16 ACE_USHORT16;
     ACE_U_LongLong operator+ (const ACE_UINT32) const;
     ACE_U_LongLong operator- (const ACE_U_LongLong &) const;
     ACE_U_LongLong operator- (const ACE_UINT32) const;
-    ACE_U_LongLong operator* (const ACE_UINT32);
+    ACE_U_LongLong operator* (const ACE_UINT32) const;
     ACE_U_LongLong &operator*= (const ACE_UINT32);
 
     ACE_U_LongLong operator<< (const u_int) const;
@@ -346,7 +346,7 @@ typedef ACE_UINT16 ACE_USHORT16;
     // The following operators convert their arguments to
     // ACE_UINT32.  So, there may be information loss if they are
     // used.
-    ACE_U_LongLong operator* (const ACE_INT32);
+    ACE_U_LongLong operator* (const ACE_INT32) const;
     ACE_U_LongLong &operator*= (const ACE_INT32);
     ACE_UINT32 operator/ (const ACE_INT32) const;
 #   if ACE_SIZEOF_INT == 4
@@ -411,13 +411,18 @@ typedef ACE_UINT16 ACE_USHORT16;
     // only used here; the .i and .cpp files use the accessors.
 
     /// These functions are used to implement multiplication.
-    ACE_UINT32 ul_shift (ACE_UINT32 a, ACE_UINT32 c_in, ACE_UINT32 *c_out);
-    ACE_U_LongLong ull_shift (ACE_U_LongLong a, ACE_UINT32 c_in,
-                              ACE_UINT32 *c_out);
-    ACE_U_LongLong ull_add (ACE_U_LongLong a, ACE_U_LongLong b,
-                            ACE_UINT32 *carry);
-    ACE_U_LongLong ull_mult (ACE_U_LongLong a, ACE_UINT32 b,
-                             ACE_UINT32 *carry);
+    ACE_UINT32 ul_shift (ACE_UINT32 a,
+                         ACE_UINT32 c_in,
+                         ACE_UINT32 *c_out) const;
+    ACE_U_LongLong ull_shift (ACE_U_LongLong a,
+                              ACE_UINT32 c_in,
+                              ACE_UINT32 *c_out) const;
+    ACE_U_LongLong ull_add (ACE_U_LongLong a,
+                            ACE_U_LongLong b,
+                            ACE_UINT32 *carry) const;
+    ACE_U_LongLong ull_mult (ACE_U_LongLong a,
+                             ACE_UINT32 b,
+                             ACE_UINT32 *carry) const;
   };
 
   typedef ACE_U_LongLong ACE_UINT64;
diff --git a/ace/Basic_Types.i b/ace/Basic_Types.i
index 12a62950e7f..0012b00defb 100644
--- a/ace/Basic_Types.i
+++ b/ace/Basic_Types.i
@@ -235,7 +235,7 @@ ACE_U_LongLong::operator+= (const ACE_UINT32 n)
 #define ACE_HIGHBIT (~(~0UL >> 1))
 
 ACE_INLINE ACE_UINT32
-ACE_U_LongLong::ul_shift (ACE_UINT32 a, ACE_UINT32 c_in, ACE_UINT32 *c_out)
+ACE_U_LongLong::ul_shift (ACE_UINT32 a, ACE_UINT32 c_in, ACE_UINT32 *c_out) const
 {
   const ACE_UINT32 b = (a << 1) | c_in;
   *c_out = (*c_out << 1) + ((a & ACE_HIGHBIT) > 0);
@@ -244,8 +244,9 @@ ACE_U_LongLong::ul_shift (ACE_UINT32 a, ACE_UINT32 c_in, ACE_UINT32 *c_out)
 }
 
 ACE_INLINE ACE_U_LongLong
-ACE_U_LongLong::ull_shift (ACE_U_LongLong a, ACE_UINT32 c_in,
-                           ACE_UINT32 *c_out)
+ACE_U_LongLong::ull_shift (ACE_U_LongLong a, 
+                           ACE_UINT32 c_in,
+                           ACE_UINT32 *c_out) const
 {
   ACE_U_LongLong b;
 
@@ -258,7 +259,7 @@ ACE_U_LongLong::ull_shift (ACE_U_LongLong a, ACE_UINT32 c_in,
 }
 
 ACE_INLINE ACE_U_LongLong
-ACE_U_LongLong::ull_add (ACE_U_LongLong a, ACE_U_LongLong b, ACE_UINT32 *carry)
+ACE_U_LongLong::ull_add (ACE_U_LongLong a, ACE_U_LongLong b, ACE_UINT32 *carry) const
 {
   ACE_U_LongLong r (0, 0);
   ACE_UINT32 c1, c2, c3, c4;
@@ -283,7 +284,7 @@ ACE_U_LongLong::ull_add (ACE_U_LongLong a, ACE_U_LongLong b, ACE_UINT32 *carry)
 }
 
 ACE_INLINE ACE_U_LongLong
-ACE_U_LongLong::ull_mult (ACE_U_LongLong a, ACE_UINT32 b, ACE_UINT32 *carry)
+ACE_U_LongLong::ull_mult (ACE_U_LongLong a, ACE_UINT32 b, ACE_UINT32 *carry) const
 {
   register ACE_UINT32 mask = ACE_HIGHBIT;
   const ACE_U_LongLong zero (0, 0);
@@ -308,7 +309,7 @@ ACE_U_LongLong::ull_mult (ACE_U_LongLong a, ACE_UINT32 b, ACE_UINT32 *carry)
 }
 
 ACE_INLINE ACE_U_LongLong
-ACE_U_LongLong::operator* (const ACE_UINT32 n)
+ACE_U_LongLong::operator* (const ACE_UINT32 n) const
 {
   ACE_UINT32 carry;  // will throw the carry away
 
@@ -429,7 +430,7 @@ ACE_U_LongLong::operator& (const ACE_INT32 n) const
 }
 
 ACE_INLINE ACE_U_LongLong
-ACE_U_LongLong::operator* (const ACE_INT32 n)
+ACE_U_LongLong::operator* (const ACE_INT32 n) const
 {
   return operator* ((ACE_UINT32) n);
 }
diff --git a/ace/Naming_Context.h b/ace/Naming_Context.h
index c50a8da49c0..e06d190b189 100644
--- a/ace/Naming_Context.h
+++ b/ace/Naming_Context.h
@@ -12,7 +12,6 @@
  */
 //=============================================================================
 
-
 #ifndef ACE_NAMING_CONTEXT_H
 #define ACE_NAMING_CONTEXT_H
 #include "ace/pre.h"
diff --git a/ace/Singleton.cpp b/ace/Singleton.cpp
index f439fa0c4cc..aada3c07206 100644
--- a/ace/Singleton.cpp
+++ b/ace/Singleton.cpp
@@ -168,6 +168,7 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance (void)
         }
       else
         {
+#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
           // Obtain a lock from the ACE_Object_Manager.  The pointer
           // is static, so we only obtain one per
           // ACE_Unmanaged_Singleton instantiation.
@@ -177,6 +178,7 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance (void)
             return 0;
 
           ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *lock, 0);
+#endif /* ACE_MT_SAFE */
 
           if (singleton == 0)
             ACE_NEW_RETURN (singleton,
@@ -338,6 +340,7 @@ ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
         }
       else
         {
+#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
           // Obtain a lock from the ACE_Object_Manager.  The pointer
           // is static, so we only obtain one per
           // ACE_Unmanaged_Singleton instantiation.
@@ -347,6 +350,7 @@ ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
             return 0;
 
           ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *lock, 0);
+#endif /* ACE_MT_SAFE */
 
           if (singleton == 0)
             ACE_NEW_RETURN (singleton,
diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h
index 7559ed70377..e2c6d190db1 100644
--- a/ace/Thread_Manager.h
+++ b/ace/Thread_Manager.h
@@ -424,6 +424,7 @@ public:
     ACE_THR_JOINING = 0x10000000
   };
 
+  // = Initialization and termination methods.
   /**
    * @breif Initialization and termination methods.
    *
diff --git a/docs/wchar.txt b/docs/wchar.txt
index 61b6984078d..d0137598c7a 100644
--- a/docs/wchar.txt
+++ b/docs/wchar.txt
@@ -1,8 +1,12 @@
 /**
 @page wchar Wide Character/Unicode support in ACE
 
-Here's a first stab at some sort of documentation for the magic wchar stuff
-in ACE.
+Here's a first stab at some sort of documentation for the magic
+wide-character (wchar) stuff in ACE.  It should be possible to compile
+ACE with wchar support on most platforms that ACE runs on.  In some
+cases, we don't enable wchar support by default since it increases the
+footprint a bit.  If you run into any problems, please use the
+$ACE_ROOT/PROBLEM-REPORT-FORM to let us know.
 
 @subsection wchar_overview Overview
 
@@ -111,4 +115,4 @@ ACE_LEGACY_MODE is defined, there is an attempt to map them to the new scheme
 by just ACE_HAS_UNICODE == ACE_HAS_WCHAR and ACE_HAS_MOSTLY_UNICODE_APIS ==
 ACE_USES_WCHAR.  
 
-*/
\ No newline at end of file
+*/