Changeset 1030 for branches/Carsten_PtrWork2/Source/System/FieldContainer/Base/OSGFieldContainer.h

Timestamp:

12/03/07 15:48:13 (1 year ago)

Author:

cneumann

Message:

fixed: compile errors

reference counting

It compiles on linux (when disabling the VRML Loader) and the first
ref counting tests seem to work.

Files:

• branches/Carsten_PtrWork2/Source/System/FieldContainer/Base/OSGFieldContainer.h (modified) (5 diffs)

branches/Carsten_PtrWork2/Source/System/FieldContainer/Base/OSGFieldContainer.h

@@ -52 +52 @@
-#include "OSGChangedFunctorMFields.h"
-#include "OSGAspectStore.h"
-
-
+
+
+
-
-OSG_BEGIN_NAMESPACE
@@ -79 +80 @@
-    typedef FieldContainer                                   Self;
-
-
-    OSG_GEN_INTERNALPTR(FieldContainer);
+    
+    typedef WeakRefCountPtrBuilder<FieldContainer>::Ptr ObjWeakRefPtr;
+    typedef MTRefCountPtrBuilder  <FieldContainer>::Ptr ObjMTRefPtr;
+    typedef RefCountPtrBuilder    <FieldContainer>::Ptr ObjRefPtr;
+    typedef ParentPtrBuilder      <FieldContainer>::Ptr ObjParentPtr;
-
-    struct  attempt_to_create_CoredNodePtr_on_non_NodeCore_FC {};
@@ -258 +263 @@
-    Int32                     _internalRefCount;
-    Int32                     _weakRefCount;
+    bool                      _resolveInProgress;
+    bool                      _destroyInProgress;
-
-    /*! \}                                                                 */
@@ -351 +358 @@
-    /*! \name                MT Construction                               */
-    /*! \{                                                                 */
-
+
-            bool destroyAspect(UInt32 const uiContainerId, 
-                               UInt32 const uiAspect      );
@@ -443 +450 @@
-};
-
+typedef FieldContainer::ObjRefPtr      FieldContainerRefPtr;
+typedef FieldContainer::ObjMTRefPtr    FieldContainerMTRefPtr;
+typedef FieldContainer::ObjWeakRefPtr  FieldContainerWeakRefPtr;
+typedef FieldContainer::ObjParentPtr   FieldContainerParentPtr;
+
+
-OSG_SYSTEM_DLLMAPPING
-void appendTypesVector(