diff --git a/chaos/common/data/CDataWrapper.h b/chaos/common/data/CDataWrapper.h
index 154e1580d0b6522c17646e229a28f5cc678c2e05..d84d14f47746824b4712d224927080ae7927784c 100644
--- a/chaos/common/data/CDataWrapper.h
+++ b/chaos/common/data/CDataWrapper.h
@@ -37,8 +37,12 @@
 namespace epics{
     namespace pvData{
         class Structure;
-        typedef ChaosSharedPtr<const Structure> StructureConstPtr;
+#if __cplusplus >= 201103L
+        typedef std::shared_ptr<const Structure> StructureConstPtr;
+#else
+        typedef std::tr1::shared_ptr<const Structure> StructureConstPtr;
 
+#endif
     }
 }
 #endif