From 0c023b50b1c5c16320919d62b078bf34974ff008 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 7 Sep 2021 02:22:39 +0100
Subject: Rename internal GetTypeId to getTypeId to avoid overloaded-virtual

---
 Jamroot.jam                          | 1 +
 slicer/slicer/modelPartsTypes.cpp    | 2 +-
 slicer/slicer/modelPartsTypes.h      | 2 +-
 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();
-- 
cgit v1.2.3