Fixed 64 Bit issue in patch.h, see http://zerowing.idsoftware.com/bugzilla/show_bug...

for details

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@105 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/CHANGES b/CHANGES
index 99bb1fd4614dd8876c929f99aa33aec12ca4eacb..461b47d7ae2608dce7bc5a177331e7113bb4bb5d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
 This is the changelog for developers, != changelog for the end user 
 that we distribute with the binaries. (see changelog)
 
+12/09/2006
+namespace
+- Fixed 64 Bit issue in patch.h, see http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=1109
+  for details
+
 11/09/2006
 namespace
 - Fixed unnecessary warnings, see http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=1108

diff --git a/radiant/patch.h b/radiant/patch.h
index 2362415ebb59635601e9a3ba21341d539180e780..d17638735dbf830a9302c30ac8ad76d3c1b67cf2 100644 (file)
--- a/radiant/patch.h
+++ b/radiant/patch.h
@@ -43,6 +43,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "debugging/debugging.h"
 
 #include <set>
+#include <limits>
 
 #include "math/frustum.h"
 #include "string/string.h"
@@ -115,7 +116,7 @@ struct BezierCurve
   Vector3 right;
 };
 
-const std::size_t BEZIERCURVETREE_MAX_INDEX = 1 << ((sizeof(std::size_t) * 8) - 1);
+const std::size_t BEZIERCURVETREE_MAX_INDEX = std::numeric_limits<unsigned int>::max() / 2 + 1;
 
 struct BezierCurveTree
 {