Updates for segfault and missing comments

6 files changed, 62 insertions, 49 deletions

diff --git a/ChangeLog b/ChangeLog
index e06ddd3ce69..7c232e1ac4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,52 +1,65 @@
-Mon Apr 29 17:56:38 2003  Stephen Torri <venkita@cs.wustl.edu>
-
-        * TAO/orbsvcs/tests/Metrics/Makefile:
-        * TAO/orbsvcs/tests/Metrics/Metrics_Local_Cache_Test.cpp:
-        * TAO/orbsvcs/tests/Metrics/Metrics_Local_Cache_Test.h:
-        * TAO/orbsvcs/tests/Metrics/Remote_Metrics_Logger.cpp:
-        * TAO/orbsvcs/tests/Metrics/Remote_Metrics_Logger.h:
-        * TAO/orbsvcs/tests/Metrics/Rate_Group_Info.cpp:
-        * TAO/orbsvcs/tests/Metrics/Rate_Group_Info.h:
-        * TAO/orbsvcs/tests/Metrics/Rate_Group_Info.i:
-        * TAO/orbsvcs/tests/Metrics/Makefile:
-        * TAO/tao/orbconf.h:
+Wed Apr 30 13:53:41 2003  Stephen Torri <storri@cs.wustl.edu>
+        * tao/RTCORBA/Multi_Priority_Mapping.cpp:
+        * tao/RTCORBA/Multi_Priority_Mapping.h:
+        * tao/RTCORBA/Multi_Priority_Mapping.i:
+        
+          Cleared up lines that were missing comments
+
+        * ace/Metrics_Cache_T.h:
+        * ace/Timeprobe_T.h:
+        
+          Cleared up segfault when the default constructor
+          is used and no allocator was defined.
+          
+Tue Apr 29 17:56:38 2003  Stephen Torri <storri@cs.wustl.edu>
+
+        * orbsvcs/tests/Metrics/Makefile:
+        * orbsvcs/tests/Metrics/Metrics_Local_Cache_Test.cpp:
+        * orbsvcs/tests/Metrics/Metrics_Local_Cache_Test.h:
+        * orbsvcs/tests/Metrics/Remote_Metrics_Logger.cpp:
+        * orbsvcs/tests/Metrics/Remote_Metrics_Logger.h:
+        * orbsvcs/tests/Metrics/Rate_Group_Info.cpp:
+        * orbsvcs/tests/Metrics/Rate_Group_Info.h:
+        * orbsvcs/tests/Metrics/Rate_Group_Info.i:
+        * orbsvcs/tests/Metrics/Makefile:
+        * tao/orbconf.h:
 
           Added tests for libTAO_Metrics.
 
-        * TAO/orbsvcs/orbsvcs/Metrics/metrics_export.h:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.i:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.i:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.i:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.i:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h:
-        * TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i:
-        * TAO/orbsvcs/orbsvcs/Metrics:
-        * TAO/orbsvcs/orbsvcs/Metrics.idl:
-        * TAO/orbsvcs/orbsvcs/Makefile.Metrics:
-        * TAO/orbsvcs/orbsvcs/Makefile:
+        * orbsvcs/orbsvcs/Metrics/metrics_export.h:
+        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp:
+        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h:
+        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.i:
+        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp:
+        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h:
+        * orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.i:
+        * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp:
+        * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h:
+        * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.i:
+        * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp:
+        * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h:
+        * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.i:
+        * orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp:
+        * orbsvcs/orbsvcs/Metrics/Metrics_Logger.h:
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp:
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h:
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i:
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp:
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h:
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i:
+        * orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp:
+        * orbsvcs/orbsvcs/Metrics/Metrics_Utils.h:
+        * orbsvcs/orbsvcs/Metrics/Metrics_Utils.i:
+        * orbsvcs/orbsvcs/Metrics:
+        * orbsvcs/orbsvcs/Metrics.idl:
+        * orbsvcs/orbsvcs/Makefile.Metrics:
+        * orbsvcs/orbsvcs/Makefile:
 
           Adding new TAO Metrics ORB service.
 
-        * TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp:
-        * TAO/tao/RTCORBA/Multi_Priority_Mapping.h:
-        * TAO/tao/RTCORBA/Multi_Priority_Mapping.i:
+        * tao/RTCORBA/Multi_Priority_Mapping.cpp:
+        * tao/RTCORBA/Multi_Priority_Mapping.h:
+        * tao/RTCORBA/Multi_Priority_Mapping.i:
 
         * ace/Timeprobe.h:
         * ace/Timeprobe.cpp:
diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
index 6c8605093b1..542b62bbb50 100644
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
@@ -1,4 +1,4 @@
-$Id$
+// $Id$
 // Multi_Priority_Mapping.cpp,v 1.0
 
 #include "tao/orbconf.h"
diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
index 930a219b304..74178c96ee5 100644
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
@@ -1,4 +1,4 @@
-$Id$
+// $Id$
 // Multi_Priority_Mapping.h,v 1.0
 
 // ============================================================================
diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.i b/TAO/tao/RTCORBA/Multi_Priority_Mapping.i
index ed02465ba90..f6ab28fc250 100644
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.i
+++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.i
@@ -1,3 +1,3 @@
-$Id$
+// $Id$
 // Multi_Priority_Mapping.i,v 1.0
 
diff --git a/ace/Metrics_Cache_T.h b/ace/Metrics_Cache_T.h
index f686d99d9cf..98915527dc1 100644
--- a/ace/Metrics_Cache_T.h
+++ b/ace/Metrics_Cache_T.h
@@ -113,7 +113,7 @@ public:
                        = METRICS_DEFAULT_TIMEPROBE_TABLE_SIZE,
                      u_long number_of_probes
                        = METRICS_DEFAULT_TIMEPROBE_COUNT,
-                     ALLOCATOR * allocatorPtr = 0);
+                     ALLOCATOR * allocatorPtr = (ALLOCATOR*)ALLOCATOR::instance());
   // Default constructor.
 
   ~ACE_Metrics_Cache ();
diff --git a/ace/Timeprobe_T.h b/ace/Timeprobe_T.h
index 45ca973bf94..dce78fdacec 100644
--- a/ace/Timeprobe_T.h
+++ b/ace/Timeprobe_T.h
@@ -167,10 +167,10 @@ class ACE_Timeprobe : public ACE_Timeprobe_Ex <ACE_LOCK, ACE_Allocator>
 {
 public:
   // Initialize a ACE_Timeprobe with default size
-  ACE_Timeprobe (ACE_Allocator *allocator = 0);
+  ACE_Timeprobe (ACE_Allocator *allocator = ACE_Allocator::instance());
 
   /// Create Timeprobes with <size> slots
-  ACE_Timeprobe (ACE_Allocator *allocator = 0,
+  ACE_Timeprobe (ACE_Allocator *allocator = ACE_Allocator::instance(),
                  u_long size = ACE_DEFAULT_TIMEPROBE_TABLE_SIZE);
 };