diff --git a/CHANGELOG b/CHANGELOG index 6a175f2f6f984884261375f3312d9ffe77524819..56063123c93d7a23b4d006f6078c37b6966b8cd5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ Version X (?/?/?) - !!!Break compatiblity with C++98, require C++11 as mininum!!! +- Renamed *T.cc into *T_impl.hh to avoid ugly problems ith several IDEs - Fix bug in halfface reordering - Track if garbage collection is necessary. - Ignore non-serializable datatypes when saving properties instead of throwing exception. diff --git a/cmake/ACGCommon.cmake b/cmake/ACGCommon.cmake index 2f0ecd2a79f92eb9b29eae8c3eb6587bd541d1ce..fdba37a89ad337b6a1fc26d45230027877c01e78 100644 --- a/cmake/ACGCommon.cmake +++ b/cmake/ACGCommon.cmake @@ -221,16 +221,6 @@ macro (acg_append_files_recursive ret ext) endforeach () endmacro () - -# drop all "*T.cc" files from list -macro (acg_drop_templates list) - foreach (_file ${${list}}) - if (_file MATCHES "T.cc$") - list (REMOVE_ITEM ${list} ${_file}) - endif () - endforeach () -endmacro () - # get all files in directory, but ignore svn macro (acg_get_files_in_dir ret dir) file (GLOB_RECURSE __files RELATIVE "${dir}" "${dir}/*") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8bc8e8cff6213782184b8ca1f6671e82cf82d707..45a3388b65bcd5bdaf6302799dcc2b99e7d8e75e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -19,9 +19,6 @@ set (directories acg_append_files (headers "*.hh" ${directories}) acg_append_files (sources "*.cc" ${directories}) -# Don't build template cc files as they only contain templates -acg_drop_templates(sources) - # Disable Library installation when not building OpenVolumeMesh on its own but as part of another project! if ( NOT ${PROJECT_NAME} MATCHES "OpenVolumeMesh") set(ACG_NO_LIBRARY_INSTALL true) @@ -51,20 +48,6 @@ install(DIRECTORY . PATTERN "tmp" EXCLUDE PATTERN "Templates" EXCLUDE PATTERN "Debian*" EXCLUDE) - -#install Template cc files (required by headers) -install(DIRECTORY . - DESTINATION include - FILES_MATCHING - PATTERN "*T.cc" - PATTERN "Unittests" EXCLUDE - PATTERN "FileConverter" EXCLUDE - PATTERN "CVS" EXCLUDE - PATTERN ".svn" EXCLUDE - PATTERN "tmp" EXCLUDE - PATTERN "Templates" EXCLUDE - PATTERN "Debian*" EXCLUDE) - endif () # Only build unittests and file converter diff --git a/src/OpenVolumeMesh/Attribs/ColorAttrib.hh b/src/OpenVolumeMesh/Attribs/ColorAttrib.hh index e20eb0ee801401f72c43ca041f359a0928880e7a..1f9d449ec1408b267643d5816e05ba3ac642d42e 100644 --- a/src/OpenVolumeMesh/Attribs/ColorAttrib.hh +++ b/src/OpenVolumeMesh/Attribs/ColorAttrib.hh @@ -187,7 +187,7 @@ private: } // Namespace OpenVolumeMesh #if defined(INCLUDE_TEMPLATES) && !defined(COLORATTRIBT_CC) -#include "ColorAttribT.cc" +#include "ColorAttribT_impl.hh" #endif #endif /* COLORATTRIB_HH_ */ diff --git a/src/OpenVolumeMesh/Attribs/ColorAttribT.cc b/src/OpenVolumeMesh/Attribs/ColorAttribT_impl.hh similarity index 100% rename from src/OpenVolumeMesh/Attribs/ColorAttribT.cc rename to src/OpenVolumeMesh/Attribs/ColorAttribT_impl.hh diff --git a/src/OpenVolumeMesh/Attribs/NormalAttrib.hh b/src/OpenVolumeMesh/Attribs/NormalAttrib.hh index 671edb8874332f8def90c709fb1dba66287a477c..d1bd67f3ebd2e723744dec82169119207bb85745 100644 --- a/src/OpenVolumeMesh/Attribs/NormalAttrib.hh +++ b/src/OpenVolumeMesh/Attribs/NormalAttrib.hh @@ -125,7 +125,7 @@ private: } // Namespace OpenVolumeMesh #if defined(INCLUDE_TEMPLATES) && !defined(NORMALATTRIBT_CC) -#include "NormalAttribT.cc" +#include "NormalAttribT_impl.hh" #endif #endif /* NORMALATTRIB_HH_ */ diff --git a/src/OpenVolumeMesh/Attribs/NormalAttribT.cc b/src/OpenVolumeMesh/Attribs/NormalAttribT_impl.hh similarity index 100% rename from src/OpenVolumeMesh/Attribs/NormalAttribT.cc rename to src/OpenVolumeMesh/Attribs/NormalAttribT_impl.hh diff --git a/src/OpenVolumeMesh/Attribs/StatusAttrib.hh b/src/OpenVolumeMesh/Attribs/StatusAttrib.hh index 1215369a311082366f9ce4ae7cfb92c70c38400d..5ba268d20d62857f85b26462d9a9f3444001d832 100644 --- a/src/OpenVolumeMesh/Attribs/StatusAttrib.hh +++ b/src/OpenVolumeMesh/Attribs/StatusAttrib.hh @@ -280,7 +280,7 @@ private: } // Namespace OpenVolumeMesh #if defined(INCLUDE_TEMPLATES) && !defined(STATUSATTRIBT_CC) -#include "StatusAttribT.cc" +#include "StatusAttribT_impl.hh" #endif #endif /* STATUSATTRIB_HH_ */ diff --git a/src/OpenVolumeMesh/Attribs/StatusAttribT.cc b/src/OpenVolumeMesh/Attribs/StatusAttribT_impl.hh similarity index 100% rename from src/OpenVolumeMesh/Attribs/StatusAttribT.cc rename to src/OpenVolumeMesh/Attribs/StatusAttribT_impl.hh diff --git a/src/OpenVolumeMesh/Attribs/TexCoordAttrib.hh b/src/OpenVolumeMesh/Attribs/TexCoordAttrib.hh index b042d1c4e6c5943ef669458f4fc107cb069c90a8..865bffcd6d58e3d35c70fec025fd6ec17ede97f8 100644 --- a/src/OpenVolumeMesh/Attribs/TexCoordAttrib.hh +++ b/src/OpenVolumeMesh/Attribs/TexCoordAttrib.hh @@ -96,7 +96,7 @@ private: } // Namespace OpenVolumeMesh #if defined(INCLUDE_TEMPLATES) && !defined(TEXCOORDATTRIBT_CC) -#include "TexCoordAttribT.cc" +#include "TexCoordAttribT_impl.hh" #endif #endif /* TEXCOORDATTRIB_HH_ */ diff --git a/src/OpenVolumeMesh/Attribs/TexCoordAttribT.cc b/src/OpenVolumeMesh/Attribs/TexCoordAttribT_impl.hh similarity index 100% rename from src/OpenVolumeMesh/Attribs/TexCoordAttribT.cc rename to src/OpenVolumeMesh/Attribs/TexCoordAttribT_impl.hh diff --git a/src/OpenVolumeMesh/Core/PropertyDefines.hh b/src/OpenVolumeMesh/Core/PropertyDefines.hh index 4d0744f8658d199d7237d9d365de08d340bc54a3..ec429b454ab4560cdc62ae7cb53e8e128414594c 100644 --- a/src/OpenVolumeMesh/Core/PropertyDefines.hh +++ b/src/OpenVolumeMesh/Core/PropertyDefines.hh @@ -174,7 +174,7 @@ private: } // Namespace OpenVolumeMesh #if defined(INCLUDE_TEMPLATES) && !defined(PROPERTYDEFINEST_CC) -#include "PropertyDefinesT.cc" +#include "PropertyDefinesT_impl.hh" #endif #endif /* PROPERTYDEFINES_HH_ */ diff --git a/src/OpenVolumeMesh/Core/PropertyDefinesT.cc b/src/OpenVolumeMesh/Core/PropertyDefinesT_impl.hh similarity index 100% rename from src/OpenVolumeMesh/Core/PropertyDefinesT.cc rename to src/OpenVolumeMesh/Core/PropertyDefinesT_impl.hh diff --git a/src/OpenVolumeMesh/Core/PropertyPtr.hh b/src/OpenVolumeMesh/Core/PropertyPtr.hh index 0e83cf6093b6508bd4b1fb95ba289a4663d25996..4e180ac632df13bef15ec62d55df45aa4270b3cf 100644 --- a/src/OpenVolumeMesh/Core/PropertyPtr.hh +++ b/src/OpenVolumeMesh/Core/PropertyPtr.hh @@ -126,7 +126,7 @@ protected: } // Namespace OpenVolumeMesh #if defined(INCLUDE_TEMPLATES) && !defined(PROPERTYPTRT_CC) -#include "PropertyPtrT.cc" +#include "PropertyPtrT_impl.hh" #endif #endif /* PROPERTYPTR_HH_ */ diff --git a/src/OpenVolumeMesh/Core/PropertyPtrT.cc b/src/OpenVolumeMesh/Core/PropertyPtrT_impl.hh similarity index 100% rename from src/OpenVolumeMesh/Core/PropertyPtrT.cc rename to src/OpenVolumeMesh/Core/PropertyPtrT_impl.hh diff --git a/src/OpenVolumeMesh/Core/ResourceManager.hh b/src/OpenVolumeMesh/Core/ResourceManager.hh index a8507c9376145663fdf5865bb4d4321ae3cb37e5..9e671cb590880a12e5442f9aebb3a6d5e0795cc2 100644 --- a/src/OpenVolumeMesh/Core/ResourceManager.hh +++ b/src/OpenVolumeMesh/Core/ResourceManager.hh @@ -361,7 +361,7 @@ private: } #if defined(INCLUDE_TEMPLATES) && !defined(RESOURCEMANAGERT_CC) -#include "ResourceManagerT.cc" +#include "ResourceManagerT_impl.hh" #endif #endif /* RESOURCEMANAGER_HH_ */ diff --git a/src/OpenVolumeMesh/Core/ResourceManagerT.cc b/src/OpenVolumeMesh/Core/ResourceManagerT_impl.hh similarity index 100% rename from src/OpenVolumeMesh/Core/ResourceManagerT.cc rename to src/OpenVolumeMesh/Core/ResourceManagerT_impl.hh diff --git a/src/OpenVolumeMesh/Core/Serializers.hh b/src/OpenVolumeMesh/Core/Serializers.hh index fe7d558a3adbdac941046e9306b83fde4228ba2d..650376ee9f2924f5ddeb53ac707cfd2c758e4f51 100644 --- a/src/OpenVolumeMesh/Core/Serializers.hh +++ b/src/OpenVolumeMesh/Core/Serializers.hh @@ -83,7 +83,7 @@ std::istream& operator>>(std::istream& is, std::vector< bool >& rhs); } #if defined(INCLUDE_TEMPLATES) && !defined(SERIALIZERST_CC) -#include "SerializersT.cc" +#include "SerializersT_impl.hh" #endif #endif // SERIALIZERS_HH diff --git a/src/OpenVolumeMesh/Core/SerializersT.cc b/src/OpenVolumeMesh/Core/SerializersT_impl.hh similarity index 100% rename from src/OpenVolumeMesh/Core/SerializersT.cc rename to src/OpenVolumeMesh/Core/SerializersT_impl.hh diff --git a/src/OpenVolumeMesh/FileManager/FileManager.hh b/src/OpenVolumeMesh/FileManager/FileManager.hh index 9cbe9b56ffd9eefbe6c309a9686a440f52db002e..f6f18cd2e324a6dbdf97b634a59fe95aa5d517ee 100644 --- a/src/OpenVolumeMesh/FileManager/FileManager.hh +++ b/src/OpenVolumeMesh/FileManager/FileManager.hh @@ -184,7 +184,7 @@ private: } // Namespace FileManager #if defined(INCLUDE_TEMPLATES) && !defined(FILEMANAGERT_CC) -#include "FileManagerT.cc" +#include "FileManagerT_impl.hh" #endif #endif /* FILEMANAGER_HH_ */ diff --git a/src/OpenVolumeMesh/FileManager/FileManagerT.cc b/src/OpenVolumeMesh/FileManager/FileManagerT_impl.hh similarity index 100% rename from src/OpenVolumeMesh/FileManager/FileManagerT.cc rename to src/OpenVolumeMesh/FileManager/FileManagerT_impl.hh