summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Totten <tottens@users.noreply.github.com>2003-10-02 20:14:20 +0000
committerSteve Totten <tottens@users.noreply.github.com>2003-10-02 20:14:20 +0000
commit0d5d2849edc27641810d3e6a180fa30890c0b5d6 (patch)
tree43f8a33816f35f9b1ae9a3045f3a484c4dbfa4d8
parent7a736214fe01e0116e9a996e5f0a980680221f0a (diff)
downloadATCD-0d5d2849edc27641810d3e6a180fa30890c0b5d6.tar.gz
ChangeLogTag: Thu Oct 2 15:12:50 2003 Steve Totten <totten_s@ociweb.com>
-rw-r--r--TAO/ChangeLog9
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h2
-rwxr-xr-xTAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h4
3 files changed, 12 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 1945db1862c..50b7261b556 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Thu Oct 2 15:12:50 2003 Steve Totten <totten_s@ociweb.com>
+
+ * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h:
+ * orbsvcs/tests/FT_App/lReplicationManagerFaultConsumerAdapter.h:
+
+ Removed trailing spaces after previous commit.
+
+ These changes were made in the oci_haft branch.
+
Thu Oct 2 14:21:13 2003 Steve Totten <totten_s@ociweb.com>
* orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp:
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
index e182e861053..deec78e3676 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -90,7 +90,7 @@ namespace TAO
int fini (ACE_ENV_SINGLE_ARG_DECL);
/**
- * Idle-time activity.
+ * Idle-time activity.
*
* @param result is set to process return code if return value is non-zero.
* @return zero to continue; nonzero to exit
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
index a551a49032e..50438a04b5a 100755
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
@@ -20,7 +20,7 @@ class TAO_ORB_Manager;
// Class declarations
/**
- * An adapter to the Replication Manager's fault consumer
+ * An adapter to the Replication Manager's fault consumer
* for use in unit testing Fault Notifier and Fault Consumer.
*/
class ReplicationManagerFaultConsumerAdapter
@@ -76,7 +76,7 @@ private:
private:
ReplicationManagerFaultConsumerAdapter (
const ReplicationManagerFaultConsumerAdapter & rhs);
- ReplicationManagerFaultConsumerAdapter & operator =
+ ReplicationManagerFaultConsumerAdapter & operator =
(const ReplicationManagerFaultConsumerAdapter & rhs);
/////////////////////////