From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 25 Jun 2008 09:21:13 +0000 (+0000)
Subject: Add a missing #include
X-Git-Tag: 0.9~5
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=8f3ae497552ab7d3ddea7c34a411e7fdaa8722e4;p=libs%2Fgl.git

Add a missing #include
Fix gcc 4.3 style warnings
---

diff --git a/source/program.cpp b/source/program.cpp
index 2ed6fba8..eed8b87a 100644
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -5,6 +5,7 @@ Copyright © 2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <algorithm>
 #include "arb_shader_objects.h"
 #include "arb_vertex_shader.h"
 #include "except.h"
diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index fdf61cde..a2d371e7 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -68,8 +68,8 @@ void Texture3D::load_image(const string &fn, int dp)
 	}
 	else if(dp==-2)
 	{
-		for(d=h; d*d>h; d>>=2);
-		for(; d*d<h; ++d);
+		for(d=h; d*d>h; d>>=2) ;
+		for(; d*d<h; ++d) ;
 		if(d*d!=h)
 			throw IncompatibleData("Could not find a square root of texture height");
 		h=d;