Changeset 607

Timestamp:

03/15/07 17:35:57 (2 years ago)

Author:

allenb

Message:

Make the shareValuesV and cloneValuesV methods non-pure. They now have a default implementation that simply asserts to say that they need to be implemented. This
was needed because it appears there are bugs in gcc 4.1 that prevent this code from being parsed and wrapped correctly for pyopensg. This can/should be changed back
when possible.

See ticket:169

Files:

• trunk/Source/System/FieldContainer/Base/OSGFieldDescriptionBase.cpp (modified) (1 diff)
• trunk/Source/System/FieldContainer/Base/OSGFieldDescriptionBase.h (modified) (2 diffs)

trunk/Source/System/FieldContainer/Base/OSGFieldDescriptionBase.cpp

@@ -151 +151 @@
-/*                             Comparison                                  */
-
+void FieldDescriptionBase::cloneValuesV(
+     const Field         *pSrc,
+     const UInt32         fieldId,
+           FCPtrConstArg  pDst,
+     const TypePtrVector &shareTypes,
+     const TypePtrVector &ignoreTypes,
+     const TypeIdVector  &shareGroupIds,
+     const TypeIdVector  &ignoreGroupIds) const
+{
+   OSG_ASSERT(false && "Must define cloneValuesV");
+}
+
+void FieldDescriptionBase::shareValuesV(
+     const Field         *pSrc,
+     const UInt32         fieldId,
+           FCPtrConstArg  pDst,
+     const TypePtrVector &cloneTypes,
+     const TypePtrVector &ignoreTypes,
+     const TypeIdVector  &cloneGroupIds,
+     const TypeIdVector  &ignoreGroupIds) const
+{
+   OSG_ASSERT(false && "Must define shareValuesV");
+}

trunk/Source/System/FieldContainer/Base/OSGFieldDescriptionBase.h

@@ -240 +240 @@
-        const UInt32         fieldId,
-              FCPtrConstArg  pDst,
- 
+
-        const TypePtrVector &ignoreTypes    = TypePtrVector(),
-        const TypeIdVector  &shareGroupIds  = TypeIdVector (),
- = 0
+
-
-    virtual void shareValuesV(
@@ -252 +252 @@
-        const TypePtrVector &ignoreTypes    = TypePtrVector(),
-        const TypeIdVector  &cloneGroupIds  = TypeIdVector (),
- = 0
+
-
-    /*! \}                                                                 */