Remove all inheritance from std::binary_function since the STL contai…

…ners don't need this anymore
codereader · Nov 29, 2019 · 6469aa6 · 6469aa6
1 parent 9a85879
commit 6469aa6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/radiant/commandsystem/CaseInsensitiveCompare.h b/radiant/commandsystem/CaseInsensitiveCompare.h
@@ -9,8 +9,7 @@ namespace cmd {
 /**
  * Compare-functor to allow case-insensitive lookups of commands.
  */
-struct CaseInsensitiveCompare :
-	public std::binary_function<std::string, std::string, bool>
+struct CaseInsensitiveCompare
 {
 	bool operator()(const std::string &s1, const std::string &s2) const
 	{

diff --git a/radiant/entity/KeyObserverMap.h b/radiant/entity/KeyObserverMap.h
@@ -34,8 +34,7 @@ namespace entity
 /**
  * Comaparator to allow for case-insensitive search in std::multimap
  */
-struct CaseInsensitiveKeyCompare :
-	public std::binary_function<std::string, std::string, bool>
+struct CaseInsensitiveKeyCompare
 {
 	bool operator()(const std::string &s1, const std::string &s2) const
 	{

diff --git a/radiant/shaders/ShaderNameCompareFunctor.h b/radiant/shaders/ShaderNameCompareFunctor.h
@@ -7,8 +7,7 @@
 /**
  * allow case-insensitive binary searchs with shader definitions.
  */
-struct ShaderNameCompareFunctor :
-	public std::binary_function<std::string, std::string, bool>
+struct ShaderNameCompareFunctor
 {
 	bool operator()(const std::string& s1, const std::string& s2) const
 	{

diff --git a/radiant/ui/einspector/EntityInspector.h b/radiant/ui/einspector/EntityInspector.h
@@ -68,8 +68,7 @@ class EntityInspector :
 	};
 
 private:
-	struct StringCompareFunctorNoCase :
-		public std::binary_function<std::string, std::string, bool>
+	struct StringCompareFunctorNoCase
 	{
 		bool operator()(const std::string& s1, const std::string& s2) const
 		{

diff --git a/radiant/ui/mediabrowser/MediaBrowser.cpp b/radiant/ui/mediabrowser/MediaBrowser.cpp
@@ -121,8 +121,7 @@ inline wxDataViewItemAttr getItemFormat(bool isFavourite)
 }
 
 /* Callback functor for processing shader names */
-struct ShaderNameCompareFunctor :
-	public std::binary_function<std::string, std::string, bool>
+struct ShaderNameCompareFunctor
 {
 	bool operator()(const std::string& s1, const std::string& s2) const
 	{