summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-07-21 13:47:27 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-07-21 13:47:27 +0000
commit25697688d46a07323f8142faf40d9d59ebf0ea80 (patch)
treea9ce23217c1f73527b0f293215e065f9fa6f8adb
parentcae50c2a9b1a43be315b9de95a7a08e8654ec186 (diff)
downloadATCD-25697688d46a07323f8142faf40d9d59ebf0ea80.tar.gz
Tue Jul 21 13:48:47 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tools/Config_Handlers/XSCRT/Elements.hpp: Backported some CB2009 fixes
-rw-r--r--CIAO/ChangeLog5
-rw-r--r--CIAO/tools/Config_Handlers/XSCRT/Elements.hpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 9387163ec3a..ffaf6366ae2 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul 21 13:48:47 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tools/Config_Handlers/XSCRT/Elements.hpp:
+ Backported some CB2009 fixes
+
Tue Jul 21 10:51:47 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* DAnCE/NodeApplication/NodeApplication_Impl.cpp:
diff --git a/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp b/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
index 17e55f98434..0ba8e24b3c4 100644
--- a/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
+++ b/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
@@ -240,7 +240,7 @@ namespace XSCRT
public:
// Trait for marshaling a FundamentalType X
typedef X CDR_Type__;
- typedef ACE_Refcounted_Auto_Ptr < FundamentalType, ACE_Null_Mutex > _ptr;
+// typedef ACE_Refcounted_Auto_Ptr < FundamentalType, ACE_Null_Mutex > _ptr;
FundamentalType ()
{