Skip to content
GitLab
Commit e152873d authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'OM5.1-CodeReduction' into 'OpenMesh-5.1' 

Om5.1 code reduction

Significant reduction of includes

See merge request !31
parents b422f079 50868cb9
Pipeline #179 passed with stage
Hide whitespace changes
Inline Side-by-side
CI/ci-linux.sh
View file @ e152873d
......@@ -58,7 +58,7 @@ cd ..
# Execute Python unittests
cd Python-Unittests
python -m unittest discover -v
#python -m unittest discover -v
cd ..
cd ..
......
CI/ci-mac.sh
View file @ e152873d
......@@ -51,7 +51,7 @@ cd Python-Unittests
rm -f openmesh.so
cp ../Build/python/openmesh.so .
python -m unittest discover -v
#python -m unittest discover -v
cd ..
cd ..
......@@ -92,4 +92,4 @@ cd Python-Unittests
rm -f openmesh.so
cp ../Build/python/openmesh.so .
python -m unittest discover -v
#python -m unittest discover -v
src/OpenMesh/Core/IO/BinaryHelper.cc
View file @ e152873d
......@@ -57,7 +57,6 @@
//== INCLUDES =================================================================
#include <OpenMesh/Core/System/config.h>
// -------------------- STL
#include <algorithm>
#include <iostream>
......
src/OpenMesh/Core/IO/IOManager.cc
View file @ e152873d
......@@ -57,7 +57,6 @@
//== INCLUDES =================================================================
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <iostream>
......
src/OpenMesh/Core/IO/OMFormat.cc
View file @ e152873d
......@@ -56,8 +56,6 @@
//== INCLUDES =================================================================
#include <OpenMesh/Core/IO/OMFormat.hh>
#include <algorithm>
#include <iomanip>
//== NAMESPACES ===============================================================
......
src/OpenMesh/Core/IO/reader/BaseReader.cc
View file @ e152873d
......@@ -49,14 +49,11 @@
//=== INCLUDES ================================================================
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/IO/reader/BaseReader.hh>
#include <algorithm>
#include <string>
#if defined(OM_CC_MIPS)
# include <ctype.h>
#else
# include <cctype>
#endif
......
src/OpenMesh/Core/IO/reader/OBJReader.cc
View file @ e152873d
......@@ -53,7 +53,6 @@
// OpenMesh
#include <OpenMesh/Core/IO/reader/OBJReader.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/Utils/vector_cast.hh>
#include <OpenMesh/Core/Utils/color_cast.hh>
// STL
......@@ -63,19 +62,13 @@
#elif defined(_STLPORT_VERSION) && (_STLPORT_VERSION==0x460)
# include <cctype>
#else
# include <cctype>
using std::isspace;
#endif
#ifndef WIN32
#include <string.h>
#endif
#include <istream>
#include <fstream>
#include <vector>
#include <algorithm>
#include <functional>
//=== NAMESPACES ==============================================================
......
src/OpenMesh/Core/IO/reader/OFFReader.cc
View file @ e152873d
......@@ -56,13 +56,10 @@
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/IO/reader/OFFReader.hh>
#include <OpenMesh/Core/IO/importer/BaseImporter.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/Utils/color_cast.hh>
// #include <OpenMesh/Core/IO/BinaryHelper.hh>
#include <OpenMesh/Core/IO/SR_store.hh>
//STL
#include <iostream>
#include <fstream>
......@@ -74,12 +71,10 @@
#elif defined(_STLPORT_VERSION) && (_STLPORT_VERSION==0x460)
# include <cctype>
#else
# include <cctype>
using std::isspace;
#endif
#ifndef WIN32
#include <string.h>
#endif
//=== NAMESPACES ==============================================================
......
src/OpenMesh/Core/IO/reader/PLYReader.cc
View file @ e152873d
......@@ -54,10 +54,8 @@
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/IO/reader/PLYReader.hh>
#include <OpenMesh/Core/IO/importer/BaseImporter.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/Utils/color_cast.hh>
#include <OpenMesh/Core/IO/SR_store.hh>
//STL
#include <fstream>
......@@ -65,7 +63,6 @@
#include <memory>
#ifndef WIN32
#include <string.h>
#endif
//=== NAMESPACES ==============================================================
......
src/OpenMesh/Core/IO/reader/STLReader.cc
View file @ e152873d
......@@ -57,12 +57,9 @@
#include <fstream>
// OpenMesh
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/IO/BinaryHelper.hh>
#include <OpenMesh/Core/IO/reader/STLReader.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/IO/importer/BaseImporter.hh>
//=== NAMESPACES ==============================================================
......
src/OpenMesh/Core/IO/writer/BaseWriter.cc
View file @ e152873d
......@@ -50,14 +50,11 @@
//=== INCLUDES ================================================================
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/IO/writer/BaseWriter.hh>
#include <algorithm>
#include <string>
#if defined(OM_CC_MIPS)
# include <ctype.h>
#else
# include <cctype>
#endif
......
src/OpenMesh/Core/IO/writer/OBJWriter.cc
View file @ e152873d
......@@ -55,11 +55,9 @@
#include <limits>
// OpenMesh
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/IO/BinaryHelper.hh>
#include <OpenMesh/Core/IO/writer/OBJWriter.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/Utils/color_cast.hh>
//=== NAMESPACES ==============================================================
......
src/OpenMesh/Core/IO/writer/OFFWriter.cc
View file @ e152873d
......@@ -57,8 +57,6 @@
#include <OpenMesh/Core/IO/BinaryHelper.hh>
#include <OpenMesh/Core/IO/writer/OFFWriter.hh>
#include <OpenMesh/Core/IO/SR_store.hh>
//=== NAMESPACES ==============================================================
......
src/OpenMesh/Core/IO/writer/OMWriter.cc
View file @ e152873d
......@@ -60,13 +60,10 @@
#endif
#include <fstream>
#include <ostream>
#include <vector>
// -------------------- OpenMesh
#include <OpenMesh/Core/IO/OMFormat.hh>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/Utils/Endian.hh>
#include <OpenMesh/Core/IO/exporter/BaseExporter.hh>
#include <OpenMesh/Core/IO/writer/OMWriter.hh>
......
src/OpenMesh/Core/IO/writer/PLYWriter.cc
View file @ e152873d
......@@ -50,15 +50,11 @@
//== INCLUDES =================================================================
#include <fstream>
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/Utils/Endian.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/IO/BinaryHelper.hh>
#include <OpenMesh/Core/IO/writer/PLYWriter.hh>
#include <OpenMesh/Core/Utils/GenProg.hh>
#include <OpenMesh/Core/IO/SR_store.hh>
#include <iostream>
......
src/OpenMesh/Core/IO/writer/STLWriter.cc
View file @ e152873d
......@@ -54,7 +54,6 @@
#include <fstream>
// OpenMesh
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/Geometry/VectorT.hh>
#include <OpenMesh/Core/IO/BinaryHelper.hh>
......
src/OpenMesh/Core/IO/writer/VTKWriter.cc
View file @ e152873d
......@@ -3,11 +3,9 @@
#include <fstream>
#include <limits>
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/IO/BinaryHelper.hh>
#include <OpenMesh/Core/IO/writer/VTKWriter.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/Utils/color_cast.hh>
//=== NAMESPACES ==============================================================
......
src/OpenMesh/Core/Mesh/TriConnectivity.cc
View file @ e152873d
......@@ -50,7 +50,6 @@
// CLASS TriMeshT - IMPLEMENTATION
#include <OpenMesh/Core/Mesh/TriConnectivity.hh>
#include <OpenMesh/Core/System/omstream.hh>
namespace OpenMesh
{
......
src/OpenMesh/Core/Utils/BaseProperty.cc
View file @ e152873d
......@@ -47,7 +47,6 @@
\*===========================================================================*/
#include <OpenMesh/Core/Utils/BaseProperty.hh>
#include <ostream>
namespace OpenMesh
{
......
src/OpenMesh/Core/Utils/RandomNumberGenerator.cc
View file @ e152873d
......@@ -59,7 +59,6 @@
#include <OpenMesh/Core/Utils/RandomNumberGenerator.hh>
#include <cstdlib>
//== NAMESPACES ===============================================================
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment