summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormitza <mitza@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2010-08-24 14:21:38 +0000
committermitza <mitza@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2010-08-24 14:21:38 +0000
commit122740c973233ee59bc050676424ac34d8dcb0eb (patch)
treee8925efe586c3d1b91a308fd25db2d162b802eaf
parent0e9570b08174b8fa9dd665a7ec278cbab6f4a506 (diff)
downloadATCD-122740c973233ee59bc050676424ac34d8dcb0eb.tar.gz
ChangeLogTag: Tue Aug 24 14:20:19 UTC 2010 Adam Mitz <mitza@ociweb.com>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/tao/LocalObject.h2
2 files changed, 7 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 07814f5d8e0..dbfcdd90788 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Tue Aug 24 14:20:19 UTC 2010 Adam Mitz <mitza@ociweb.com>
+
+ * tao/LocalObject.h:
+
+ Reverted change from yesterday, apps using TAO will rely on the
+ version macros to determine the LocalObject refcounting.
+
Tue Aug 24 09:09:41 UTC 2010 Martin Corino <mcorino@remedy.nl>
* tao/IIOP_Acceptor.cpp:
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
index 5a7b51c86c1..45f39dfe11a 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -31,8 +31,6 @@
#include "tao/Object.h"
-#define TAO_LOCAL_OBJECTS_ALWAYS_REFCOUNT
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace CORBA