diff --git a/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc b/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc index 67400df4..817df274 100644 --- a/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc +++ b/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc @@ -53,6 +53,7 @@ #endif #include +#include #include #include // -------------------- @@ -62,12 +63,11 @@ # include #endif // -------------------- -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include // -------------------- #include diff --git a/src/OpenMesh/Core/Geometry/VectorT.hh b/src/OpenMesh/Core/Geometry/VectorT.hh index 0b18b43d..45614868 100644 --- a/src/OpenMesh/Core/Geometry/VectorT.hh +++ b/src/OpenMesh/Core/Geometry/VectorT.hh @@ -69,7 +69,7 @@ #include -#include +#include #include #include #include diff --git a/src/OpenMesh/Core/IO/BinaryHelper.cc b/src/OpenMesh/Core/IO/BinaryHelper.cc index 2080d977..505c9234 100644 --- a/src/OpenMesh/Core/IO/BinaryHelper.cc +++ b/src/OpenMesh/Core/IO/BinaryHelper.cc @@ -60,6 +60,7 @@ #include // -------------------- STL #include +#include // -------------------- OpenMesh #include diff --git a/src/OpenMesh/Core/IO/BinaryHelper.hh b/src/OpenMesh/Core/IO/BinaryHelper.hh index f95c97d1..3e36e952 100644 --- a/src/OpenMesh/Core/IO/BinaryHelper.hh +++ b/src/OpenMesh/Core/IO/BinaryHelper.hh @@ -66,7 +66,7 @@ #else # include #endif -#include +#include // -------------------- OpenMesh diff --git a/src/OpenMesh/Core/IO/IOManager.cc b/src/OpenMesh/Core/IO/IOManager.cc index ae77e2bf..bc7b01b2 100644 --- a/src/OpenMesh/Core/IO/IOManager.cc +++ b/src/OpenMesh/Core/IO/IOManager.cc @@ -60,6 +60,8 @@ #include #include +#include + //== NAMESPACES =============================================================== diff --git a/src/OpenMesh/Core/IO/IOManager.hh b/src/OpenMesh/Core/IO/IOManager.hh index ccd5e0c8..58c157f4 100644 --- a/src/OpenMesh/Core/IO/IOManager.hh +++ b/src/OpenMesh/Core/IO/IOManager.hh @@ -60,7 +60,7 @@ // STL -#include +#include #include #include #include diff --git a/src/OpenMesh/Core/IO/reader/BaseReader.cc b/src/OpenMesh/Core/IO/reader/BaseReader.cc index b7f30f84..0f633215 100644 --- a/src/OpenMesh/Core/IO/reader/BaseReader.cc +++ b/src/OpenMesh/Core/IO/reader/BaseReader.cc @@ -53,7 +53,6 @@ #include #include #include -#include #if defined(OM_CC_MIPS) # include #else diff --git a/src/OpenMesh/Core/IO/reader/BaseReader.hh b/src/OpenMesh/Core/IO/reader/BaseReader.hh index 987ca8a8..d1eddfc9 100644 --- a/src/OpenMesh/Core/IO/reader/BaseReader.hh +++ b/src/OpenMesh/Core/IO/reader/BaseReader.hh @@ -62,10 +62,11 @@ // STD C++ -#include +#include #include #include #include +#include // OpenMesh #include diff --git a/src/OpenMesh/Core/IO/reader/OBJReader.cc b/src/OpenMesh/Core/IO/reader/OBJReader.cc index c6139222..47345a44 100644 --- a/src/OpenMesh/Core/IO/reader/OBJReader.cc +++ b/src/OpenMesh/Core/IO/reader/OBJReader.cc @@ -71,7 +71,9 @@ using std::isspace; #include #endif -#include +#include +#include +#include #include #include diff --git a/src/OpenMesh/Core/IO/reader/OBJReader.hh b/src/OpenMesh/Core/IO/reader/OBJReader.hh index 453d3b11..d1fb0f39 100644 --- a/src/OpenMesh/Core/IO/reader/OBJReader.hh +++ b/src/OpenMesh/Core/IO/reader/OBJReader.hh @@ -61,11 +61,9 @@ //=== INCLUDES ================================================================ -#include +#include #include -#include #include -#include #include #include diff --git a/src/OpenMesh/Core/IO/reader/OFFReader.cc b/src/OpenMesh/Core/IO/reader/OFFReader.cc index 36ac4c74..c7c47f5d 100644 --- a/src/OpenMesh/Core/IO/reader/OFFReader.cc +++ b/src/OpenMesh/Core/IO/reader/OFFReader.cc @@ -65,7 +65,6 @@ //STL #include -#include #include #include diff --git a/src/OpenMesh/Core/IO/reader/OFFReader.hh b/src/OpenMesh/Core/IO/reader/OFFReader.hh index 3069bab8..da069f4e 100644 --- a/src/OpenMesh/Core/IO/reader/OFFReader.hh +++ b/src/OpenMesh/Core/IO/reader/OFFReader.hh @@ -61,10 +61,9 @@ //=== INCLUDES ================================================================ -#include +#include #include -#include -#include +#include #include #include diff --git a/src/OpenMesh/Core/IO/reader/OMReader.cc b/src/OpenMesh/Core/IO/reader/OMReader.cc index 3b544ae4..031d85e8 100644 --- a/src/OpenMesh/Core/IO/reader/OMReader.cc +++ b/src/OpenMesh/Core/IO/reader/OMReader.cc @@ -51,6 +51,8 @@ //STL +#include +#include #include // OpenMesh diff --git a/src/OpenMesh/Core/IO/reader/OMReader.hh b/src/OpenMesh/Core/IO/reader/OMReader.hh index a2526738..4b1f67db 100644 --- a/src/OpenMesh/Core/IO/reader/OMReader.hh +++ b/src/OpenMesh/Core/IO/reader/OMReader.hh @@ -69,7 +69,7 @@ #include // STD C++ -#include +#include #include diff --git a/src/OpenMesh/Core/IO/reader/PLYReader.cc b/src/OpenMesh/Core/IO/reader/PLYReader.cc index ff89de33..da109694 100644 --- a/src/OpenMesh/Core/IO/reader/PLYReader.cc +++ b/src/OpenMesh/Core/IO/reader/PLYReader.cc @@ -61,6 +61,7 @@ //STL #include +#include #include #ifndef WIN32 diff --git a/src/OpenMesh/Core/IO/reader/PLYReader.hh b/src/OpenMesh/Core/IO/reader/PLYReader.hh index 7045b745..33e486f3 100644 --- a/src/OpenMesh/Core/IO/reader/PLYReader.hh +++ b/src/OpenMesh/Core/IO/reader/PLYReader.hh @@ -61,10 +61,10 @@ //=== INCLUDES ================================================================ -#include + +#include #include -#include -#include +#include #include #include diff --git a/src/OpenMesh/Core/IO/writer/BaseWriter.cc b/src/OpenMesh/Core/IO/writer/BaseWriter.cc index 9eebb102..e20b7d8c 100644 --- a/src/OpenMesh/Core/IO/writer/BaseWriter.cc +++ b/src/OpenMesh/Core/IO/writer/BaseWriter.cc @@ -54,7 +54,6 @@ #include #include #include -#include #if defined(OM_CC_MIPS) # include #else diff --git a/src/OpenMesh/Core/IO/writer/BaseWriter.hh b/src/OpenMesh/Core/IO/writer/BaseWriter.hh index 7980cc10..3e1688f0 100644 --- a/src/OpenMesh/Core/IO/writer/BaseWriter.hh +++ b/src/OpenMesh/Core/IO/writer/BaseWriter.hh @@ -62,7 +62,7 @@ // STD C++ -#include +#include #include // OpenMesh diff --git a/src/OpenMesh/Core/IO/writer/OMWriter.cc b/src/OpenMesh/Core/IO/writer/OMWriter.cc index 244e16d9..b6004f4e 100644 --- a/src/OpenMesh/Core/IO/writer/OMWriter.cc +++ b/src/OpenMesh/Core/IO/writer/OMWriter.cc @@ -60,6 +60,9 @@ #endif #include +#include +#include + // -------------------- OpenMesh #include #include diff --git a/src/OpenMesh/Core/IO/writer/OMWriter.hh b/src/OpenMesh/Core/IO/writer/OMWriter.hh index 373819f5..efc48a8c 100644 --- a/src/OpenMesh/Core/IO/writer/OMWriter.hh +++ b/src/OpenMesh/Core/IO/writer/OMWriter.hh @@ -62,7 +62,7 @@ // STD C++ -#include +#include #include // OpenMesh diff --git a/src/OpenMesh/Core/IO/writer/PLYWriter.cc b/src/OpenMesh/Core/IO/writer/PLYWriter.cc index 187349a5..599ffcc1 100644 --- a/src/OpenMesh/Core/IO/writer/PLYWriter.cc +++ b/src/OpenMesh/Core/IO/writer/PLYWriter.cc @@ -59,6 +59,8 @@ #include +#include + //=== NAMESPACES ============================================================== diff --git a/src/OpenMesh/Core/Mesh/BaseKernel.cc b/src/OpenMesh/Core/Mesh/BaseKernel.cc index f6c8c147..c0e174f3 100644 --- a/src/OpenMesh/Core/Mesh/BaseKernel.cc +++ b/src/OpenMesh/Core/Mesh/BaseKernel.cc @@ -47,9 +47,15 @@ \*===========================================================================*/ #include +#include + namespace OpenMesh { +void BaseKernel::property_stats() const +{ + property_stats(std::clog); +} void BaseKernel::property_stats(std::ostream& _ostr) const { const PropertyContainer::Properties& vps = vprops_.properties(); @@ -168,6 +174,10 @@ void BaseKernel::mprop_stats( std::string& _string ) const } +void BaseKernel::vprop_stats() const +{ + vprop_stats(std::clog); +} void BaseKernel::vprop_stats(std::ostream& _ostr ) const { PropertyContainer::Properties::const_iterator it; @@ -176,7 +186,10 @@ void BaseKernel::vprop_stats(std::ostream& _ostr ) const *it == NULL ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr); } - +void BaseKernel::hprop_stats() const +{ + hprop_stats(std::clog); +} void BaseKernel::hprop_stats(std::ostream& _ostr ) const { PropertyContainer::Properties::const_iterator it; @@ -185,6 +198,10 @@ void BaseKernel::hprop_stats(std::ostream& _ostr ) const *it == NULL ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr); } +void BaseKernel::eprop_stats() const +{ + eprop_stats(std::clog); +} void BaseKernel::eprop_stats(std::ostream& _ostr ) const { PropertyContainer::Properties::const_iterator it; @@ -193,6 +210,10 @@ void BaseKernel::eprop_stats(std::ostream& _ostr ) const *it == NULL ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr); } +void BaseKernel::fprop_stats() const +{ + fprop_stats(std::clog); +} void BaseKernel::fprop_stats(std::ostream& _ostr ) const { PropertyContainer::Properties::const_iterator it; @@ -201,6 +222,10 @@ void BaseKernel::fprop_stats(std::ostream& _ostr ) const *it == NULL ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr); } +void BaseKernel::mprop_stats() const +{ + mprop_stats(std::clog); +} void BaseKernel::mprop_stats(std::ostream& _ostr ) const { PropertyContainer::Properties::const_iterator it; diff --git a/src/OpenMesh/Core/Mesh/BaseKernel.hh b/src/OpenMesh/Core/Mesh/BaseKernel.hh index df9545e5..9c6d95af 100644 --- a/src/OpenMesh/Core/Mesh/BaseKernel.hh +++ b/src/OpenMesh/Core/Mesh/BaseKernel.hh @@ -66,6 +66,7 @@ #include #include #include +#include // -------------------- #include @@ -688,7 +689,9 @@ protected: //------------------------------------------- synchronize properties public: - void property_stats(std::ostream& _ostr = std::clog) const; + // uses std::clog as output stream + void property_stats() const; + void property_stats(std::ostream& _ostr) const; void vprop_stats( std::string& _string ) const; void hprop_stats( std::string& _string ) const; @@ -696,11 +699,18 @@ public: void fprop_stats( std::string& _string ) const; void mprop_stats( std::string& _string ) const; - void vprop_stats(std::ostream& _ostr = std::clog) const; - void hprop_stats(std::ostream& _ostr = std::clog) const; - void eprop_stats(std::ostream& _ostr = std::clog) const; - void fprop_stats(std::ostream& _ostr = std::clog) const; - void mprop_stats(std::ostream& _ostr = std::clog) const; + // uses std::clog as output stream + void vprop_stats() const; + void hprop_stats() const; + void eprop_stats() const; + void fprop_stats() const; + void mprop_stats() const; + + void vprop_stats(std::ostream& _ostr) const; + void hprop_stats(std::ostream& _ostr) const; + void eprop_stats(std::ostream& _ostr) const; + void fprop_stats(std::ostream& _ostr) const; + void mprop_stats(std::ostream& _ostr) const; public: diff --git a/src/OpenMesh/Core/Mesh/Handles.hh b/src/OpenMesh/Core/Mesh/Handles.hh index 3e832d7a..24eb3264 100644 --- a/src/OpenMesh/Core/Mesh/Handles.hh +++ b/src/OpenMesh/Core/Mesh/Handles.hh @@ -53,7 +53,7 @@ //== INCLUDES ================================================================= #include -#include +#include //== NAMESPACES =============================================================== diff --git a/src/OpenMesh/Core/System/mostream.hh b/src/OpenMesh/Core/System/mostream.hh index b58c2da0..a0367251 100644 --- a/src/OpenMesh/Core/System/mostream.hh +++ b/src/OpenMesh/Core/System/mostream.hh @@ -59,7 +59,7 @@ //== INCLUDES ================================================================= #include -#include +#include #if defined( OM_CC_GCC ) && OM_CC_VERSION < 30000 # include #else diff --git a/src/OpenMesh/Core/System/omstream.cc b/src/OpenMesh/Core/System/omstream.cc index 8140fa8b..79554c15 100644 --- a/src/OpenMesh/Core/System/omstream.cc +++ b/src/OpenMesh/Core/System/omstream.cc @@ -56,6 +56,7 @@ //== INCLUDES ================================================================= #include +#include //== IMPLEMENTATION ========================================================== diff --git a/src/OpenMesh/Core/Utils/BaseProperty.cc b/src/OpenMesh/Core/Utils/BaseProperty.cc index 7baaca9c..3e9b3cba 100644 --- a/src/OpenMesh/Core/Utils/BaseProperty.cc +++ b/src/OpenMesh/Core/Utils/BaseProperty.cc @@ -47,7 +47,7 @@ \*===========================================================================*/ #include -#include +#include namespace OpenMesh { diff --git a/src/OpenMesh/Core/Utils/Endian.cc b/src/OpenMesh/Core/Utils/Endian.cc index c8e122ff..c4fb3146 100644 --- a/src/OpenMesh/Core/Utils/Endian.cc +++ b/src/OpenMesh/Core/Utils/Endian.cc @@ -57,8 +57,6 @@ //== INCLUDES ================================================================= -#include -#include #include diff --git a/src/OpenMesh/Core/Utils/Endian.hh b/src/OpenMesh/Core/Utils/Endian.hh index 1fd61a23..e511c00a 100644 --- a/src/OpenMesh/Core/Utils/Endian.hh +++ b/src/OpenMesh/Core/Utils/Endian.hh @@ -62,7 +62,6 @@ #include -#include //== NAMESPACES =============================================================== diff --git a/src/OpenMesh/Core/Utils/Property.hh b/src/OpenMesh/Core/Utils/Property.hh index 68a6bbec..ab26d9d3 100644 --- a/src/OpenMesh/Core/Utils/Property.hh +++ b/src/OpenMesh/Core/Utils/Property.hh @@ -299,8 +299,6 @@ public: ++bytes; } - std::cout << std::endl; - assert( bytes == size_of() ); return bytes; @@ -339,8 +337,6 @@ public: ++bytes; } - std::cout << std::endl; - return bytes; } diff --git a/src/OpenMesh/Core/Utils/SingletonT.hh b/src/OpenMesh/Core/Utils/SingletonT.hh index c8617f4c..b0745c40 100644 --- a/src/OpenMesh/Core/Utils/SingletonT.hh +++ b/src/OpenMesh/Core/Utils/SingletonT.hh @@ -65,7 +65,6 @@ // STL #include -#include //== NAMESPACES =============================================================== diff --git a/src/OpenMesh/Core/Utils/vector_cast.hh b/src/OpenMesh/Core/Utils/vector_cast.hh index a93590e6..10b25dd3 100644 --- a/src/OpenMesh/Core/Utils/vector_cast.hh +++ b/src/OpenMesh/Core/Utils/vector_cast.hh @@ -64,8 +64,6 @@ #include #include #include -#include -#include #include diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.cc b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.cc index 85cd87eb..049f5680 100644 --- a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.cc +++ b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.cc @@ -63,6 +63,7 @@ #include #include +#include #include #include @@ -135,7 +136,7 @@ initialize( void ) if (n_subdiv_rules_ != 1) { - std::cerr << "Error! More than one subdivision rules not allowed!\n"; + ::omerr() << "Error! More than one subdivision rules not allowed!\n"; return false; } diff --git a/src/OpenMesh/Tools/Utils/MeshCheckerT.hh b/src/OpenMesh/Tools/Utils/MeshCheckerT.hh index 0b00084f..9db382d2 100644 --- a/src/OpenMesh/Tools/Utils/MeshCheckerT.hh +++ b/src/OpenMesh/Tools/Utils/MeshCheckerT.hh @@ -58,7 +58,7 @@ #include #include #include -#include +#include //== NAMESPACES =============================================================== diff --git a/src/OpenMesh/Tools/Utils/Timer.hh b/src/OpenMesh/Tools/Utils/Timer.hh index 4c6898cb..15c736a6 100644 --- a/src/OpenMesh/Tools/Utils/Timer.hh +++ b/src/OpenMesh/Tools/Utils/Timer.hh @@ -59,7 +59,7 @@ #include // -#include +#include #include #if defined(OM_CC_MIPS) # include diff --git a/src/OpenMesh/Tools/VDPM/ViewingParameters.cc b/src/OpenMesh/Tools/VDPM/ViewingParameters.cc index f7d1f7b3..d6a4a11e 100644 --- a/src/OpenMesh/Tools/VDPM/ViewingParameters.cc +++ b/src/OpenMesh/Tools/VDPM/ViewingParameters.cc @@ -56,6 +56,7 @@ //== INCLUDES ================================================================= #include +#include //== NAMESPACES ===============================================================