cpp/openttd-patchpack/source Changeset - r9376:cdce66704b01

Changeset - r9376:cdce66704b01

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

smatz - 16 years ago 2008-05-27 00:13:51
smatz@openttd.org

(svn r13280) -Fix (r13276): MSVC compilation was broken

3 files changed with 8 insertions and 8 deletions:

src/bridge_gui.cpp

src/group_gui.cpp

src/sortlist_type.h

0 comments (0 inline, 0 general)

src/bridge_gui.cpp

➞

Show inline comments

@@ @@ -74,19 +74,19 @@ private: @@
 	GUIBridgeList *bridges;
 	/** Sort the bridges by their index */
 	static int BridgeIndexSorter(const BuildBridgeData *a, const BuildBridgeData *b)
+	static int CDECL BridgeIndexSorter(const BuildBridgeData *a, const BuildBridgeData *b)
+	{
 		return a->index - b->index;
+	}
 	/** Sort the bridges by their price */
 	static int BridgePriceSorter(const BuildBridgeData *a, const BuildBridgeData *b)
+	static int CDECL BridgePriceSorter(const BuildBridgeData *a, const BuildBridgeData *b)
+	{
 		return a->cost - b->cost;
+	}
 	/** Sort the bridges by their maximum speed */
 	static int BridgeSpeedSorter(const BuildBridgeData *a, const BuildBridgeData *b)
+	static int CDECL BridgeSpeedSorter(const BuildBridgeData *a, const BuildBridgeData *b)
+	{
 		return a->spec->speed - b->spec->speed;
+	}

src/group_gui.cpp

➞

Show inline comments

@@ @@ -147,7 +147,7 @@ private: @@
+	}
 	/** Sort the groups by their name */
 	static int GroupNameSorter(const Group* const *a, const Group* const *b)
+	static int CDECL GroupNameSorter(const Group* const *a, const Group* const *b)
+	{
 		static const Group *last_group[2] = { NULL, NULL };
 		static char         last_name[2][64] = { "", "" };
@@ @@ -295,7 +295,7 @@ public: @@
 		SortVehicleList(this);
 		this->BuildGroupList(owner);
 		this->groups.Sort(GroupNameSorter);
+		this->groups.Sort(&GroupNameSorter);
 		SetVScrollCount(this, this->groups.Length());
 		SetVScroll2Count(this, this->vehicles.Length());

src/sortlist_type.h

➞

Show inline comments

@@ @@ -26,7 +26,7 @@ struct Listing { @@
 template <typename T>
 class GUIList : public SmallVector<T, 32> {
 public:
 	typedef int SortFunction(const T*, const T*);
+	typedef int CDECL SortFunction(const T*, const T*);
 public: // Temporary: public for conversion only
 	SortFunction* const *func_list; ///< The sort criteria functions
@@ @@ -189,7 +189,7 @@ public: @@
+	 *
 	 * @param compare The function to compare two list items
 	 * */
 	FORCEINLINE void Sort(SortFunction compare)
+	FORCEINLINE void Sort(SortFunction *compare)
+	{
 		/* Do not sort if the resort bit is not set */
 		if (!HASBITS(this->flags, VL_RESORT)) return;
@@ @@ -204,7 +204,7 @@ public: @@
 		const bool desc = HASBITS(this->flags, VL_DESC);
 		if (HASBITS(this->flags, VL_FIRST_SORT)) {
-			qsort(this->data, this->items, sizeof(T), (int (*)(const void *a, const void *b))compare);
+			qsort(this->data, this->items, sizeof(T), (int (CDECL *)(const void *, const void *))compare);
 			if (desc) this->Reverse();
 			return;

0 comments (0 inline, 0 general)