Changeset 1138

Timestamp:

04/07/08 02:50:33 (5 months ago)

Author:

vossg

Message:

changed: merged some merge changes back to have a running reference

Files:

• branches/Carsten_PtrWork2/Source/Base/Base/OSGContainerForwards.h (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Base/OSGRefCountPolicies.h (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGChildAccessHandlerDecl.h (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGChildPointerMField.inl (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGChildPointerSField.inl (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGNoRefCountAccessHandler.h (added)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGNoRefCountAccessHandler.inl (added)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGNoRefCountAccessHandlerDecl.h (added)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGParentPointerMField.h (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGParentPointerMField.inl (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGParentPointerMFieldBase.h (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGParentPointerSField.h (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGParentPointerSField.inl (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGParentPointerSFieldBase.h (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGPointerFieldTraitsBase.h (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGPointerMFieldBase.h (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGPointerMFieldBase.inl (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGPointerMFieldCommon.h (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGPointerMFieldCommon.inl (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGPointerSFieldBase.h (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGPointerSFieldBase.inl (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGUnrecordedAccessHandlerDecl.h (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGUnrecordedPointerMField.inl (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGUnrecordedPointerSField.inl (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGWeakAccessHandlerDecl.h (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGWeakPointerMField.inl (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGWeakPointerSField.inl (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/OSGAttachmentContainerFieldTraits.h (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/OSGContainerTypeInst.cpp (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/OSGFieldContainerAttachmentFieldTraits.h (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/OSGFieldContainerFieldTraits.h (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/OSGNodeCoreFieldTraits.h (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/OSGNodeFieldTraits.h (modified) (view diffs)
• branches/Carsten_PtrWork2/Source/System/FieldContainer/Node/OSGNode.h (modified) (view diffs)