Fixed parsing attribute as entity reference list instead of value lis…

…t in IfcTriangulatedFaceSet

IfcPlusPlus/IfcPlusPlus.vcxproj

@@ -284,7 +284,7 @@
     </Lib>
     <PostBuildEvent>
       <Command>copy /Y "$(OutDir)$(TargetName)$(TargetExt)" "$(SolutionDir)\SimpleViewerExample\bin\$(TargetName)$(TargetExt)"
-copy /Y "$(OutDir)$(TargetName)$(TargetExt)" "$(SolutionDir)\..\..\IfcQuery\bin\$(TargetName)$(TargetExt)"</Command>
+</Command>
     </PostBuildEvent>
     <ProjectReference>
       <UseLibraryDependencyInputs>

IfcPlusPlus/src/ifcpp/IFC4/include/IfcBoxAlignment.h

@@ -15,6 +15,7 @@ class IFCPP_EXPORT IfcBoxAlignment : public IfcLabel
 {
 public:
 	IfcBoxAlignment();
+	IfcBoxAlignment( std::wstring value ) { m_value = value; }
 	~IfcBoxAlignment();
 	virtual const char* className() const { return "IfcBoxAlignment"; }
 	virtual shared_ptr<IfcPPObject> getDeepCopy( IfcPPCopyOptions& options );

IfcPlusPlus/src/ifcpp/IFC4/include/IfcLanguageId.h

@@ -15,6 +15,7 @@ class IFCPP_EXPORT IfcLanguageId : public IfcIdentifier
 {
 public:
 	IfcLanguageId();
+	IfcLanguageId( std::wstring value ) { m_value = value; }
 	~IfcLanguageId();
 	virtual const char* className() const { return "IfcLanguageId"; }
 	virtual shared_ptr<IfcPPObject> getDeepCopy( IfcPPCopyOptions& options );

IfcPlusPlus/src/ifcpp/IFC4/include/IfcNonNegativeLengthMeasure.h

@@ -15,6 +15,7 @@ class IFCPP_EXPORT IfcNonNegativeLengthMeasure : public IfcLengthMeasure
 {
 public:
 	IfcNonNegativeLengthMeasure();
+	IfcNonNegativeLengthMeasure( double value ) { m_value = value; }
 	~IfcNonNegativeLengthMeasure();
 	virtual const char* className() const { return "IfcNonNegativeLengthMeasure"; }
 	virtual shared_ptr<IfcPPObject> getDeepCopy( IfcPPCopyOptions& options );

IfcPlusPlus/src/ifcpp/IFC4/include/IfcNormalisedRatioMeasure.h

@@ -16,6 +16,7 @@ class IFCPP_EXPORT IfcNormalisedRatioMeasure : public IfcRatioMeasure, public If
 {
 public:
 	IfcNormalisedRatioMeasure();
+	IfcNormalisedRatioMeasure( double value ) { m_value = value; }
 	~IfcNormalisedRatioMeasure();
 	virtual const char* className() const { return "IfcNormalisedRatioMeasure"; }
 	virtual shared_ptr<IfcPPObject> getDeepCopy( IfcPPCopyOptions& options );

IfcPlusPlus/src/ifcpp/IFC4/include/IfcPositiveInteger.h

@@ -15,6 +15,7 @@ class IFCPP_EXPORT IfcPositiveInteger : public IfcInteger
 {
 public:
 	IfcPositiveInteger();
+	IfcPositiveInteger( int value ) { m_value = value; }
 	~IfcPositiveInteger();
 	virtual const char* className() const { return "IfcPositiveInteger"; }
 	virtual shared_ptr<IfcPPObject> getDeepCopy( IfcPPCopyOptions& options );

IfcPlusPlus/src/ifcpp/IFC4/include/IfcPositiveLengthMeasure.h

@@ -16,6 +16,7 @@ class IFCPP_EXPORT IfcPositiveLengthMeasure : public IfcLengthMeasure, public If
 {
 public:
 	IfcPositiveLengthMeasure();
+	IfcPositiveLengthMeasure( double value ) { m_value = value; }
 	~IfcPositiveLengthMeasure();
 	virtual const char* className() const { return "IfcPositiveLengthMeasure"; }
 	virtual shared_ptr<IfcPPObject> getDeepCopy( IfcPPCopyOptions& options );

IfcPlusPlus/src/ifcpp/IFC4/include/IfcPositivePlaneAngleMeasure.h

@@ -15,6 +15,7 @@ class IFCPP_EXPORT IfcPositivePlaneAngleMeasure : public IfcPlaneAngleMeasure
 {
 public:
 	IfcPositivePlaneAngleMeasure();
+	IfcPositivePlaneAngleMeasure( double value ) { m_value = value; }
 	~IfcPositivePlaneAngleMeasure();
 	virtual const char* className() const { return "IfcPositivePlaneAngleMeasure"; }
 	virtual shared_ptr<IfcPPObject> getDeepCopy( IfcPPCopyOptions& options );

IfcPlusPlus/src/ifcpp/IFC4/include/IfcPositiveRatioMeasure.h

@@ -15,6 +15,7 @@ class IFCPP_EXPORT IfcPositiveRatioMeasure : public IfcRatioMeasure
 {
 public:
 	IfcPositiveRatioMeasure();
+	IfcPositiveRatioMeasure( double value ) { m_value = value; }
 	~IfcPositiveRatioMeasure();
 	virtual const char* className() const { return "IfcPositiveRatioMeasure"; }
 	virtual shared_ptr<IfcPPObject> getDeepCopy( IfcPPCopyOptions& options );

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcArcIndex.cpp

@@ -36,6 +36,6 @@ shared_ptr<IfcArcIndex> IfcArcIndex::createObjectFromSTEP( const std::wstring& a
 	if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcArcIndex>(); }
 	else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcArcIndex>(); }
 	shared_ptr<IfcArcIndex> type_object( new IfcArcIndex() );
-	readInt( arg, type_object->m_value );
+	readInteger( arg, type_object->m_value );
 	return type_object;
 }

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcBSplineCurveWithKnots.cpp

@@ -86,7 +86,7 @@ void IfcBSplineCurveWithKnots::readStepArguments( const std::vector<std::wstring
 	m_CurveForm = IfcBSplineCurveForm::createObjectFromSTEP( args[2], map );
 	m_ClosedCurve = IfcLogical::createObjectFromSTEP( args[3], map );
 	m_SelfIntersect = IfcLogical::createObjectFromSTEP( args[4], map );
-	readTypeOfIntList( args[5], m_KnotMultiplicities );
+	readTypeOfIntegerList( args[5], m_KnotMultiplicities );
 	readTypeOfRealList( args[6], m_Knots );
 	m_KnotSpec = IfcKnotType::createObjectFromSTEP( args[7], map );
 }

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcBSplineSurfaceWithKnots.cpp

@@ -120,8 +120,8 @@ void IfcBSplineSurfaceWithKnots::readStepArguments( const std::vector<std::wstri
 	m_UClosed = IfcLogical::createObjectFromSTEP( args[4], map );
 	m_VClosed = IfcLogical::createObjectFromSTEP( args[5], map );
 	m_SelfIntersect = IfcLogical::createObjectFromSTEP( args[6], map );
-	readTypeOfIntList( args[7], m_UMultiplicities );
-	readTypeOfIntList( args[8], m_VMultiplicities );
+	readTypeOfIntegerList( args[7], m_UMultiplicities );
+	readTypeOfIntegerList( args[8], m_VMultiplicities );
 	readTypeOfRealList( args[9], m_UKnots );
 	readTypeOfRealList( args[10], m_VKnots );
 	m_KnotSpec = IfcKnotType::createObjectFromSTEP( args[11], map );

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcCardinalPointReference.cpp

@@ -36,6 +36,6 @@ shared_ptr<IfcCardinalPointReference> IfcCardinalPointReference::createObjectFro
 	if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcCardinalPointReference>(); }
 	else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcCardinalPointReference>(); }
 	shared_ptr<IfcCardinalPointReference> type_object( new IfcCardinalPointReference() );
-	readInt( arg, type_object->m_value );
+	readInteger( arg, type_object->m_value );
 	return type_object;
 }

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcColourRgbList.cpp

@@ -70,7 +70,7 @@ void IfcColourRgbList::readStepArguments( const std::vector<std::wstring>& args,
 {
 	const size_t num_args = args.size();
 	if( num_args != 1 ){ std::stringstream err; err << "Wrong parameter count for entity IfcColourRgbList, expecting 1, having " << num_args << ". Entity ID: " << m_entity_id << std::endl; throw IfcPPException( err.str().c_str() ); }
-	readEntityReferenceList2D( args[0], m_ColourList, map );
+	readTypeOfRealList2D( args[0], m_ColourList );
 }
 void IfcColourRgbList::getAttributes( std::vector<std::pair<std::string, shared_ptr<IfcPPObject> > >& vec_attributes )
 {

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcCompoundPlaneAngleMeasure.cpp

@@ -39,6 +39,6 @@ shared_ptr<IfcCompoundPlaneAngleMeasure> IfcCompoundPlaneAngleMeasure::createObj
 	if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcCompoundPlaneAngleMeasure>(); }
 	else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcCompoundPlaneAngleMeasure>(); }
 	shared_ptr<IfcCompoundPlaneAngleMeasure> type_object( new IfcCompoundPlaneAngleMeasure() );
-	readIntList( arg, type_object->m_vec );
+	readIntegerList( arg, type_object->m_vec );
 	return type_object;
 }

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcCountMeasure.cpp

@@ -37,6 +37,6 @@ shared_ptr<IfcCountMeasure> IfcCountMeasure::createObjectFromSTEP( const std::ws
 	if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcCountMeasure>(); }
 	else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcCountMeasure>(); }
 	shared_ptr<IfcCountMeasure> type_object( new IfcCountMeasure() );
-	readInt( arg, type_object->m_value );
+	readInteger( arg, type_object->m_value );
 	return type_object;
 }

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcDayInMonthNumber.cpp

@@ -36,6 +36,6 @@ shared_ptr<IfcDayInMonthNumber> IfcDayInMonthNumber::createObjectFromSTEP( const
 	if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcDayInMonthNumber>(); }
 	else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcDayInMonthNumber>(); }
 	shared_ptr<IfcDayInMonthNumber> type_object( new IfcDayInMonthNumber() );
-	readInt( arg, type_object->m_value );
+	readInteger( arg, type_object->m_value );
 	return type_object;
 }

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcDayInWeekNumber.cpp

@@ -36,6 +36,6 @@ shared_ptr<IfcDayInWeekNumber> IfcDayInWeekNumber::createObjectFromSTEP( const s
 	if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcDayInWeekNumber>(); }
 	else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcDayInWeekNumber>(); }
 	shared_ptr<IfcDayInWeekNumber> type_object( new IfcDayInWeekNumber() );
-	readInt( arg, type_object->m_value );
+	readInteger( arg, type_object->m_value );
 	return type_object;
 }

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcDerivedUnitElement.cpp

@@ -36,7 +36,7 @@ void IfcDerivedUnitElement::readStepArguments( const std::vector<std::wstring>&
 	const size_t num_args = args.size();
 	if( num_args != 2 ){ std::stringstream err; err << "Wrong parameter count for entity IfcDerivedUnitElement, expecting 2, having " << num_args << ". Entity ID: " << m_entity_id << std::endl; throw IfcPPException( err.str().c_str() ); }
 	readEntityReference( args[0], m_Unit, map );
-	readIntValue( args[1], m_Exponent );
+	readIntegerValue( args[1], m_Exponent );
 }
 void IfcDerivedUnitElement::getAttributes( std::vector<std::pair<std::string, shared_ptr<IfcPPObject> > >& vec_attributes )
 {

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcDimensionCount.cpp

@@ -36,6 +36,6 @@ shared_ptr<IfcDimensionCount> IfcDimensionCount::createObjectFromSTEP( const std
 	if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcDimensionCount>(); }
 	else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcDimensionCount>(); }
 	shared_ptr<IfcDimensionCount> type_object( new IfcDimensionCount() );
-	readInt( arg, type_object->m_value );
+	readInteger( arg, type_object->m_value );
 	return type_object;
 }

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcDimensionalExponents.cpp

@@ -49,13 +49,13 @@ void IfcDimensionalExponents::readStepArguments( const std::vector<std::wstring>
 {
 	const size_t num_args = args.size();
 	if( num_args != 7 ){ std::stringstream err; err << "Wrong parameter count for entity IfcDimensionalExponents, expecting 7, having " << num_args << ". Entity ID: " << m_entity_id << std::endl; throw IfcPPException( err.str().c_str() ); }
-	readIntValue( args[0], m_LengthExponent );
-	readIntValue( args[1], m_MassExponent );
-	readIntValue( args[2], m_TimeExponent );
-	readIntValue( args[3], m_ElectricCurrentExponent );
-	readIntValue( args[4], m_ThermodynamicTemperatureExponent );
-	readIntValue( args[5], m_AmountOfSubstanceExponent );
-	readIntValue( args[6], m_LuminousIntensityExponent );
+	readIntegerValue( args[0], m_LengthExponent );
+	readIntegerValue( args[1], m_MassExponent );
+	readIntegerValue( args[2], m_TimeExponent );
+	readIntegerValue( args[3], m_ElectricCurrentExponent );
+	readIntegerValue( args[4], m_ThermodynamicTemperatureExponent );
+	readIntegerValue( args[5], m_AmountOfSubstanceExponent );
+	readIntegerValue( args[6], m_LuminousIntensityExponent );
 }
 void IfcDimensionalExponents::getAttributes( std::vector<std::pair<std::string, shared_ptr<IfcPPObject> > >& vec_attributes )
 {

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcIndexedColourMap.cpp

@@ -71,7 +71,7 @@ void IfcIndexedColourMap::readStepArguments( const std::vector<std::wstring>& ar
 	readEntityReference( args[0], m_MappedTo, map );
 	m_Opacity = IfcNormalisedRatioMeasure::createObjectFromSTEP( args[1], map );
 	readEntityReference( args[2], m_Colours, map );
-	readTypeList( args[3], m_ColourIndex, map );
+	readTypeOfIntegerList( args[3], m_ColourIndex );
 }
 void IfcIndexedColourMap::getAttributes( std::vector<std::pair<std::string, shared_ptr<IfcPPObject> > >& vec_attributes )
 {

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcIndexedPolygonalFace.cpp

@@ -59,7 +59,7 @@ void IfcIndexedPolygonalFace::readStepArguments( const std::vector<std::wstring>
 {
 	const size_t num_args = args.size();
 	if( num_args != 1 ){ std::stringstream err; err << "Wrong parameter count for entity IfcIndexedPolygonalFace, expecting 1, having " << num_args << ". Entity ID: " << m_entity_id << std::endl; throw IfcPPException( err.str().c_str() ); }
-	readTypeList( args[0], m_CoordIndex, map );
+	readTypeOfIntegerList( args[0], m_CoordIndex );
 }
 void IfcIndexedPolygonalFace::getAttributes( std::vector<std::pair<std::string, shared_ptr<IfcPPObject> > >& vec_attributes )
 {

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcIndexedPolygonalFaceWithVoids.cpp

@@ -100,8 +100,8 @@ void IfcIndexedPolygonalFaceWithVoids::readStepArguments( const std::vector<std:
 {
 	const size_t num_args = args.size();
 	if( num_args != 2 ){ std::stringstream err; err << "Wrong parameter count for entity IfcIndexedPolygonalFaceWithVoids, expecting 2, having " << num_args << ". Entity ID: " << m_entity_id << std::endl; throw IfcPPException( err.str().c_str() ); }
-	readTypeList( args[0], m_CoordIndex, map );
-	readEntityReferenceList2D( args[1], m_InnerCoordIndices, map );
+	readTypeOfIntegerList( args[0], m_CoordIndex );
+	readTypeOfIntegerList2D( args[1], m_InnerCoordIndices );
 }
 void IfcIndexedPolygonalFaceWithVoids::getAttributes( std::vector<std::pair<std::string, shared_ptr<IfcPPObject> > >& vec_attributes )
 {

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcIndexedTriangleTextureMap.cpp

@@ -92,7 +92,7 @@ void IfcIndexedTriangleTextureMap::readStepArguments( const std::vector<std::wst
 	readEntityReferenceList( args[0], m_Maps, map );
 	readEntityReference( args[1], m_MappedTo, map );
 	readEntityReference( args[2], m_TexCoords, map );
-	readEntityReferenceList2D( args[3], m_TexCoordIndex, map );
+	readTypeOfIntegerList2D( args[3], m_TexCoordIndex );
 }
 void IfcIndexedTriangleTextureMap::getAttributes( std::vector<std::pair<std::string, shared_ptr<IfcPPObject> > >& vec_attributes )
 {

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcInteger.cpp

@@ -37,6 +37,6 @@ shared_ptr<IfcInteger> IfcInteger::createObjectFromSTEP( const std::wstring& arg
 	if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcInteger>(); }
 	else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcInteger>(); }
 	shared_ptr<IfcInteger> type_object( new IfcInteger() );
-	readInt( arg, type_object->m_value );
+	readInteger( arg, type_object->m_value );
 	return type_object;
 }

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcIntegerCountRateMeasure.cpp

@@ -37,6 +37,6 @@ shared_ptr<IfcIntegerCountRateMeasure> IfcIntegerCountRateMeasure::createObjectF
 	if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcIntegerCountRateMeasure>(); }
 	else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcIntegerCountRateMeasure>(); }
 	shared_ptr<IfcIntegerCountRateMeasure> type_object( new IfcIntegerCountRateMeasure() );
-	readInt( arg, type_object->m_value );
+	readInteger( arg, type_object->m_value );
 	return type_object;
 }

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcLineIndex.cpp

@@ -35,6 +35,6 @@ shared_ptr<IfcLineIndex> IfcLineIndex::createObjectFromSTEP( const std::wstring&
 	if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcLineIndex>(); }
 	else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcLineIndex>(); }
 	shared_ptr<IfcLineIndex> type_object( new IfcLineIndex() );
-	readInt( arg, type_object->m_value );
+	readInteger( arg, type_object->m_value );
 	return type_object;
 }

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcMonthInYearNumber.cpp

@@ -36,6 +36,6 @@ shared_ptr<IfcMonthInYearNumber> IfcMonthInYearNumber::createObjectFromSTEP( con
 	if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcMonthInYearNumber>(); }
 	else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcMonthInYearNumber>(); }
 	shared_ptr<IfcMonthInYearNumber> type_object( new IfcMonthInYearNumber() );
-	readInt( arg, type_object->m_value );
+	readInteger( arg, type_object->m_value );
 	return type_object;
 }

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcNumericMeasure.cpp

@@ -37,6 +37,6 @@ shared_ptr<IfcNumericMeasure> IfcNumericMeasure::createObjectFromSTEP( const std
 	if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcNumericMeasure>(); }
 	else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcNumericMeasure>(); }
 	shared_ptr<IfcNumericMeasure> type_object( new IfcNumericMeasure() );
-	readInt( arg, type_object->m_value );
+	readInteger( arg, type_object->m_value );
 	return type_object;
 }

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcPolygonalFaceSet.cpp

@@ -82,7 +82,7 @@ void IfcPolygonalFaceSet::readStepArguments( const std::vector<std::wstring>& ar
 	readEntityReference( args[0], m_Coordinates, map );
 	m_Closed = IfcBoolean::createObjectFromSTEP( args[1], map );
 	readEntityReferenceList( args[2], m_Faces, map );
-	readTypeList( args[3], m_PnIndex, map );
+	readTypeOfIntegerList( args[3], m_PnIndex );
 }
 void IfcPolygonalFaceSet::getAttributes( std::vector<std::pair<std::string, shared_ptr<IfcPPObject> > >& vec_attributes )
 {

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcPositiveInteger.cpp

@@ -36,6 +36,6 @@ shared_ptr<IfcPositiveInteger> IfcPositiveInteger::createObjectFromSTEP( const s
 	if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcPositiveInteger>(); }
 	else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcPositiveInteger>(); }
 	shared_ptr<IfcPositiveInteger> type_object( new IfcPositiveInteger() );
-	readInt( arg, type_object->m_value );
+	readInteger( arg, type_object->m_value );
 	return type_object;
 }

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcRationalBSplineCurveWithKnots.cpp

@@ -97,7 +97,7 @@ void IfcRationalBSplineCurveWithKnots::readStepArguments( const std::vector<std:
 	m_CurveForm = IfcBSplineCurveForm::createObjectFromSTEP( args[2], map );
 	m_ClosedCurve = IfcLogical::createObjectFromSTEP( args[3], map );
 	m_SelfIntersect = IfcLogical::createObjectFromSTEP( args[4], map );
-	readTypeOfIntList( args[5], m_KnotMultiplicities );
+	readTypeOfIntegerList( args[5], m_KnotMultiplicities );
 	readTypeOfRealList( args[6], m_Knots );
 	m_KnotSpec = IfcKnotType::createObjectFromSTEP( args[7], map );
 	readTypeOfRealList( args[8], m_WeightsData );

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcRationalBSplineSurfaceWithKnots.cpp

@@ -137,8 +137,8 @@ void IfcRationalBSplineSurfaceWithKnots::readStepArguments( const std::vector<st
 	m_UClosed = IfcLogical::createObjectFromSTEP( args[4], map );
 	m_VClosed = IfcLogical::createObjectFromSTEP( args[5], map );
 	m_SelfIntersect = IfcLogical::createObjectFromSTEP( args[6], map );
-	readTypeOfIntList( args[7], m_UMultiplicities );
-	readTypeOfIntList( args[8], m_VMultiplicities );
+	readTypeOfIntegerList( args[7], m_UMultiplicities );
+	readTypeOfIntegerList( args[8], m_VMultiplicities );
 	readTypeOfRealList( args[9], m_UKnots );
 	readTypeOfRealList( args[10], m_VKnots );
 	m_KnotSpec = IfcKnotType::createObjectFromSTEP( args[11], map );

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcRecurrencePattern.cpp

@@ -87,9 +87,9 @@ void IfcRecurrencePattern::readStepArguments( const std::vector<std::wstring>& a
 	const size_t num_args = args.size();
 	if( num_args != 8 ){ std::stringstream err; err << "Wrong parameter count for entity IfcRecurrencePattern, expecting 8, having " << num_args << ". Entity ID: " << m_entity_id << std::endl; throw IfcPPException( err.str().c_str() ); }
 	m_RecurrenceType = IfcRecurrenceTypeEnum::createObjectFromSTEP( args[0], map );
-	readTypeOfIntList( args[1], m_DayComponent );
-	readTypeOfIntList( args[2], m_WeekdayComponent );
-	readTypeOfIntList( args[3], m_MonthComponent );
+	readTypeOfIntegerList( args[1], m_DayComponent );
+	readTypeOfIntegerList( args[2], m_WeekdayComponent );
+	readTypeOfIntegerList( args[3], m_MonthComponent );
 	m_Position = IfcInteger::createObjectFromSTEP( args[4], map );
 	m_Interval = IfcInteger::createObjectFromSTEP( args[5], map );
 	m_Occurrences = IfcInteger::createObjectFromSTEP( args[6], map );

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcReference.cpp

@@ -56,7 +56,7 @@ void IfcReference::readStepArguments( const std::vector<std::wstring>& args, con
 	m_TypeIdentifier = IfcIdentifier::createObjectFromSTEP( args[0], map );
 	m_AttributeIdentifier = IfcIdentifier::createObjectFromSTEP( args[1], map );
 	m_InstanceName = IfcLabel::createObjectFromSTEP( args[2], map );
-	readTypeOfIntList( args[3], m_ListPositions );
+	readTypeOfIntegerList( args[3], m_ListPositions );
 	readEntityReference( args[4], m_InnerReference, map );
 }
 void IfcReference::getAttributes( std::vector<std::pair<std::string, shared_ptr<IfcPPObject> > >& vec_attributes )

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcRelConnectsPathElements.cpp

@@ -98,8 +98,8 @@ void IfcRelConnectsPathElements::readStepArguments( const std::vector<std::wstri
 	readEntityReference( args[4], m_ConnectionGeometry, map );
 	readEntityReference( args[5], m_RelatingElement, map );
 	readEntityReference( args[6], m_RelatedElement, map );
-	readTypeOfIntList( args[7], m_RelatingPriorities );
-	readTypeOfIntList( args[8], m_RelatedPriorities );
+	readTypeOfIntegerList( args[7], m_RelatingPriorities );
+	readTypeOfIntegerList( args[8], m_RelatedPriorities );
 	m_RelatedConnectionType = IfcConnectionTypeEnum::createObjectFromSTEP( args[9], map );
 	m_RelatingConnectionType = IfcConnectionTypeEnum::createObjectFromSTEP( args[10], map );
 }

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcTimeStamp.cpp

@@ -37,6 +37,6 @@ shared_ptr<IfcTimeStamp> IfcTimeStamp::createObjectFromSTEP( const std::wstring&
 	if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcTimeStamp>(); }
 	else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcTimeStamp>(); }
 	shared_ptr<IfcTimeStamp> type_object( new IfcTimeStamp() );
-	readInt( arg, type_object->m_value );
+	readInteger( arg, type_object->m_value );
 	return type_object;
 }