From 05fd266a6534fe66002e2a7a316e591d0558c084 Mon Sep 17 00:00:00 2001
From: Thomas Krijnen <t.krijnen@gmail.com>
Date: Sat, 14 Apr 2018 20:06:25 +0200
Subject: [PATCH] gcc compatibility

---
 src/ifcgeom_schema_agnostic/Kernel.h           | 18 +++++++++---------
 src/serializers/XmlSerializer.cpp              |  2 +-
 .../schema_dependent/XmlSerializer.h           |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/ifcgeom_schema_agnostic/Kernel.h b/src/ifcgeom_schema_agnostic/Kernel.h
index d9b58d2d4c..8a1755d4fd 100644
--- a/src/ifcgeom_schema_agnostic/Kernel.h
+++ b/src/ifcgeom_schema_agnostic/Kernel.h
@@ -97,21 +97,21 @@ namespace IfcGeom {
 
 		template <typename Schema>
 		static std::map<std::string, typename Schema::IfcPresentationLayerAssignment*> get_layers(typename Schema::IfcProduct* prod) {
-			std::map<std::string, Schema::IfcPresentationLayerAssignment*> layers;
+			std::map<std::string, typename Schema::IfcPresentationLayerAssignment*> layers;
 			if (prod->hasRepresentation()) {
 				IfcEntityList::ptr r = IfcParse::traverse(prod->Representation());
-				Schema::IfcRepresentation::list::ptr representations = r->as<Schema::IfcRepresentation>();
-				for (Schema::IfcRepresentation::list::it it = representations->begin(); it != representations->end(); ++it) {
-					Schema::IfcPresentationLayerAssignment::list::ptr a = (*it)->LayerAssignments();
-					for (Schema::IfcPresentationLayerAssignment::list::it jt = a->begin(); jt != a->end(); ++jt) {
+				typename Schema::IfcRepresentation::list::ptr representations = r->as<typename Schema::IfcRepresentation>();
+				for (typename Schema::IfcRepresentation::list::it it = representations->begin(); it != representations->end(); ++it) {
+					typename Schema::IfcPresentationLayerAssignment::list::ptr a = (*it)->LayerAssignments();
+					for (typename Schema::IfcPresentationLayerAssignment::list::it jt = a->begin(); jt != a->end(); ++jt) {
 						layers[(*jt)->Name()] = *jt;
 					}
 				}
 
-				Schema::IfcRepresentationItem::list::ptr items = r->as<Schema::IfcRepresentationItem>();
-				for (Schema::IfcRepresentationItem::list::it it = items->begin(); it != items->end(); ++it) {
-					Schema::IfcPresentationLayerAssignment::list::ptr a = getLayerAssignments(*it)->as<Schema::IfcPresentationLayerAssignment>();
-					for (Schema::IfcPresentationLayerAssignment::list::it jt = a->begin(); jt != a->end(); ++jt) {
+				typename Schema::IfcRepresentationItem::list::ptr items = r->as<typename Schema::IfcRepresentationItem>();
+				for (typename Schema::IfcRepresentationItem::list::it it = items->begin(); it != items->end(); ++it) {
+					typename Schema::IfcPresentationLayerAssignment::list::ptr a = getLayerAssignments(*it)->template as<typename Schema::IfcPresentationLayerAssignment>();
+					for (typename Schema::IfcPresentationLayerAssignment::list::it jt = a->begin(); jt != a->end(); ++jt) {
 						layers[(*jt)->Name()] = *jt;
 					}
 				}
diff --git a/src/serializers/XmlSerializer.cpp b/src/serializers/XmlSerializer.cpp
index 5f42e05751..c9e0ae06f8 100644
--- a/src/serializers/XmlSerializer.cpp
+++ b/src/serializers/XmlSerializer.cpp
@@ -24,7 +24,7 @@ XmlSerializer* XmlSerializerFactory::Factory::construct(const std::string& schem
 }
 
 XmlSerializer::XmlSerializer(IfcParse::IfcFile* file, const std::string& xml_filename) {
-	if (file != nullptr) {
+	if (file) {
 		implementation_ = XmlSerializerFactory::implementations().construct(file->schema()->name(), file, xml_filename);
 	}
 }
diff --git a/src/serializers/schema_dependent/XmlSerializer.h b/src/serializers/schema_dependent/XmlSerializer.h
index a37048594b..c6508850d1 100644
--- a/src/serializers/schema_dependent/XmlSerializer.h
+++ b/src/serializers/schema_dependent/XmlSerializer.h
@@ -32,7 +32,7 @@ private:
 
 public:
 	MAKE_TYPE_NAME(XmlSerializer)(IfcParse::IfcFile* file, const std::string& xml_filename)
-		: XmlSerializer(nullptr, "")
+		: XmlSerializer(0, "")
 	{
 		this->file = file;
 		this->xml_filename = xml_filename;