Changeset 1039 for branches/Carsten_PtrWork2/Source/System/Cluster/Window/MultiDisplay/OSGMultiDisplayWindowBase.h

Timestamp:

01/16/08 16:07:40 (10 months ago)

Author:

cneumann

Message:

changed: - factory functions return a TransitPtr? that can not be implicitly

converted to C Ptr. Should help with porting.

added: - GlobalRefPtr?, needed for cases where upon return from main

a RefPtr? goes out of scope (it would attempt to access the
FCFactory which is already shutdown at that point).

status: - vrml loader does not compile (needs porting to ref ptr)

• tutorials compile, run and exit cleanly
  
• multithreading and cluster are untested, yet
  

Files:

• branches/Carsten_PtrWork2/Source/System/Cluster/Window/MultiDisplay/OSGMultiDisplayWindowBase.h (modified) (4 diffs)

branches/Carsten_PtrWork2/Source/System/Cluster/Window/MultiDisplay/OSGMultiDisplayWindowBase.h

@@ -103 +103 @@
-
-    typedef MTRefCountPtrBuilder      <MultiDisplayWindow>::Ptr ObjMTRefPtr;
+    typedef GlobalMTRefCountPtrBuilder<MultiDisplayWindow>::Ptr ObjGlobalMTRefPtr;
-    typedef RefCountPtrBuilder        <MultiDisplayWindow>::Ptr ObjRefPtr;
+    typedef GlobalRefCountPtrBuilder  <MultiDisplayWindow>::Ptr ObjGlobalRefPtr;
-    typedef ParentPtrBuilder          <MultiDisplayWindow>::Ptr ObjParentPtr;
-    typedef WeakRefCountPtrBuilder    <MultiDisplayWindow>::Ptr ObjWeakRefPtr;
-    typedef InternalRefCountPtrBuilder<MultiDisplayWindow>::Ptr ObjInternalRefPtr;
+    typedef TransitPtrBuilder         <MultiDisplayWindow>::Ptr ObjTransitPtr;
-    
-    /*! \}                                                                 */
@@ -257 +260 @@
-    /*! \{                                                                 */
-
-RefPtr    
+TransitPtr
-    static  MultiDisplayWindowPtr createEmpty(void);
-
@@ -265 +268 @@
-    /*! \{                                                                 */
-
-Ref
+Transit
-
-    /*! \}                                                                 */
@@ -367 +370 @@
-
-typedef MultiDisplayWindowBase::ObjRefPtr         MultiDisplayWindowRefPtr;
+typedef MultiDisplayWindowBase::ObjGlobalRefPtr   MultiDisplayWindowGlobalRefPtr;
-typedef MultiDisplayWindowBase::ObjMTRefPtr       MultiDisplayWindowMTRefPtr;
+typedef MultiDisplayWindowBase::ObjGlobalMTRefPtr MultiDisplayWindowGlobalMTRefPtr;
-typedef MultiDisplayWindowBase::ObjWeakRefPtr     MultiDisplayWindowWeakRefPtr;
-typedef MultiDisplayWindowBase::ObjParentPtr      MultiDisplayWindowParentPtr;
-typedef MultiDisplayWindowBase::ObjInternalRefPtr MultiDisplayWindowInternalRefPtr;
+typedef MultiDisplayWindowBase::ObjTransitPtr     MultiDisplayWindowTransitPtr;
-
-typedef boost::mpl::if_c<