Fix tools build under C++17

ryzom · Feb 24, 2023 · 1602eda · 1602eda
1 parent 2d69e41
commit 1602eda
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings.cpp b/nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings.cpp
@@ -29,7 +29,6 @@
 #include "extract_warnings.h"
 #include <stdio.h>
 #include <string>
-using namespace std;
 
 #include "nel/misc/mem_displayer.h"
 #include "nel/misc/app_context.h"
@@ -39,6 +38,7 @@ using namespace std;
 
 #include <windows.h>
 
+using namespace std;
 
 BOOL APIENTRY DllMain( HANDLE hModule, 
                        DWORD  ul_reason_for_call, 

diff --git a/ryzom/tools/assoc_mem/tree.h b/ryzom/tools/assoc_mem/tree.h
@@ -17,6 +17,8 @@
 #ifndef NL_TREE_H_
 #define NL_TREE_H_
 
+#include "nel/misc/types_nl.h"
+
 #include <vector>
 #include <map>
 #include "record.h"
@@ -33,7 +35,11 @@ class CTree
 
 	public:
 
-		struct greater : public std::binary_function<std::pair<double,int> , std::pair<double,int> , bool> {
+		struct greater 
+#ifndef NL_CPP17
+			: public std::binary_function<std::pair<double,int> , std::pair<double,int> , bool> 
+#endif
+		{
 			bool operator()(std::pair<double,int> x, std::pair<double,int> y) const
 			{
 				return x.first > y.first;

diff --git a/ryzom/tools/leveldesign/alias_synchronizer/alias_synchronizer.cpp b/ryzom/tools/leveldesign/alias_synchronizer/alias_synchronizer.cpp
@@ -33,7 +33,10 @@ vector<string>	Filters;
 
 
 // always true predicate
-struct TAllPrimitivePredicate : public std::unary_function<IPrimitive*, bool>
+struct TAllPrimitivePredicate 
+#ifndef NL_CPP17
+	: public std::unary_function<IPrimitive*, bool>
+#endif
 {
 	bool operator () (IPrimitive *prim)
 	{

diff --git a/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp b/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp
@@ -1156,7 +1156,10 @@ bool strtokquote(const vector<string> &src, VectorType &tokens)
 	return true;
 }
 
-struct TFindParamPred : std::unary_function<CPhrase::TParamInfo, bool>
+struct TFindParamPred
+#ifndef NL_CPP17
+	: std::unary_function<CPhrase::TParamInfo, bool>
+#endif
 {
 	string	Name;
 	TFindParamPred(const std::string &name)

diff --git a/ryzom/tools/translation_tools/main.cpp b/ryzom/tools/translation_tools/main.cpp
@@ -822,7 +822,10 @@ int mergeStringDiff(int argc, char *argv[], const std::string &baseName)
 
 
 /*
-struct TFindPhrase : unary_function<TPhrase, bool>
+struct TFindPhrase 
+#ifndef NL_CPP17
+		: unary_function<TPhrase, bool>
+		#endif
 {
 	string	Identifier;
 	TFindPhrase (const string &identifier)