Simplify test case mods

apache · Jul 15, 2024 · a037e4c · a037e4c
1 parent 745a267
commit a037e4c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/src/test/cpp/customlogger/xlogger.cpp b/src/test/cpp/customlogger/xlogger.cpp
@@ -104,14 +104,14 @@ XFactory::XFactory()
 {
 }
 
-LoggerPtr XFactory::makeNewLoggerInstance(const LogString& name) const
+#if LOG4CXX_ABI_VERSION <= 15
+LoggerPtr XFactory::makeNewLoggerInstance(helpers::Pool&, const LogString& name) const
 {
 	return LoggerPtr(new XLogger(name));
 }
-
-#if LOG4CXX_ABI_VERSION <= 15
-LoggerPtr XFactory::makeNewLoggerInstance(
-	helpers::Pool& pool,
-	const LogString& name) const
-{ return makeNewLoggerInstance(name); }
 #endif
+
+LoggerPtr XFactory::makeNewLoggerInstance(const LogString& name) const
+{
+	return LoggerPtr(new XLogger(name));
+}
diff --git a/src/test/cpp/customlogger/xlogger.h b/src/test/cpp/customlogger/xlogger.h
@@ -44,16 +44,14 @@ class XFactory :
 
 		XFactory();
 
-#if LOG4CXX_ABI_VERSION <= 15
-		LoggerPtr makeNewLoggerInstance(const LogString& name) const;
-#else
-		LoggerPtr makeNewLoggerInstance(const LogString& name) const override;
-#endif
-
 #if LOG4CXX_ABI_VERSION <= 15
 		LoggerPtr makeNewLoggerInstance(
 			helpers::Pool& pool,
 			const LogString& name) const override;
+
+		LoggerPtr makeNewLoggerInstance(const LogString& name) const;
+#else
+		LoggerPtr makeNewLoggerInstance(const LogString& name) const override;
 #endif
 };