Only Issue Warning if compile Order for MeshIO.hh is violated. Remove Check if errors are reported.

This commit is contained in:
Jan Möbius
2018-04-05 14:09:47 +02:00
parent 473c4050a3
commit 018652e5a4

View File

@@ -55,11 +55,24 @@
// -------------------- system settings // -------------------- system settings
#include <OpenMesh/Core/System/config.h> #include <OpenMesh/Core/System/config.h>
// -------------------- check include order // -------------------- check include order
#if defined (OPENMESH_TRIMESH_ARRAY_KERNEL_HH) || \ #if defined (OPENMESH_TRIMESH_ARRAY_KERNEL_HH) || \
defined (OPENMESH_POLYMESH_ARRAY_KERNEL_HH) defined (OPENMESH_POLYMESH_ARRAY_KERNEL_HH)
# error "Include MeshIO.hh before including a mesh type!"
// Issue warning if MeshIO was not included before Mesh Type
// Nobody knows why this order was enforced.
// If somebody encounters an error resulting from a wrong order, please report it to the OpenMesh developers.
// If we don't here about any errors, this check will be removed
// @TODO: Remove after reasonable time
#ifdef WIN32
#pragma message("MeshIO.hh was included after Mesh Type. You may ignore this warning. Please report errors resulting ifrom this order to the developers!")
#else
#warning "MeshIO.hh was included after Mesh Type. You may ignore this warning. Please report errors resulting from this order to the developers!"
#endif
#endif #endif
// -------------------- OpenMesh // -------------------- OpenMesh
#include <OpenMesh/Core/IO/SR_store.hh> #include <OpenMesh/Core/IO/SR_store.hh>
#include <OpenMesh/Core/IO/IOManager.hh> #include <OpenMesh/Core/IO/IOManager.hh>