summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-08-29 02:34:46 +0000
committermarina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-08-29 02:34:46 +0000
commit7ea97aa76a1769129c3435cc22156fb4d5999003 (patch)
tree6e63317c5724099de3043e230cd366313b68d22a
parent9e57d4154a91e34fb979c1a250bcf3bd3dfd6c87 (diff)
downloadATCD-7ea97aa76a1769129c3435cc22156fb4d5999003.tar.gz
ChangeLogTag:Mon Aug 28 21:32:42 2000 Marina Spivak <marina@cs.wustl.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a7
-rw-r--r--TAO/tao/Protocol_Factory.cpp2
2 files changed, 8 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 9a7f6879ed5..764072b2f5b 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Mon Aug 28 21:32:42 2000 Marina Spivak <marina@cs.wustl.edu>
+
+ * tao/Protocol_Factory.cpp:
+
+ Removed extranneous ACE_INLINE that was left from copy/paste
+ routine.
+
Mon Aug 28 19:09:11 2000 Carlos O'Ryan <coryan@uci.edu>
* tao/DynamicAny/DynAny_i.cpp:
diff --git a/TAO/tao/Protocol_Factory.cpp b/TAO/tao/Protocol_Factory.cpp
index 5a5be029b94..b927e827a9a 100644
--- a/TAO/tao/Protocol_Factory.cpp
+++ b/TAO/tao/Protocol_Factory.cpp
@@ -16,7 +16,7 @@ TAO_Protocol_Factory::~TAO_Protocol_Factory (void)
{
}
-ACE_INLINE CORBA::ULong
+CORBA::ULong
TAO_Protocol_Factory::tag (void) const
{
return this->tag_;