Navigation

← Previous Changeset
Next Changeset →

Changeset 1192

Timestamp:

04/25/08 03:26:25 (2 weeks ago)

Author:

vossg

Message:

fixed: bin change to size_type confuses OSB loader as writing is done by the

field and reading by the loader. Need to bump the osb version anyway
to make it work properly.

Files:

trunk/Source/System/FieldContainer/Fields/PointerFields/OSGChildPointerMFieldBase.h (modified) (1 diff)
trunk/Source/System/FieldContainer/Fields/PointerFields/OSGChildPointerMFieldBase.inl (modified) (1 diff)
trunk/Source/System/FieldContainer/Fields/PointerFields/OSGChildPointerSFieldBase.h (modified) (1 diff)
trunk/Source/System/FieldContainer/Fields/PointerFields/OSGChildPointerSFieldBase.inl (modified) (1 diff)
trunk/Source/System/FieldContainer/Fields/PointerFields/OSGParentPointerMField.inl (modified) (2 diffs)
trunk/Source/System/FieldContainer/Fields/PointerFields/OSGPointerMFieldBase.inl (modified) (1 diff)
trunk/Source/System/FieldContainer/Fields/PointerFields/OSGPointerMFieldCommon.inl (modified) (2 diffs)
trunk/Source/System/FieldContainer/Fields/PointerFields/OSGPointerSFieldCommon.h (modified) (1 diff)
trunk/Source/System/FieldContainer/Fields/PointerFields/OSGPointerSFieldCommon.inl (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/Source/System/FieldContainer/Fields/PointerFields/OSGChildPointerMFieldBase.h

r1155	r1192
	1	/---------------------------------------------------------------------------\
	2	* OpenSG *
	3	* *
	4	* *
	5	* Copyright (C) 2008 by the OpenSG Forum *
	6	* *
	7	* www.opensg.org *
	8	* *
	9	* contact: dirk@opensg.org, gerrit.voss@vossg.org, jbehr@zgdv.de *
	10	* *
	11	\---------------------------------------------------------------------------/
	12	/---------------------------------------------------------------------------\
	13	* License *
	14	* *
	15	* This library is free software; you can redistribute it and/or modify it *
	16	* under the terms of the GNU Library General Public License as published *
	17	* by the Free Software Foundation, version 2. *
	18	* *
	19	* This library is distributed in the hope that it will be useful, but *
	20	* WITHOUT ANY WARRANTY; without even the implied warranty of *
	21	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
	22	* Library General Public License for more details. *
	23	* *
	24	* You should have received a copy of the GNU Library General Public *
	25	* License along with this library; if not, write to the Free Software *
	26	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *
	27	* *
	28	\---------------------------------------------------------------------------/
	29	/---------------------------------------------------------------------------\
	30	* Changes *
	31	* *
	32	* *
	33	* *
	34	* *
	35	* *
	36	* *
	37	\---------------------------------------------------------------------------/
1	38
2	39	#ifndef _OSGCHILDPOINTERMFIELDBASE_H_

trunk/Source/System/FieldContainer/Fields/PointerFields/OSGChildPointerMFieldBase.inl

r1155	r1192
1
	1	/---------------------------------------------------------------------------\
	2	* OpenSG *
	3	* *
	4	* *
	5	* Copyright (C) 2008 by the OpenSG Forum *
	6	* *
	7	* www.opensg.org *
	8	* *
	9	* contact: dirk@opensg.org, gerrit.voss@vossg.org, jbehr@zgdv.de *
	10	* *
	11	\---------------------------------------------------------------------------/
	12	/---------------------------------------------------------------------------\
	13	* License *
	14	* *
	15	* This library is free software; you can redistribute it and/or modify it *
	16	* under the terms of the GNU Library General Public License as published *
	17	* by the Free Software Foundation, version 2. *
	18	* *
	19	* This library is distributed in the hope that it will be useful, but *
	20	* WITHOUT ANY WARRANTY; without even the implied warranty of *
	21	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
	22	* Library General Public License for more details. *
	23	* *
	24	* You should have received a copy of the GNU Library General Public *
	25	* License along with this library; if not, write to the Free Software *
	26	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *
	27	* *
	28	\---------------------------------------------------------------------------/
	29	/---------------------------------------------------------------------------\
	30	* Changes *
	31	* *
	32	* *
	33	* *
	34	* *
	35	* *
	36	* *
	37	\---------------------------------------------------------------------------/
2	38
3	39	#ifdef OSG_DOC_FILES_IN_MODULE

trunk/Source/System/FieldContainer/Fields/PointerFields/OSGChildPointerSFieldBase.h

r1155	r1192
	1	/---------------------------------------------------------------------------\
	2	* OpenSG *
	3	* *
	4	* *
	5	* Copyright (C) 2008 by the OpenSG Forum *
	6	* *
	7	* www.opensg.org *
	8	* *
	9	* contact: dirk@opensg.org, gerrit.voss@vossg.org, jbehr@zgdv.de *
	10	* *
	11	\---------------------------------------------------------------------------/
	12	/---------------------------------------------------------------------------\
	13	* License *
	14	* *
	15	* This library is free software; you can redistribute it and/or modify it *
	16	* under the terms of the GNU Library General Public License as published *
	17	* by the Free Software Foundation, version 2. *
	18	* *
	19	* This library is distributed in the hope that it will be useful, but *
	20	* WITHOUT ANY WARRANTY; without even the implied warranty of *
	21	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
	22	* Library General Public License for more details. *
	23	* *
	24	* You should have received a copy of the GNU Library General Public *
	25	* License along with this library; if not, write to the Free Software *
	26	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *
	27	* *
	28	\---------------------------------------------------------------------------/
	29	/---------------------------------------------------------------------------\
	30	* Changes *
	31	* *
	32	* *
	33	* *
	34	* *
	35	* *
	36	* *
	37	\---------------------------------------------------------------------------/
1	38
2	39	#ifndef _OSGCHILDPOINTERSFIELDBASE_H_

trunk/Source/System/FieldContainer/Fields/PointerFields/OSGChildPointerSFieldBase.inl

r1155	r1192
	1	/---------------------------------------------------------------------------\
	2	* OpenSG *
	3	* *
	4	* *
	5	* Copyright (C) 2008 by the OpenSG Forum *
	6	* *
	7	* www.opensg.org *
	8	* *
	9	* contact: dirk@opensg.org, gerrit.voss@vossg.org, jbehr@zgdv.de *
	10	* *
	11	\---------------------------------------------------------------------------/
	12	/---------------------------------------------------------------------------\
	13	* License *
	14	* *
	15	* This library is free software; you can redistribute it and/or modify it *
	16	* under the terms of the GNU Library General Public License as published *
	17	* by the Free Software Foundation, version 2. *
	18	* *
	19	* This library is distributed in the hope that it will be useful, but *
	20	* WITHOUT ANY WARRANTY; without even the implied warranty of *
	21	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
	22	* Library General Public License for more details. *
	23	* *
	24	* You should have received a copy of the GNU Library General Public *
	25	* License along with this library; if not, write to the Free Software *
	26	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *
	27	* *
	28	\---------------------------------------------------------------------------/
	29	/---------------------------------------------------------------------------\
	30	* Changes *
	31	* *
	32	* *
	33	* *
	34	* *
	35	* *
	36	* *
	37	\---------------------------------------------------------------------------/
1	38
2	39	#ifdef OSG_DOC_FILES_IN_MODULE

trunk/Source/System/FieldContainer/Fields/PointerFields/OSGParentPointerMField.inl

r1165	r1192
556	556	Inherited::copyToBin(pMem);
557	557
558		~~size_type~~ ptrSize = this->size();
	558	UInt32 ptrSize = this->size();
559	559
560	560	if(ptrSize > 0)
…	…
573	573	Inherited::copyFromBin(pMem);
574	574
575		~~size_type~~ ptrSize = this->size();
	575	UInt32 ptrSize = this->size();
576	576
577	577	if(ptrSize > 0)

trunk/Source/System/FieldContainer/Fields/PointerFields/OSGPointerMFieldBase.inl

r1152	r1192
70	70	void PointerMFieldBase::copyToBin(BinaryDataHandler &pMem) const
71	71	{
72		~~size_type~~ n = _ptrStore.size();
	72	UInt32 n = _ptrStore.size();
73	73
74	74	pMem.putValue(n);

trunk/Source/System/FieldContainer/Fields/PointerFields/OSGPointerMFieldCommon.inl

r1160	r1192
385	385	NamespaceI >::copyFromBin(BinaryDataHandler &pMem)
386	386	{
387		~~size_type~~ n;
	387	UInt32 n;
388	388
389	389	pMem.getValue(n);
…	…
417	417	FieldContainerPtr tmpVal;
418	418
419		for(~~size_type~~ i = 0; i < n; ++i)
	419	for(UInt32 i = 0; i < n; ++i)
420	420	{
421	421	MFieldTraits::copyFromBin(pMem,

trunk/Source/System/FieldContainer/Fields/PointerFields/OSGPointerSFieldCommon.h

r1160	r1192
1
	1	/---------------------------------------------------------------------------\
	2	* OpenSG *
	3	* *
	4	* *
	5	* Copyright (C) 2008 by the OpenSG Forum *
	6	* *
	7	* www.opensg.org *
	8	* *
	9	* contact: dirk@opensg.org, gerrit.voss@vossg.org, jbehr@zgdv.de *
	10	* *
	11	\---------------------------------------------------------------------------/
	12	/---------------------------------------------------------------------------\
	13	* License *
	14	* *
	15	* This library is free software; you can redistribute it and/or modify it *
	16	* under the terms of the GNU Library General Public License as published *
	17	* by the Free Software Foundation, version 2. *
	18	* *
	19	* This library is distributed in the hope that it will be useful, but *
	20	* WITHOUT ANY WARRANTY; without even the implied warranty of *
	21	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
	22	* Library General Public License for more details. *
	23	* *
	24	* You should have received a copy of the GNU Library General Public *
	25	* License along with this library; if not, write to the Free Software *
	26	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *
	27	* *
	28	\---------------------------------------------------------------------------/
	29	/---------------------------------------------------------------------------\
	30	* Changes *
	31	* *
	32	* *
	33	* *
	34	* *
	35	* *
	36	* *
	37	\---------------------------------------------------------------------------/
2	38
3	39	#ifndef _OSGPOINTERSFIELDCOMMON_H_

trunk/Source/System/FieldContainer/Fields/PointerFields/OSGPointerSFieldCommon.inl

r1160	r1192
	1	/---------------------------------------------------------------------------\
	2	* OpenSG *
	3	* *
	4	* *
	5	* Copyright (C) 2008 by the OpenSG Forum *
	6	* *
	7	* www.opensg.org *
	8	* *
	9	* contact: dirk@opensg.org, gerrit.voss@vossg.org, jbehr@zgdv.de *
	10	* *
	11	\---------------------------------------------------------------------------/
	12	/---------------------------------------------------------------------------\
	13	* License *
	14	* *
	15	* This library is free software; you can redistribute it and/or modify it *
	16	* under the terms of the GNU Library General Public License as published *
	17	* by the Free Software Foundation, version 2. *
	18	* *
	19	* This library is distributed in the hope that it will be useful, but *
	20	* WITHOUT ANY WARRANTY; without even the implied warranty of *
	21	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
	22	* Library General Public License for more details. *
	23	* *
	24	* You should have received a copy of the GNU Library General Public *
	25	* License along with this library; if not, write to the Free Software *
	26	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *
	27	* *
	28	\---------------------------------------------------------------------------/
	29	/---------------------------------------------------------------------------\
	30	* Changes *
	31	* *
	32	* *
	33	* *
	34	* *
	35	* *
	36	* *
	37	\---------------------------------------------------------------------------/
1	38
2	39	#ifdef OSG_DOC_FILES_IN_MODULE

Navigation

Changeset 1192

Legend:

Download in other formats: