[OMPT-svn-commit] SF.net SVN: modplug:[1575] trunk/OpenMPT

[<rel...@us...>]

Revision: 1575
          http://sourceforge.net/p/modplug/code/1575
Author:   relabsoluness
Date:     2013-03-16 18:15:17 +0000 (Sat, 16 Mar 2013)
Log Message:
-----------
[Fix] Build fix for VC08.

Modified Paths:
--------------
    trunk/OpenMPT/common/misc_util.h
    trunk/OpenMPT/mptrack/PatternClipboard.cpp
    trunk/OpenMPT/mptrack/test/test.cpp

Modified: trunk/OpenMPT/common/misc_util.h
===================================================================
--- trunk/OpenMPT/common/misc_util.h	2013-03-15 22:55:20 UTC (rev 1574)
+++ trunk/OpenMPT/common/misc_util.h	2013-03-16 18:15:17 UTC (rev 1575)
@@ -13,6 +13,7 @@
 #include <sstream>
 #include <string>
 #include <limits>
+#include <limits.h>
 #include "typedefs.h"
 #include <io.h> // for _taccess
 
@@ -304,11 +305,13 @@
 	template <> struct NumericTraits<int16> {static const int16 maxValue = int16_max; static const int16 minValue = int16_min;};
 	template <> struct NumericTraits<int32> {static const int32 maxValue = int32_max; static const int32 minValue = int32_min;};
 	template <> struct NumericTraits<int64> {static const int64 maxValue = int64_max; static const int64 minValue = int64_min;};
+	template <> struct NumericTraits<long> {static const long maxValue = LONG_MAX; static const long minValue = LONG_MIN;};
 
 	template <> struct NumericTraits<uint8> {static const uint8 maxValue = uint8_max; static const uint8 minValue = 0;};
 	template <> struct NumericTraits<uint16> {static const uint16 maxValue = uint16_max; static const uint16 minValue = 0;};
 	template <> struct NumericTraits<uint32> {static const uint32 maxValue = uint32_max; static const uint32 minValue = 0;};
 	template <> struct NumericTraits<uint64> {static const uint64 maxValue = uint64_max; static const uint64 minValue = 0;};
+	template <> struct NumericTraits<unsigned long> {static const unsigned long maxValue = ULONG_MAX; static const unsigned long minValue = 0;};
 
 	// Like std::max, but avoids conflict with max-macro.
 	template <class T> inline const T& Max(const T& a, const T& b) {return (std::max)(a, b);}

Modified: trunk/OpenMPT/mptrack/PatternClipboard.cpp
===================================================================
--- trunk/OpenMPT/mptrack/PatternClipboard.cpp	2013-03-15 22:55:20 UTC (rev 1574)
+++ trunk/OpenMPT/mptrack/PatternClipboard.cpp	2013-03-16 18:15:17 UTC (rev 1575)
@@ -949,7 +949,7 @@
 	}
 	instance.clipList.ResetContent();
 	PatternClipboard::clipindex_t i = 0;
-	for(std::deque<PatternClipboardElement>::const_iterator clip = PatternClipboard::instance.clipboards.cbegin(); clip != PatternClipboard::instance.clipboards.cend(); clip++, i++)
+	for(std::deque<PatternClipboardElement>::const_iterator clip = PatternClipboard::instance.clipboards.begin(); clip != PatternClipboard::instance.clipboards.end(); clip++, i++)
 	{
 		const int item = instance.clipList.AddString(clip->description);
 		instance.clipList.SetItemDataPtr(item, reinterpret_cast<void *>(i));

Modified: trunk/OpenMPT/mptrack/test/test.cpp
===================================================================
--- trunk/OpenMPT/mptrack/test/test.cpp	2013-03-15 22:55:20 UTC (rev 1574)
+++ trunk/OpenMPT/mptrack/test/test.cpp	2013-03-16 18:15:17 UTC (rev 1575)
@@ -199,6 +199,11 @@
 	VERIFY_EQUAL(int64_min, (std::numeric_limits<int64>::min)());
 	VERIFY_EQUAL(int64_max, (std::numeric_limits<int64>::max)());
 	VERIFY_EQUAL(uint64_max, (std::numeric_limits<uint64>::max)());
+
+	VERIFY_EQUAL(Util::NumericTraits<long>::minValue, (std::numeric_limits<long>::min)());
+	VERIFY_EQUAL(Util::NumericTraits<long>::maxValue, (std::numeric_limits<long>::max)());
+	VERIFY_EQUAL(Util::NumericTraits<unsigned long>::minValue, (std::numeric_limits<unsigned long>::min)());
+	VERIFY_EQUAL(Util::NumericTraits<unsigned long>::maxValue, (std::numeric_limits<unsigned long>::max)());
 }
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.