Merge branch 'master' into issue_1583

code/Importer/IFC/IFCReaderGen_4.cpp

@@ -40,13 +40,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** MACHINE-GENERATED by scripts/ICFImporter/CppGenerator.py */
 
-#include "AssimpPCH.h"
 #ifndef ASSIMP_BUILD_NO_IFC_IMPORTER
 
-#include "IFCReaderGen.h"
+#include "AssimpPCH.h"
+#include "IFCReaderGen4.h"
 
 namespace Assimp {
 using namespace IFC;
+using namespace ::Assimp::IFC::Schema_4;
 
 namespace {
 

code/Importer/IFC/IFCReaderGen_4.h

@@ -47,6 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace Assimp {
 namespace IFC {
+namespace Schema_4 {
+
 	using namespace STEP;
 	using namespace STEP::EXPRESS;
 	
@@ -5443,6 +5445,7 @@ namespace STEP {
 
 #undef DECL_CONV_STUB
 
+} //! Schema_4
 } //! STEP
 } //! Assimp