Foo

4 files changed, 7 insertions, 8 deletions

diff --git a/ace/Get_Opt.cpp b/ace/Get_Opt.cpp
index 83e7e65105d..5f66fc1ee09 100644
--- a/ace/Get_Opt.cpp
+++ b/ace/Get_Opt.cpp
@@ -52,9 +52,9 @@ ACE_Get_Opt::ACE_Get_Opt (int argc,
   : optarg (0), 
     optind (skip),
     opterr (report_errors), 
-    nextchar_ (0),
-    argv_ (argv),
     argc_ (argc),
+    argv_ (argv),
+    nextchar_ (0),
     optstring_ (optstring)
 {
   ACE_TRACE ("ACE_Get_Opt::ACE_Get_Opt");
diff --git a/ace/Get_Opt.h b/ace/Get_Opt.h
index ec4f3e77f0b..3a5eb57f5c2 100644
--- a/ace/Get_Opt.h
+++ b/ace/Get_Opt.h
@@ -91,16 +91,16 @@ public:
   // Otherwise, <optind> communicates from one call to the next how
   // much of <argv> has been scanned so far.
 
+  int opterr;
+  // Callers store zero here to inhibit the error message for
+  // unrecognized options.
+  
   int argc_;
   // Holds the <argc> count.
 
   char **argv_;
   // Holds the <argv> pointer.  
 
-  int opterr;
-  // Callers store zero here to inhibit the error message for
-  // unrecognized options.
-  
   void dump (void) const;
   // Dump the state of an object.
 
diff --git a/ace/Log_Record.h b/ace/Log_Record.h
index 3d73cdd23a4..84685fb7d96 100644
--- a/ace/Log_Record.h
+++ b/ace/Log_Record.h
@@ -1,7 +1,6 @@
 /* -*- C++ -*- */
 // $Id$
 
-
 // ============================================================================
 //
 // = LIBRARY
diff --git a/ace/Synch_T.cpp b/ace/Synch_T.cpp
index 4336dbcbfd1..6eef0942755 100644
--- a/ace/Synch_T.cpp
+++ b/ace/Synch_T.cpp
@@ -316,7 +316,7 @@ ACE_TSS<TYPE>::ts_get (void) const
       ACE_OS::thr_win32_tls_table_lock ();		
 
       // Insure that we are serialized!
-      ACE_GUARD_RETURN (ACE_Mutex, ace_mon, (ACE_Mutex &) this->keylock_, 0);
+      ACE_GUARD_RETURN (ACE_Mutex, ace_mon_2, (ACE_Mutex &) this->keylock_, 0);
 
       int result;