diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-09-07 02:22:39 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-09-07 02:22:39 +0100 |
| commit | 0c023b50b1c5c16320919d62b078bf34974ff008 (patch) | |
| tree | 78aa91786be8d1f3dce6c5d0cc74b32235a775e4 | |
| parent | Add missing virtual destructors (diff) | |
| download | slicer-0c023b50b1c5c16320919d62b078bf34974ff008.tar.bz2 slicer-0c023b50b1c5c16320919d62b078bf34974ff008.tar.xz slicer-0c023b50b1c5c16320919d62b078bf34974ff008.zip | |
Rename internal GetTypeId to getTypeId to avoid overloaded-virtual
| -rw-r--r-- | Jamroot.jam | 1 | ||||
| -rw-r--r-- | slicer/slicer/modelPartsTypes.cpp | 2 | ||||
| -rw-r--r-- | slicer/slicer/modelPartsTypes.h | 2 | ||||
| -rw-r--r-- | slicer/slicer/modelPartsTypes.impl.h | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/Jamroot.jam b/Jamroot.jam index 5403aed..0e0b273 100644 --- a/Jamroot.jam +++ b/Jamroot.jam @@ -18,6 +18,7 @@ project <variant>debug:<warnings>extra <variant>debug:<warnings-as-errors>on <variant>debug:<cflags>-Wnon-virtual-dtor + <variant>debug:<cflags>-Woverloaded-virtual <variant>coverage:<coverage>on <toolset>tidy:<checkxx>boost-* <toolset>tidy:<checkxx>bugprone-* diff --git a/slicer/slicer/modelPartsTypes.cpp b/slicer/slicer/modelPartsTypes.cpp index f674bd0..13c5507 100644 --- a/slicer/slicer/modelPartsTypes.cpp +++ b/slicer/slicer/modelPartsTypes.cpp @@ -239,7 +239,7 @@ namespace Slicer { return ref->second(m); } TypeId - ModelPartForComplexBase::GetTypeId(const std::string & id, const std::string & className) + ModelPartForComplexBase::getTypeId(const std::string & id, const std::string & className) { return (id == className) ? TypeId() : ToExchangeTypeName(id); } diff --git a/slicer/slicer/modelPartsTypes.h b/slicer/slicer/modelPartsTypes.h index 2bbc9c9..9997144 100644 --- a/slicer/slicer/modelPartsTypes.h +++ b/slicer/slicer/modelPartsTypes.h @@ -134,7 +134,7 @@ namespace Slicer { static void registerClass(const std::string & className, const std::string * typeName, const ClassRef &); static void unregisterClass(const std::string & className, const std::string * typeName); - static TypeId GetTypeId(const std::string & id, const std::string & className); + static TypeId getTypeId(const std::string & id, const std::string & className); static std::string demangle(const char * mangled); static const std::string & ToExchangeTypeName(const std::string &); diff --git a/slicer/slicer/modelPartsTypes.impl.h b/slicer/slicer/modelPartsTypes.impl.h index 4d5f991..706f050 100644 --- a/slicer/slicer/modelPartsTypes.impl.h +++ b/slicer/slicer/modelPartsTypes.impl.h @@ -490,7 +490,7 @@ namespace Slicer { { BOOST_ASSERT(this->Model); BOOST_ASSERT(className); - return ModelPartForComplexBase::GetTypeId( + return ModelPartForComplexBase::getTypeId( [this]() { if constexpr (std::is_base_of_v<Ice::Object, T>) { return (*this->Model)->ice_id(); |