From c561890502426d21a2ea2b86ef6d759bc7b883bb Mon Sep 17 00:00:00 2001
From: joris <joris.dauphin@gmail.com>
Date: Sun, 29 Apr 2012 13:03:36 +0200
Subject: [PATCH] Fix undefined _ASSERT in clamp function for MSVC.
---
src/include/stratagus.h | 1 +
src/include/util.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/include/stratagus.h b/src/include/stratagus.h
index b3886d0e4..fac6a10ff 100644
--- a/src/include/stratagus.h
+++ b/src/include/stratagus.h
@@ -57,6 +57,7 @@
#pragma warning(disable:4761) /// Integral size mismatch
#pragma warning(disable:4786) /// Truncated to 255 chars
#include <stdlib.h>
+#include <crtdbg.h>
#define abort() _ASSERT(0)
#include <stdio.h>
#define snprintf _snprintf
diff --git a/src/include/util.h b/src/include/util.h
index 1037d1822..fc587f923 100644
--- a/src/include/util.h
+++ b/src/include/util.h
@@ -180,7 +180,7 @@ extern long isqrt(long num);
template <typename T>
void clamp(T* value, T minValue, T maxValue)
{
- //Assert(minValue < maxValue);
+ Assert(minValue < maxValue);
if (*value < minValue) {
*value = minValue;