ChangeLogTag: Mon Oct 20 21:55:41 2003 Huang-Ming Huang <hh1@cse.wustl.edu>

12 files changed, 38 insertions, 14 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ee26f228e37..de357521c5b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,26 @@
+Mon Oct 20 21:55:41 2003  Huang-Ming Huang  <hh1@cse.wustl.edu>
+
+        * orbsvcs/orbsvcs/FtRtEventClientORB/FTRT_ClientORB_Loader.cpp:
+        * orbsvcs/orbsvcs/FtRtEventClientORB/FTRT_ClientORB_Loader.h:
+        * orbsvcs/orbsvcs/FtRtEventEventChannel/Fault_Detector_Loader.cpp:
+        * orbsvcs/orbsvcs/FtRtEventEventChannel/Fault_Detector_Loader.h:
+        * orbsvcs/orbsvcs/FtRtEventEventChannel/Identification_Service.cpp:
+        * orbsvcs/orbsvcs/FtRtEventEventChannel/Identification_Service.h:
+        * orbsvcs/orbsvcs/FtRtEventEventChannel/Replication_Service.cpp:
+        * orbsvcs/orbsvcs/FtRtEventEventChannel/Replication_Service.h:
+          Remove redundant semicolon in the ACE_FACTORY_DEFINE, ACE_STATIC_SVC_REQUIRE
+          and ACE_STATIC_SVC_DEFINE.
+
+        * orbsvcs/orbsvcs/FtRtEventEventChannel/AMI_Primary_Replication_Strategy.cpp:
+          Fixed the problem to access pointer to member using var object, Forte compiler
+          do not accept it.
+
+        * orbsvcs/orbsvcs/FtRtEventEventChannel/Dynamic_Bitset.h:
+          Added typedef to Dynamic_Bitset::reference::size_type.
+
+        * orbsvcs/orbsvcs/FtRtEventUtils/UUID.cpp
+          Added missed semicolon.
+
 Mon Oct 20 14:58:00 2003  Huang-Ming Huang  <hh1@cse.wustl.edu>
 
         * orbsvcs/orbsvcs/FtRtEvent/UUID.cpp :
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
index 60186018b23..68e1f423b7d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
@@ -82,13 +82,13 @@ namespace TAO_FTRT {
 
   /////////////////////////////////////////////////////////////////////
 
-  ACE_FACTORY_DEFINE (TAO_FTRT, FTRT_ClientORB_Loader);
+  ACE_FACTORY_DEFINE (TAO_FTRT, FTRT_ClientORB_Loader)
   ACE_STATIC_SVC_DEFINE (FTRT_ClientORB_Loader,
     ACE_TEXT ("FTRT_ClientORB_Service"),
     ACE_SVC_OBJ_T,
     &ACE_SVC_NAME (FTRT_ClientORB_Loader),
     ACE_Service_Type::DELETE_THIS
     | ACE_Service_Type::DELETE_OBJ,
-    0);
+    0)
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
index 31c4ef26adc..9e64f2d288c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
@@ -46,7 +46,7 @@ namespace TAO_FTRT {
 
 
   ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRT, FTRT_ClientORB_Loader)
-  ACE_STATIC_SVC_REQUIRE(FTRT_ClientORB_Loader);
+  ACE_STATIC_SVC_REQUIRE(FTRT_ClientORB_Loader)
   ACE_FACTORY_DECLARE (TAO_FTRT, FTRT_ClientORB_Loader)
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
index 94c90dfcfcc..c6e0a7850eb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
@@ -161,7 +161,7 @@ AMI_Primary_Replication_Strategy::replicate_request(
    if (!success) { // replication failed, transaction depth too high
      for (size_t i =0; i < num_backups; ++i)  {
        ACE_TRY_EX(block2) {
-         (backups[i]->*rollback)(oid ACE_ENV_ARG_PARAMETER);
+         (backups[i].in()->*rollback)(oid ACE_ENV_ARG_PARAMETER);
          ACE_TRY_CHECK_EX(block2);
        }
        ACE_CATCHALL {
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h
index cc7a0410df6..6940b21e302 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h
@@ -29,6 +29,7 @@ class Dynamic_Bitset
 public:
   class reference {
   public:
+    typedef Dynamic_Bitset::size_type size_type;
     reference(Dynamic_Bitset* bitset, size_type bit);
     reference operator = (bool val);
     operator bool () const;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
index 946bd2cc51f..0fac46f20cf 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
@@ -56,7 +56,7 @@ namespace FTRTEC {
 
   /////////////////////////////////////////////////////////////////////
 
-  ACE_FACTORY_DEFINE (TAO_FTRTEC, Fault_Detector_Loader);
+  ACE_FACTORY_DEFINE (TAO_FTRTEC, Fault_Detector_Loader)
 
   ACE_STATIC_SVC_DEFINE (Fault_Detector_Loader,
     ACE_TEXT ("FTRTEC_Fault_Detector"),
@@ -64,5 +64,5 @@ namespace FTRTEC {
     &ACE_SVC_NAME (Fault_Detector_Loader),
     ACE_Service_Type::DELETE_THIS
     | ACE_Service_Type::DELETE_OBJ,
-    0);
+    0)
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h
index 5a347dd8a41..86de3d80b64 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h
@@ -47,7 +47,7 @@ namespace FTRTEC {
 
 
   ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Fault_Detector_Loader)
-    ACE_STATIC_SVC_REQUIRE(Fault_Detector_Loader);
+  ACE_STATIC_SVC_REQUIRE(Fault_Detector_Loader)
   ACE_FACTORY_DECLARE (TAO_FTRTEC, Fault_Detector_Loader)
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
index 86976a2854f..5464a83b1ef 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
@@ -80,7 +80,7 @@ namespace FTRTEC {
     return name_;
   }
 
-  ACE_FACTORY_DEFINE (TAO_FTRTEC, Identification_Service);
+  ACE_FACTORY_DEFINE (TAO_FTRTEC, Identification_Service)
 
   ACE_STATIC_SVC_DEFINE (Identification_Service,
     ACE_TEXT ("FTRTEC_Identification"),
@@ -88,5 +88,5 @@ namespace FTRTEC {
     &ACE_SVC_NAME (Identification_Service),
     ACE_Service_Type::DELETE_THIS
     | ACE_Service_Type::DELETE_OBJ,
-    0);
+    0)
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h
index e2a4ee3e5f1..96a1e7abc1f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h
@@ -47,7 +47,7 @@ namespace FTRTEC
 
 
   ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Identification_Service)
-  ACE_STATIC_SVC_REQUIRE(Identification_Service);
+  ACE_STATIC_SVC_REQUIRE(Identification_Service)
   ACE_FACTORY_DECLARE (TAO_FTRTEC, Identification_Service)
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
index f472f5c7c9d..89e7c913cb2 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
@@ -136,7 +136,7 @@ namespace FTRTEC
     return r;
   }
 
-  ACE_FACTORY_DEFINE (TAO_FTRTEC, Replication_Service);
+  ACE_FACTORY_DEFINE (TAO_FTRTEC, Replication_Service)
 
   ACE_STATIC_SVC_DEFINE (Replication_Service,
     ACE_TEXT ("FTRTEC_Replication"),
@@ -144,5 +144,5 @@ namespace FTRTEC
     &ACE_SVC_NAME (Replication_Service),
     ACE_Service_Type::DELETE_THIS
     | ACE_Service_Type::DELETE_OBJ,
-    0);
+    0)
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
index 0af8d63cf78..167f74699a6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
@@ -55,7 +55,7 @@ namespace FTRTEC
 
 
   ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FTRTEC, Replication_Service)
-    ACE_STATIC_SVC_REQUIRE(Replication_Service);
+  ACE_STATIC_SVC_REQUIRE(Replication_Service)
   ACE_FACTORY_DECLARE (TAO_FTRTEC, Replication_Service)
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
index 4b47c507b2d..4c498a713ea 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
@@ -150,7 +150,7 @@ UUID::create (unsigned char *buffer)
   // multiplex timestamp with thread id to ensure the uniqueness between thread
   buffer[6] = (unsigned char) ((timestamp >> 48) & 0xff);
   // Version number is 1
-  buffer[7] = (unsigned char) (((timestamp >> 56) & 0x0f) + 0x10)
+  buffer[7] = (unsigned char) (((timestamp >> 56) & 0x0f) + 0x10);
 
   ACE_UINT16  clockSequence = static_cast<
     ACE_UINT16>(ACE_OS::rand_r(seed) & 0x2ff);