Changeset 1138 for branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGWeakAccessHandlerDecl.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/OSGWeakAccessHandlerDecl.h (modified) (4 diffs)

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

@@ -60 +60 @@
-class PointerSFieldBase;
-
+#if 0
-template <Int32 NamespaceI>
-class WeakPointerMFieldBase;
@@ -65 +66 @@
-template <Int32 NamespaceI>
-class WeakPointerSFieldBase;
+#endif
-
-
-
- : public WeakRefCountPolicy
+
-{
-    /*==========================  PUBLIC  =================================*/
@@ -84 +86 @@
-    typedef PointerSFieldBase         SFieldBaseType;
-    
+#if 0
-    typedef WeakPointerMFieldBase<0>  MFieldType;
-    typedef WeakPointerSFieldBase<0>  SFieldType;
+#endif
-    
-    /*! \}                                                                 */
@@ -133 +137 @@
-    /*! \}                                                                 */
-    /*---------------------------------------------------------------------*/
+
+    template <class ObjectT>
+    static ObjectT *validate(ObjectT * const pObject)
+    {
+        return RefCountPolicyType::validate(pObject);
+    }
-};
-