ChangeLogTag: Sun Jul 3 15:09:06 2005 J.T. Conklin <jtc@acorntoolworks.com>

5 files changed, 24 insertions, 9 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 454f74a3825..0792a3a19d0 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Sun Jul  3 15:09:06 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
+
+	  Fix typo in ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA case.
+
+	* orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp:
+	* orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
+	* orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp:
+	* orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
+
+	  Change create() method parameter name from max_rec_size to
+	  max_size, as it specifies the size of the whole log, not a
+	  single log record.
+
 Sun Jul  3 15:00:29 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
 	* tao/Makefile.am:
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
index 5633cfc9022..75d16040a35 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
@@ -41,7 +41,7 @@ TAO_BasicLogFactory_i::activate (CORBA::ORB_ptr orb,
 
 DsLogAdmin::BasicLog_ptr
 TAO_BasicLogFactory_i::create (DsLogAdmin::LogFullActionType full_action,
-                               CORBA::ULongLong max_rec_size,
+                               CORBA::ULongLong max_size,
                                DsLogAdmin::LogId_out id_out
                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -57,7 +57,7 @@ TAO_BasicLogFactory_i::create (DsLogAdmin::LogFullActionType full_action,
   DsLogAdmin::BasicLog_ptr basiclog =
     this->create_with_id (id,
                           full_action,
-                          max_rec_size
+                          max_size
                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ());
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
index 63c9f164559..74a7c103994 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
@@ -121,7 +121,7 @@ TAO_EventLogFactory_i::activate (CORBA::ORB_ptr orb,
 DsEventLogAdmin::EventLog_ptr
 TAO_EventLogFactory_i::create (
     DsLogAdmin::LogFullActionType full_action,
-    CORBA::ULongLong max_rec_size,
+    CORBA::ULongLong max_size,
     const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
     DsLogAdmin::LogId_out id_out
     ACE_ENV_ARG_DECL)
@@ -138,7 +138,7 @@ TAO_EventLogFactory_i::create (
   DsEventLogAdmin::EventLog_ptr eventlog =
     this->create_with_id (id,
                           full_action,
-                          max_rec_size,
+                          max_size,
                           thresholds
                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
index 61e5408fd6e..1305c3cc4c0 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
@@ -86,7 +86,7 @@ TAO_NotifyLogFactory_i::activate (CORBA::ORB_ptr orb,
 DsNotifyLogAdmin::NotifyLog_ptr
 TAO_NotifyLogFactory_i::create (
         DsLogAdmin::LogFullActionType full_action,
-        CORBA::ULongLong max_rec_size,
+        CORBA::ULongLong max_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
         const CosNotification::QoSProperties & initial_qos,
         const CosNotification::AdminProperties & initial_admin,
@@ -110,7 +110,7 @@ TAO_NotifyLogFactory_i::create (
   DsNotifyLogAdmin::NotifyLog_ptr notifylog =
     this->create_with_id (id,
                           full_action,
-                          max_rec_size,
+                          max_size,
                           thresholds,
                           initial_qos,
                           initial_admin
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
index d57d3fca482..a1e8c53052c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
@@ -160,7 +160,7 @@ TAO_RTEventLogFactory_i::activate (PortableServer::POA_ptr poa
 RTEventLogAdmin::EventLog_ptr
 TAO_RTEventLogFactory_i::create (
         DsLogAdmin::LogFullActionType full_action,
-        CORBA::ULongLong max_rec_size,
+        CORBA::ULongLong max_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
         DsLogAdmin::LogId_out id_out
         ACE_ENV_ARG_DECL
@@ -180,7 +180,7 @@ TAO_RTEventLogFactory_i::create (
   RTEventLogAdmin::EventLog_ptr eventlog =
     this->create_with_id (id,
                           full_action,
-                          max_rec_size,
+                          max_size,
                           thresholds
                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
@@ -276,6 +276,6 @@ template class ACE_Auto_Basic_Ptr<TAO_RTEventLog_i>;
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate auto_ptr <TAO_RTEventLog_i>
-#pragma instantiate ACE_Auto_Event_Ptr <TAO_RTEventLog_i>
+#pragma instantiate ACE_Auto_Basic_Ptr <TAO_RTEventLog_i>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */