Changeset 1039 for branches/Carsten_PtrWork2/Source/Contrib/Manipulators/OSGRotateManipulatorBase.h

Timestamp:

01/16/08 16:07:40 (11 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/Contrib/Manipulators/OSGRotateManipulatorBase.h (modified) (4 diffs)

branches/Carsten_PtrWork2/Source/Contrib/Manipulators/OSGRotateManipulatorBase.h

@@ -93 +93 @@
-
-    typedef MTRefCountPtrBuilder      <RotateManipulator>::Ptr ObjMTRefPtr;
+    typedef GlobalMTRefCountPtrBuilder<RotateManipulator>::Ptr ObjGlobalMTRefPtr;
-    typedef RefCountPtrBuilder        <RotateManipulator>::Ptr ObjRefPtr;
+    typedef GlobalRefCountPtrBuilder  <RotateManipulator>::Ptr ObjGlobalRefPtr;
-    typedef ParentPtrBuilder          <RotateManipulator>::Ptr ObjParentPtr;
-    typedef WeakRefCountPtrBuilder    <RotateManipulator>::Ptr ObjWeakRefPtr;
-    typedef InternalRefCountPtrBuilder<RotateManipulator>::Ptr ObjInternalRefPtr;
+    typedef TransitPtrBuilder         <RotateManipulator>::Ptr ObjTransitPtr;
-    
-    /*! \}                                                                 */
@@ -138 +141 @@
-    /*! \{                                                                 */
-
-RefPtr    
+TransitPtr
-    static  RotateManipulatorPtr createEmpty(void);
-
@@ -146 +149 @@
-    /*! \{                                                                 */
-
-Ref
+Transit
-
-    /*! \}                                                                 */
@@ -227 +230 @@
-
-typedef RotateManipulatorBase::ObjRefPtr         RotateManipulatorRefPtr;
+typedef RotateManipulatorBase::ObjGlobalRefPtr   RotateManipulatorGlobalRefPtr;
-typedef RotateManipulatorBase::ObjMTRefPtr       RotateManipulatorMTRefPtr;
+typedef RotateManipulatorBase::ObjGlobalMTRefPtr RotateManipulatorGlobalMTRefPtr;
-typedef RotateManipulatorBase::ObjWeakRefPtr     RotateManipulatorWeakRefPtr;
-typedef RotateManipulatorBase::ObjParentPtr      RotateManipulatorParentPtr;
-typedef RotateManipulatorBase::ObjInternalRefPtr RotateManipulatorInternalRefPtr;
+typedef RotateManipulatorBase::ObjTransitPtr     RotateManipulatorTransitPtr;
-
-typedef boost::mpl::if_c<