Commit aa6e1ece authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'master' into Remove_cpp98

parents bd4b1e6f aa088250
Pipeline #4233 passed with stage
in 98 minutes and 22 seconds
...@@ -38,9 +38,11 @@ echo "CPPCHECK Summary" ...@@ -38,9 +38,11 @@ echo "CPPCHECK Summary"
echo "==============================================================================" echo "=============================================================================="
echo -e "${NC}" echo -e "${NC}"
if [ $COUNT -gt 0 ]; then MAX_COUNT=8
if [ $COUNT -gt $MAX_COUNT ]; then
echo -e ${WARNING} echo -e ${WARNING}
echo "Total CPPCHECK error Count is $COUNT, which is too High! CPPCHECK Run failed"; echo "Total CPPCHECK error Count is $COUNT, which is too High (max is $MAX_COUNT)! CPPCHECK Run failed";
echo -e "${NC}" echo -e "${NC}"
exit 1; exit 1;
else else
......
...@@ -42,6 +42,7 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES) ...@@ -42,6 +42,7 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
else(GTEST_PREFIX) else(GTEST_PREFIX)
find_path(_GTEST_INCLUDE_DIR "gtest/gtest.h" find_path(_GTEST_INCLUDE_DIR "gtest/gtest.h"
PATHS PATHS
~/sw/gtest-1.8.0/include
~/sw/gtest-1.7.0/include ~/sw/gtest-1.7.0/include
~/sw/gtest/include ~/sw/gtest/include
/ACG/acgdev/gcc-4.7-x86_64/gtest/include /ACG/acgdev/gcc-4.7-x86_64/gtest/include
...@@ -52,6 +53,7 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES) ...@@ -52,6 +53,7 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
NO_DEFAULT_PATH ) NO_DEFAULT_PATH )
find_library(_GTEST_LIBRARY gtest find_library(_GTEST_LIBRARY gtest
PATHS PATHS
~/sw/gtest-1.8.0/lib
~/sw/gtest-1.7.0/lib ~/sw/gtest-1.7.0/lib
~/sw/gtest/lib ~/sw/gtest/lib
/ACG/acgdev/gcc-4.7-x86_64/gtest/lib /ACG/acgdev/gcc-4.7-x86_64/gtest/lib
...@@ -62,6 +64,7 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES) ...@@ -62,6 +64,7 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
NO_DEFAULT_PATH ) NO_DEFAULT_PATH )
find_library(_GTEST_MAIN_LIBRARY gtest_main find_library(_GTEST_MAIN_LIBRARY gtest_main
PATHS PATHS
~/sw/gtest-1.8.0/lib
~/sw/gtest-1.7.0/lib ~/sw/gtest-1.7.0/lib
~/sw/gtest/lib ~/sw/gtest/lib
/ACG/acgdev/gcc-4.7-x86_64/gtest/lib /ACG/acgdev/gcc-4.7-x86_64/gtest/lib
......
...@@ -85,7 +85,7 @@ class SoOpenMeshNodeT : public SoShape ...@@ -85,7 +85,7 @@ class SoOpenMeshNodeT : public SoShape
public: public:
static void initClass(); static void initClass();
SoOpenMeshNodeT(const Mesh* _mesh=0); explicit SoOpenMeshNodeT(const Mesh* _mesh=0);
void setMesh(const Mesh* mesh) { d_mesh = mesh; } void setMesh(const Mesh* mesh) { d_mesh = mesh; }
......
...@@ -96,7 +96,7 @@ template <class T> ...@@ -96,7 +96,7 @@ template <class T>
class multiplex_target : public basic_multiplex_target class multiplex_target : public basic_multiplex_target
{ {
public: public:
multiplex_target(T& _t) : target_(_t) {} explicit multiplex_target(T& _t) : target_(_t) {}
virtual void operator<<(const std::string& _s) { target_ << _s; } virtual void operator<<(const std::string& _s) { target_ << _s; }
private: private:
T& target_; T& target_;
......
...@@ -90,7 +90,7 @@ public: ...@@ -90,7 +90,7 @@ public:
* *
* @param _resolution specifies the desired resolution for the random number generated * @param _resolution specifies the desired resolution for the random number generated
*/ */
RandomNumberGenerator(const size_t _resolution); explicit RandomNumberGenerator(const size_t _resolution);
/// returns a random double between 0.0 and 1.0 with a guaranteed resolution /// returns a random double between 0.0 and 1.0 with a guaranteed resolution
double getRand() const; double getRand() const;
......
...@@ -87,7 +87,7 @@ public: ...@@ -87,7 +87,7 @@ public:
* *
* @param _notificationInterval Interval of decimation steps between notifications. * @param _notificationInterval Interval of decimation steps between notifications.
*/ */
Observer(size_t _notificationInterval); explicit Observer(size_t _notificationInterval);
/// Destructor /// Destructor
virtual ~Observer(); virtual ~Observer();
......
...@@ -115,7 +115,7 @@ public: ...@@ -115,7 +115,7 @@ public:
CatmullClarkT( ) : parent_t() { } CatmullClarkT( ) : parent_t() { }
/// Constructor /// Constructor
CatmullClarkT(MeshType &_m) : parent_t(_m) { } explicit CatmullClarkT(MeshType &_m) : parent_t(_m) { }
virtual ~CatmullClarkT() {} virtual ~CatmullClarkT() {}
......
...@@ -102,7 +102,7 @@ public: ...@@ -102,7 +102,7 @@ public:
public: public:
CompositeT(void) : parent_t(), p_mesh_(NULL) {} CompositeT(void) : parent_t(), p_mesh_(NULL) {}
CompositeT(MeshType& _mesh) : parent_t(_mesh), p_mesh_(NULL) {}; explicit CompositeT(MeshType& _mesh) : parent_t(_mesh), p_mesh_(NULL) {};
virtual ~CompositeT() { } virtual ~CompositeT() { }
public: // inherited interface public: // inherited interface
......
...@@ -107,7 +107,7 @@ public: ...@@ -107,7 +107,7 @@ public:
/// Constructor to be used with interface 1 (calls attach()) /// Constructor to be used with interface 1 (calls attach())
/// \see operator()( MeshType&, size_t ) /// \see operator()( MeshType&, size_t )
SubdividerT( MeshType &_m ) : attached_(NULL) { attach(_m); } explicit SubdividerT( MeshType &_m ) : attached_(NULL) { attach(_m); }
//@} //@}
......
...@@ -74,7 +74,7 @@ using namespace std; ...@@ -74,7 +74,7 @@ using namespace std;
class GnuplotException : public runtime_error class GnuplotException : public runtime_error
{ {
public: public:
GnuplotException(const string &msg) : runtime_error(msg){} explicit GnuplotException(const string &msg) : runtime_error(msg){}
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
...@@ -113,7 +113,7 @@ public: ...@@ -113,7 +113,7 @@ public:
Gnuplot(); Gnuplot();
/// Set a style during construction. /// Set a style during construction.
Gnuplot(const string & _style); explicit Gnuplot(const string & _style);
/// Constructor calling plot_xy(). /// Constructor calling plot_xy().
Gnuplot(const string & _title, Gnuplot(const string & _title,
......
...@@ -80,7 +80,7 @@ class MeshCheckerT ...@@ -80,7 +80,7 @@ class MeshCheckerT
public: public:
/// constructor /// constructor
MeshCheckerT(const Mesh& _mesh) : mesh_(_mesh) {} explicit MeshCheckerT(const Mesh& _mesh) : mesh_(_mesh) {}
/// destructor /// destructor
~MeshCheckerT() {} ~MeshCheckerT() {}
......
...@@ -89,7 +89,7 @@ public: ...@@ -89,7 +89,7 @@ public:
VHierarchyNodeIndex() VHierarchyNodeIndex()
{ value_ = 0; } { value_ = 0; }
VHierarchyNodeIndex(unsigned int _value) explicit VHierarchyNodeIndex(unsigned int _value)
{ value_ = _value; } { value_ = _value; }
VHierarchyNodeIndex(const VHierarchyNodeIndex &_other) VHierarchyNodeIndex(const VHierarchyNodeIndex &_other)
......
...@@ -66,8 +66,8 @@ IF(OPENMESH_BUILD_PYTHON_BINDINGS) ...@@ -66,8 +66,8 @@ IF(OPENMESH_BUILD_PYTHON_BINDINGS)
IF(COMPILE_WORKS) IF(COMPILE_WORKS)
# Look for the python interpreter to check if the example works # Look for the python interpreter to check if the example works
# strip version string of any characters (e.g. # '+') than 0-9 and . # strip version string of any characters (e.g. rc1 # '+') than 0-9 and .
STRING(REGEX REPLACE "[^ 0-9 | \\.]" "" PYTHONLIBS_VERSION_STRING_STRIPPED ${PYTHONLIBS_VERSION_STRING}) STRING(REGEX REPLACE "(rc[0-9]+)|[^ 0-9 | \\.]" "" PYTHONLIBS_VERSION_STRING_STRIPPED ${PYTHONLIBS_VERSION_STRING})
FIND_PACKAGE(PythonInterp ${PYTHONLIBS_VERSION_STRING_STRIPPED} QUIET) FIND_PACKAGE(PythonInterp ${PYTHONLIBS_VERSION_STRING_STRIPPED} QUIET)
IF(PYTHONINTERP_FOUND) IF(PYTHONINTERP_FOUND)
......
Markdown is supported
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