Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- move iostream from header to source files.

Browse Source 
- replace some iostreams to o/istreams only
- some minor include fixes

closes #2489

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1278 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Matthias Möller
2015-06-09 08:58:41 +00:00
parent 23fb3781d4
commit ed3155284c
36 changed files with 85 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/OpenMesh/Core/Mesh/BaseKernel.cc
View File

@@ -47,9 +47,15 @@
\*===========================================================================*/
#include <OpenMesh/Core/Mesh/BaseKernel.hh>
#include <iostream>
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;

22
src/OpenMesh/Core/Mesh/BaseKernel.hh
View File

@@ -66,6 +66,7 @@
#include <vector>
#include <string>
#include <algorithm>
#include <iosfwd>
// --------------------
#include <OpenMesh/Core/Utils/PropertyContainer.hh>
@@ -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:

2
src/OpenMesh/Core/Mesh/Handles.hh
View File

@@ -53,7 +53,7 @@
//== INCLUDES =================================================================
#include <OpenMesh/Core/System/config.h>
#include <iostream>
#include <ostream>
//== NAMESPACES ===============================================================