Changeset 1138 for branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGChildAccessHandlerDecl.h

Timestamp:

04/07/08 02:50:33 (8 months ago)

Author:

vossg

Message:

changed: merged some merge changes back to have a running reference

Files:

• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGChildAccessHandlerDecl.h (modified) (4 diffs)

branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGChildAccessHandlerDecl.h

@@ -66 +66 @@
-class ChildPointerSFieldBase;
-
+#if 0
-template <Int32 NamespaceI>
-class ParentPointerMFieldBase;
@@ -71 +72 @@
-template <Int32 NamespaceI>
-class ParentPointerSFieldBase;
+#endif
-
-
-
-
+
-{
-    /*==========================  PUBLIC  =================================*/
@@ -93 +94 @@
-    typedef ChildPointerSFieldBase <0> SFieldType;
-    
+#if 0
-    typedef ParentPointerMFieldBase<0> ParentMFieldType;
-    typedef ParentPointerSFieldBase<0> ParentSFieldType;
+#endif
-    
-    /*! \}                                                                 */
@@ -140 +143 @@
-                              FieldContainerPtrConst         pNewObj );
-                            
+    /*---------------------------------------------------------------------*/
+
+    template <class ObjectT>
+    static ObjectT *validate(ObjectT * const pObject)
+    {
+        return RefCountPolicyType::validate(pObject);
+    }
+
-    /*! \}                                                                 */
-    /*==========================  PRIVATE  ================================*/