cpp/openttd-patchpack/source Changeset - r10985:c2507f106432

Changeset - r10985:c2507f106432

Parent rev.

Child rev.

[Not reviewed]

master

0 9 1

smatz - 15 years ago 2009-02-03 18:08:07
smatz@openttd.org

(svn r15324) -Codechange: unify the class used for comparing of strings for std::map

10 files changed with 34 insertions and 28 deletions:

projects/openttd_vs80.vcproj

projects/openttd_vs90.vcproj

source.list

src/ai/ai.hpp

src/ai/ai_config.hpp

src/ai/ai_scanner.hpp

src/ai/api/ai_controller.hpp

src/blitter/factory.hpp

src/core/string_compare_type.hpp

src/driver.h

0 comments (0 inline, 0 general)

projects/openttd_vs80.vcproj

➞

Show inline comments

@@ @@ -1699,6 +1699,10 @@ @@
 				RelativePath=".\..\src\core\sort_func.hpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\core\string_compare_type.hpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="GUI Source Code"

projects/openttd_vs90.vcproj

➞

Show inline comments

@@ @@ -1696,6 +1696,10 @@ @@
 				RelativePath=".\..\src\core\sort_func.hpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\core\string_compare_type.hpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="GUI Source Code"

source.list

➞

Show inline comments

@@ @@ -370,6 +370,7 @@ core/random_func.hpp @@
 core/smallmap_type.hpp
 core/smallvec_type.hpp
 core/sort_func.hpp
 core/string_compare_type.hpp
 # GUI Source Code
 aircraft_gui.cpp

src/ai/ai.hpp

➞

Show inline comments

@@ @@ -7,11 +7,9 @@ @@
 #include "api/ai_event_types.hpp"
 #include "../date_type.h"
 #include "../core/string_compare_type.hpp"
 #ifndef AI_CONFIG_HPP
 struct ltstr { bool operator()(const char *s1, const char *s2) const { return strcmp(s1, s2) < 0; } };
 #endif /* AI_CONFIG_HPP */
 typedef std::map<const char *, class AIInfo *, ltstr> AIInfoList;
 typedef std::map<const char *, class AIInfo *, StringCompare> AIInfoList;
 void CcAI(bool success, TileIndex tile, uint32 p1, uint32 p2);

src/ai/ai_config.hpp

➞

Show inline comments

@@ @@ -7,14 +7,11 @@ @@
 #include <map>
 #include "ai_info.hpp"
 #ifndef AI_HPP
 struct ltstr { bool operator()(const char *s1, const char *s2) const { return strcmp(s1, s2) < 0; } };
 #endif /* AI_HPP */
 #include "../core/string_compare_type.hpp"
 class AIConfig {
 private:
-	typedef std::map<const char *, int, ltstr> SettingValueList;
+	typedef std::map<const char *, int, StringCompare> SettingValueList;
 public:
 	AIConfig() :

src/ai/ai_scanner.hpp

➞

Show inline comments

@@ @@ -5,6 +5,7 @@ @@
 #ifndef AI_SCANNER_HPP
 #define AI_SCANNER_HPP
 #include "../core/string_compare_type.hpp"
 #include <map>
 class AIScanner {
@@ @@ -73,7 +74,7 @@ public: @@
   bool HasAI(const struct ContentInfo *ci, bool md5sum);
 #endif
 private:
-	typedef std::map<const char *, class AILibrary *, ltstr> AILibraryList;
+	typedef std::map<const char *, class AILibrary *, StringCompare> AILibraryList;
 	/**
 	 * Scan the AI dir for scripts.

src/ai/api/ai_controller.hpp

➞

Show inline comments

@@ @@ -5,10 +5,8 @@ @@
 #ifndef AI_CONTROLLER_HPP
 #define AI_CONTROLLER_HPP
 #include "../../core/string_compare_type.hpp"
 #include <map>
 #ifndef AI_HPP
 struct ltstr { bool operator()(const char *s1, const char *s2) const { return strcmp(s1, s2) < 0; } };
 #endif /* AI_HPP */
 /**
  * The Controller, the class each AI should extend. It creates the AI, makes
@@ @@ -85,7 +83,7 @@ public: @@
 	static void Print(bool error_msg, const char *message);
 private:
-	typedef std::map<const char *, const char *, ltstr> LoadedLibraryList;
+	typedef std::map<const char *, const char *, StringCompare> LoadedLibraryList;
 	uint ticks;
 	LoadedLibraryList loaded_library;

src/blitter/factory.hpp

➞

Show inline comments

@@ @@ -8,6 +8,7 @@ @@
 #include "base.hpp"
 #include "../debug.h"
 #include "../string_func.h"
 #include "../core/string_compare_type.hpp"
 #include <map>
 #if defined(WITH_COCOA)
@@ @@ -21,13 +22,6 @@ class BlitterFactoryBase { @@
 private:
 	const char *name;
 	struct StringCompare {
 		bool operator () (const char *a, const char *b) const
+		{
 			return strcmp(a, b) < 0;
+		}
 	};
 	typedef std::map<const char *, BlitterFactoryBase *, StringCompare> Blitters;
 	static Blitters &GetBlitters()

src/core/string_compare_type.hpp

➞

Show inline comments

@@ new file 100644 @@
 /* $Id$ */
 /** @file string_compare_type.hpp Comparator class for "const char *" so it can be used as a key for std::map */
 #ifndef STRING_COMPARE_TYPE_HPP
 #define STRING_COMPARE_TYPE_HPP
 struct StringCompare {
 	bool operator () (const char *a, const char *b) const
+	{
 		return strcmp(a, b) < 0;
+	}
 };
 #endif /* STRING_COMPARE_TYPE_HPP */

src/driver.h

➞

Show inline comments

@@ @@ -6,6 +6,7 @@ @@
 #define DRIVER_H
 #include "core/enum_type.hpp"
 #include "core/string_compare_type.hpp"
 #include "string_func.h"
 #include <map>
@@ @@ -39,13 +40,6 @@ private: @@
 	const char *name;
 	int priority;
 	struct StringCompare {
 		bool operator () (const char *a, const char *b) const
+		{
 			return strcmp(a, b) < 0;
+		}
 	};
 	typedef std::map<const char *, DriverFactoryBase *, StringCompare> Drivers;
 	static Drivers &GetDrivers()

0 comments (0 inline, 0 general)