Sprinkle with template and typename keywords

aothms · aothms · commit 5e230869479b · 2017-12-22T16:45:02.000+01:00
diff --git a/src/ifcexpressparser/templates.py b/src/ifcexpressparser/templates.py
@@ -40,7 +40,7 @@
 
 static const IfcParse::schema_definition& get_schema();
 
-static const char* const Identifier = "%(schema_name_upper)s";
+static const char* const Identifier;
 
 // Forward definitions
 %(forward_definitions)s
@@ -75,6 +75,8 @@
 
 #include <map>
 
+const char* const %(schema_name)s::Identifier = "%(schema_name_upper)s";
+
 using namespace IfcParse;
 using namespace IfcWrite;
 
diff --git a/src/ifcparse/Ifc2x3.cpp b/src/ifcparse/Ifc2x3.cpp
@@ -31,6 +31,8 @@
 
 #include <map>
 
+const char* const Ifc2x3::Identifier = "IFC2X3";
+
 using namespace IfcParse;
 using namespace IfcWrite;
 
diff --git a/src/ifcparse/Ifc2x3.h b/src/ifcparse/Ifc2x3.h
diff --git a/src/ifcparse/Ifc4.cpp b/src/ifcparse/Ifc4.cpp
@@ -31,6 +31,8 @@
 
 #include <map>
 
+const char* const Ifc4::Identifier = "IFC4";
+
 using namespace IfcParse;
 using namespace IfcWrite;
 
diff --git a/src/ifcparse/Ifc4.h b/src/ifcparse/Ifc4.h
diff --git a/src/ifcparse/IfcFile.h b/src/ifcparse/IfcFile.h
@@ -187,12 +187,12 @@ class IFC_PARSE_API IfcFileWithSchema : public IfcFile {
 public:
 	std::pair<typename Schema::IfcNamedUnit*, double> getUnit(typename Schema::IfcUnitEnum::Value unit_type) {
 		std::pair<IfcUtil::IfcBaseClass*, double> unit_info = IfcFile::getUnit(Schema::IfcUnitEnum::ToString(unit_type));
-		return std::make_pair(unit_info.first->as<typename Schema::IfcNamedUnit>(), unit_info.second);
+		return std::make_pair(unit_info.first->template as<typename Schema::IfcNamedUnit>(), unit_info.second);
 	}
 	
 	/// Returns the entity with the specified GlobalId
-	virtual typename Schema::IfcRoot::list::ptr instance_by_guid(const std::string& guid) {
-		return IfcFile::instance_by_guid(guid)->as<typename Schema::IfcRoot>();
+	virtual typename Schema::IfcRoot* instance_by_guid(const std::string& guid) {
+		return IfcFile::instance_by_guid(guid)->template as<typename Schema::IfcRoot>();
 	}
 };
 
diff --git a/src/ifcparse/IfcSIPrefix.cpp b/src/ifcparse/IfcSIPrefix.cpp
@@ -48,16 +48,16 @@ double IfcParse::get_SI_equivalent(typename Schema::IfcNamedUnit* named_unit) {
 	typename Schema::IfcSIUnit* si_unit = 0;
 
 	if (named_unit->declaration().is(Schema::IfcConversionBasedUnit::Class())) {
-		typename Schema::IfcConversionBasedUnit* conv_unit = named_unit->as<typename Schema::IfcConversionBasedUnit>();
+		typename Schema::IfcConversionBasedUnit* conv_unit = named_unit->template as<typename Schema::IfcConversionBasedUnit>();
 		typename Schema::IfcMeasureWithUnit* factor = conv_unit->ConversionFactor();
 		typename Schema::IfcUnit* component = factor->UnitComponent();
 		if (component->declaration().is(Schema::IfcSIUnit::Class())) {
-			si_unit = component->as<typename Schema::IfcSIUnit>();
+			si_unit = component->template as<typename Schema::IfcSIUnit>();
 			typename Schema::IfcValue* v = factor->ValueComponent();
 			scale = *v->data().getArgument(0);
 		}		
 	} else if (named_unit->declaration().is(Schema::IfcSIUnit::Class())) {
-		si_unit = named_unit->as<typename Schema::IfcSIUnit>();
+		si_unit = named_unit->template as<typename Schema::IfcSIUnit>();
 	}
 	if (si_unit) {
 		if (si_unit->hasPrefix()) {
diff --git a/src/ifcparse/IfcSchema.h b/src/ifcparse/IfcSchema.h
@@ -135,6 +135,8 @@ namespace IfcParse {
 			, schema_(0)
 		{}
 
+		virtual ~declaration() {}
+
 		const std::string& name() const { return name_; }
 		const std::string& name_lc() const { return name_lower_; }
 
@@ -232,7 +234,7 @@ namespace IfcParse {
 			{}
 
 			const std::string& name() const { return name_; }
-			aggregate_type type_of_aggregation() const { type_of_aggregation_; }
+			aggregate_type type_of_aggregation() const { return type_of_aggregation_; }
 			int bound1() const { return bound1_; }
 			int bound2() const { return bound2_; }
 			const entity* entity_reference() const { return entity_reference_; }
@@ -358,7 +360,7 @@ namespace IfcParse {
 						index = std::distance(current->attributes().begin(), it);
 					}
 				}
-			} while ((current = current->supertype_));
+			} while ((current = current->supertype_) != 0);
 			return index;
 		}
 
@@ -376,7 +378,7 @@ namespace IfcParse {
 						index = std::distance(current->attributes().begin(), it);
 					}
 				}
-			} while ((current = current->supertype_));
+			} while ((current = current->supertype_) != 0);
 			return index;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -187,12 +187,12 @@ class IFC_PARSE_API IfcFileWithSchema : public IfcFile {`
`187`	`187`	`public:`
`188`	`188`	`std::pair<typename Schema::IfcNamedUnit*, double> getUnit(typename Schema::IfcUnitEnum::Value unit_type) {`
`189`	`189`	`std::pair<IfcUtil::IfcBaseClass*, double> unit_info = IfcFile::getUnit(Schema::IfcUnitEnum::ToString(unit_type));`
`190`		`- return std::make_pair(unit_info.first->as<typename Schema::IfcNamedUnit>(), unit_info.second);`
	`190`	`+ return std::make_pair(unit_info.first->template as<typename Schema::IfcNamedUnit>(), unit_info.second);`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`/// Returns the entity with the specified GlobalId`
`194`		`- virtual typename Schema::IfcRoot::list::ptr instance_by_guid(const std::string& guid) {`
`195`		`- return IfcFile::instance_by_guid(guid)->as<typename Schema::IfcRoot>();`
	`194`	`+ virtual typename Schema::IfcRoot* instance_by_guid(const std::string& guid) {`
	`195`	`+ return IfcFile::instance_by_guid(guid)->template as<typename Schema::IfcRoot>();`
`196`	`196`	`}`
`197`	`197`	`};`
`198`	`198`
Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,8 @@ namespace IfcParse {`
`135`	`135`	`, schema_(0)`
`136`	`136`	`{}`
`137`	`137`
	`138`	`+ virtual ~declaration() {}`
	`139`	`+`
`138`	`140`	`const std::string& name() const { return name_; }`
`139`	`141`	`const std::string& name_lc() const { return name_lower_; }`
`140`	`142`
`@@ -232,7 +234,7 @@ namespace IfcParse {`
`232`	`234`	`{}`
`233`	`235`
`234`	`236`	`const std::string& name() const { return name_; }`
`235`		`- aggregate_type type_of_aggregation() const { type_of_aggregation_; }`
	`237`	`+ aggregate_type type_of_aggregation() const { return type_of_aggregation_; }`
`236`	`238`	`int bound1() const { return bound1_; }`
`237`	`239`	`int bound2() const { return bound2_; }`
`238`	`240`	`const entity* entity_reference() const { return entity_reference_; }`
`@@ -358,7 +360,7 @@ namespace IfcParse {`
`358`	`360`	`index = std::distance(current->attributes().begin(), it);`
`359`	`361`	`}`
`360`	`362`	`}`
`361`		`- } while ((current = current->supertype_));`
	`363`	`+ } while ((current = current->supertype_) != 0);`
`362`	`364`	`return index;`
`363`	`365`	`}`
`364`	`366`
`@@ -376,7 +378,7 @@ namespace IfcParse {`
`376`	`378`	`index = std::distance(current->attributes().begin(), it);`
`377`	`379`	`}`
`378`	`380`	`}`
`379`		`- } while ((current = current->supertype_));`
	`381`	`+ } while ((current = current->supertype_) != 0);`
`380`	`382`	`return index;`
`381`	`383`	`}`
`382`	`384`