Changeset 1072 for branches/Carsten_PtrWork2/Source/System/FieldContainer/Base/OSGAspectStore.inl

Timestamp:

04/02/08 14:18:07 (8 months ago)

Author:

cneumann

Message:

replaced pointer field implementation
split FieldContainer/Fields? directory into Base and Handle subdir

Status: - ref counting seems to work (mt, cluster)

• new OSB loader works (well, the unittest does)
  
• VRML loader is deactivated
  
• get/edit handle for dynamic (pointer) fields missing
  
• need to remove some more old files - they get moved in this commit
  
• generated (i.e. base) code in following commit
  

Files:

• branches/Carsten_PtrWork2/Source/System/FieldContainer/Base/OSGAspectStore.inl (modified) (5 diffs)

branches/Carsten_PtrWork2/Source/System/FieldContainer/Base/OSGAspectStore.inl

@@ -44 +44 @@
-inline
-AspectStore::AspectStore(void) :
-
-
-
+
+
-{
-    if(_externalRefCountLock == NULL)
-    {
-        _externalRefCountLock = 
-            ThreadManager::the()->getLockPool(
-                "AspectStore::_externalRefCountLock");
-        
-        if(_externalRefCountLock != NULL)
-        {
-            FINFO(("AspectStore::AspectStore: "
-                   "Got AspectStore::_externalRefCountLock\n"));
-        }
-        else
-        {
-            FFATAL(("AspectStore::AspectStore: "
-                    "Failed to get AspectStore::_externalRefCountLock\n"));
-        }
-    }
-    
-    OSG::addRef(_externalRefCountLock);
-}
-
-inline
-AspectStore::AspectStore(const AspectStore &) :
-
-
-
+
+
-{
-    FWARNING(("AspectStore::AspectStore(AspectStore const &) called.\n"));
@@ -156 +135 @@
-}
-
-
-inline Int32
-AspectStore::getExternalRefCount(void) const
-{
-    return _externalRefCount;
-}
-
-inline
-void AspectStore::dump(void)
-{
- ERC : %d\n", _refCount, _externalR
+\n", _r
-
-    for(UInt32 i = 0; i < _vAspects.size(); ++i)
@@ -180 +152 @@
-AspectStore::~AspectStore(void)
-{
-    OSG::subRef(_externalRefCountLock);
-}
-
@@ -203 +174 @@
-}
-
-inline void
-AspectStore::acquireExternalReferenceCountLock(void)
-{
-    _externalRefCountLock->acquire(this);
-}
-
-inline void
-AspectStore::releaseExternalReferenceCountLock(void)
-{
-    _externalRefCountLock->release(this);
-}
-
-inline void
-AspectStore::addExternalReference(void)
-{
-    ++_externalRefCount;
-}
-
-inline void
-AspectStore::subExternalReference(void)
-{
-    --_externalRefCount;
-}
-
-/*-------------------------------------------------------------------------*/
-/* Reference Counting Free Functions                                       */
@@ -243 +190 @@
-        objectP->subReference();
-}
-
+
-inline Int32
-getRefCount(AspectStore * const objectP)