Changeset 1072 for branches/Carsten_PtrWork2/Source/System/FieldContainer/Base/OSGRefCountPointer.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/OSGRefCountPointer.inl (modified) (2 diffs)

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

@@ -282 +282 @@
-template <class LHSObjectT, class LHSRefCountPolicyT,
-          class RHSObjectT, class RHSRefCountPolicyT >
-
-
-
-
-
+inline 
+    
+    
+    
+    
-{
-    return (lhs.get() == rhs.get());
+}
+
+template <class LHSObjectT, class LHSRefCountPolicyT,
+          class RHSObjectT                           >
+inline bool
+    operator==(RefCountPointer<LHSObjectT,
+                               LHSRefCountPolicyT> const &lhs,
+               RHSObjectT *                        const  rhs )
+{
+    return (lhs.get() == rhs);
+}
+
+template <class LHSObjectT, 
+          class RHSObjectT, class RHSRefCountPolicyT>
+inline bool
+    operator==(LHSObjectT *                        const  lhs,
+               RefCountPointer<RHSObjectT,
+                               RHSRefCountPolicyT> const &rhs )
+{
+    return (lhs == rhs.get());
-}
-
@@ -303 +323 @@
-
-template <class LHSObjectT, class LHSRefCountPolicyT,
+          class RHSObjectT                           >
+bool
+    operator!=(RefCountPointer<LHSObjectT,
+                               LHSRefCountPolicyT> const &lhs,
+               RHSObjectT *                        const  rhs )
+{
+    return !(lhs == rhs);
+}
+
+template <class LHSObjectT, 
+          class RHSObjectT, class RHSRefCountPolicyT>
+bool
+    operator!=(LHSObjectT *                        const  lhs,
+               RefCountPointer<RHSObjectT,
+                               RHSRefCountPolicyT> const &rhs )
+{
+    return !(lhs == rhs);
+}
+
+template <class LHSObjectT, class LHSRefCountPolicyT,
-          class RHSObjectT, class RHSRefCountPolicyT >
-bool