Avoid extra tVideoResolution::tVideoResolutionCompare subclass

Author: jengelh

Descent3/config.cpp

@@ -353,7 +353,7 @@ void ConfigureDisplayResolutions() {
     return;
   }
 
-  std::set<tVideoResolution, tVideoResolution::tVideoResolutionCompare> resolutions;
+  std::set<tVideoResolution> resolutions;
   for (int d = 0; d < display_count; d++) {
     SDL_DisplayID display_id = displays[d];
 

Descent3/config.h

@@ -149,17 +149,10 @@ struct tVideoResolution
     return other.width == this->width && other.height == this->height;
   }
 
-  struct tVideoResolutionCompare
+  bool operator<(const tVideoResolution& other) const
   {
-    bool operator()(const tVideoResolution &lres, const tVideoResolution &rres) const
-    {
-      if (lres.width != rres.width)
-      {
-        return lres.width < rres.width;
-      }
-      return lres.height < rres.height;
-    }
-  };
+    return width != other.width ? width < other.width : height < other.height;
+  }
 };
 
 extern std::vector<tVideoResolution> Video_res_list;