Création d'un compte pour un collaborateur extérieur au laboratoire depuis l'intranet ICube : https://intranet.icube.unistra.fr/fr/labs/member/profile

Commit 0ff930b2 authored by Pierre Kraemer's avatar Pierre Kraemer
Browse files

Merge cgogn:CGoGN

parents 72193ff6 adbf345d
...@@ -46,7 +46,7 @@ protected: ...@@ -46,7 +46,7 @@ protected:
public: public:
Map2MR_PrimalAdapt() ; Map2MR_PrimalAdapt() ;
std::string mapTypeName() { return "Map2MR_PrimalAdapt" ; } virtual std::string mapTypeName() const { return "Map2MR_PrimalAdapt" ; }
/*************************************************** /***************************************************
* CELLS INFORMATION * * CELLS INFORMATION *
......
...@@ -45,7 +45,7 @@ protected: ...@@ -45,7 +45,7 @@ protected:
public: public:
Map2MR_PrimalRegular() ; Map2MR_PrimalRegular() ;
std::string mapTypeName() { return "Map2MR_PrimalRegular" ; } virtual std::string mapTypeName() const { return "Map2MR_PrimalRegular" ; }
void addNewLevel(bool embedNewVertices = true) ; void addNewLevel(bool embedNewVertices = true) ;
......
...@@ -55,7 +55,7 @@ protected: ...@@ -55,7 +55,7 @@ protected:
public: public:
Map3MR_PrimalAdapt(); Map3MR_PrimalAdapt();
std::string mapTypeName() { return "Map3MR_PrimalAdapt"; } virtual std::string mapTypeName() const { return "Map3MR_PrimalAdapt"; }
/*! @name Topological helping functions /*! @name Topological helping functions
* *
......
...@@ -49,7 +49,7 @@ protected: ...@@ -49,7 +49,7 @@ protected:
public: public:
Map3MR_PrimalRegular(); Map3MR_PrimalRegular();
std::string mapTypeName() { return "Map3MR_PrimalRegular"; } virtual std::string mapTypeName() const { return "Map3MR_PrimalRegular"; }
/*! @name Topological helping functions /*! @name Topological helping functions
* *
......
...@@ -188,7 +188,7 @@ Out& Out::operator<< (const T& val) ...@@ -188,7 +188,7 @@ Out& Out::operator<< (const T& val)
if (m_out_mode & STDERR) if (m_out_mode & STDERR)
std::cerr << val; std::cerr << val;
if (m_out_mode && (FILEOUT|QTSTATUSBAR|QTCONSOLE|SSBUFFER)) if (m_out_mode & (FILEOUT|QTSTATUSBAR|QTCONSOLE|SSBUFFER))
m_buffer << val; m_buffer << val;
return *this; return *this;
......
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