Merging r6275 through r6286 from trunk to ogl-es branch

- Fixing warnings
- Updating bzip2 and zlib libraries


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6287 dfc29bdd-3216-0410-991c-e03cc46cb475

include/IQ3Shader.h

@@ -639,12 +639,6 @@ namespace quake3
 			: ID ( 0 ), VarGroup ( 0 )  {}
 		virtual ~IShader () {}
 
-		void operator = (const IShader &other )
-		{
-			ID = other.ID;
-			VarGroup = other.VarGroup;
-			name = other.name;
-		}
 
 		bool operator == (const IShader &other ) const
 		{

include/SViewFrustum.h

@@ -47,9 +47,6 @@ namespace scene
 		//! Default Constructor
 		SViewFrustum() : BoundingRadius(0.f), FarNearDistance(0.f) {}
 
-		//! Copy Constructor
-		SViewFrustum(const SViewFrustum& other);
-
 		//! This constructor creates a view frustum based on a projection and/or view matrix.
 		//\param zClipFromZero: Clipping of z can be projected from 0 to w when true (D3D style) and from -w to w when false (OGL style).
 		SViewFrustum(const core::matrix4& mat, bool zClipFromZero);
@@ -140,27 +137,6 @@ namespace scene
 		core::vector3df BoundingCenter;
 	};
 
-
-	/*!
-		Copy constructor ViewFrustum
-	*/
-	inline SViewFrustum::SViewFrustum(const SViewFrustum& other)
-	{
-		cameraPosition=other.cameraPosition;
-		boundingBox=other.boundingBox;
-
-		u32 i;
-		for (i=0; i<VF_PLANE_COUNT; ++i)
-			planes[i]=other.planes[i];
-
-		for (i=0; i<ETS_COUNT_FRUSTUM; ++i)
-			Matrices[i]=other.Matrices[i];
-
-		BoundingRadius = other.BoundingRadius;
-		FarNearDistance = other.FarNearDistance;
-		BoundingCenter = other.BoundingCenter;
-	}
-
 	inline SViewFrustum::SViewFrustum(const core::matrix4& mat, bool zClipFromZero)
 	{
 		setFrom(mat, zClipFromZero);

include/irrMap.h

@@ -453,13 +453,6 @@ class map
 		return Cur;
 	}
 
-	ParentFirstIterator& operator=(const ParentFirstIterator& src)
-	{
-		Root = src.Root;
-		Cur = src.Cur;
-		return (*this);
-	}
-
 	void operator++(int)
 	{
 		inc();
@@ -552,13 +545,6 @@ class map
 			return Cur;
 		}
 
-		ParentLastIterator& operator=(const ParentLastIterator& src)
-		{
-			Root = src.Root;
-			Cur = src.Cur;
-			return (*this);
-		}
-
 		void operator++(int)
 		{
 			inc();

include/irrTypes.h

@@ -8,7 +8,8 @@
 #include "IrrCompileConfig.h"
 
 #if defined(__GNUC__)
-	#include <limits.h>	// for __WORDSIZE
+	// For __WORDSIZE (which we maybe don't even need anymore with LP64 checks now)
+	#include <limits.h>
 #endif
 
 namespace irr
@@ -77,7 +78,7 @@ typedef signed int		s32;
 #if defined(_MSC_VER) || ((__BORLANDC__ >= 0x530) && !defined(__STRICT_ANSI__))
 typedef unsigned __int64			u64;
 #elif defined(__GNUC__)
-#if defined(__WORDSIZE) && __WORDSIZE == 64
+#if (defined(__LP64__) && __LP64__ == 1) || (defined(_LP64) && _LP64 == 1)  || (defined(__WORDSIZE) && __WORDSIZE == 64)
 typedef unsigned long int			u64;
 #else
 __extension__ typedef unsigned long long	u64;
@@ -91,7 +92,7 @@ typedef unsigned long long			u64;
 #if defined(_MSC_VER) || ((__BORLANDC__ >= 0x530) && !defined(__STRICT_ANSI__))
 typedef __int64					s64;
 #elif defined(__GNUC__)
-#if defined(__WORDSIZE) && __WORDSIZE == 64
+#if (defined(__LP64__) && __LP64__ == 1) || (defined(_LP64) && _LP64 == 1)  || (defined(__WORDSIZE) && __WORDSIZE == 64)
 typedef long int				s64;
 #else
 __extension__ typedef long long			s64;

include/line2d.h

@@ -24,8 +24,6 @@ class line2d
 		line2d(T xa, T ya, T xb, T yb) : start(xa, ya), end(xb, yb) {}
 		//! Constructor for line between the two points given as vectors.
 		line2d(const vector2d<T>& start, const vector2d<T>& end) : start(start), end(end) {}
-		//! Copy constructor.
-		line2d(const line2d<T>& other) : start(other.start), end(other.end) {}
 
 		// operators
 
@@ -97,12 +95,12 @@ class line2d
 		/*! Check if 2 segments are incident (intersects in exactly 1 point).*/
 		bool incidentSegments( const line2d<T>& other) const
 		{
-			return 
+			return
 				start.checkOrientation( end, other.start) != start.checkOrientation( end, other.end)
 			&&  other.start.checkOrientation( other.end, start) != other.start.checkOrientation( other.end, end);
 		}
 
-		/*! Check if 2 lines/segments are parallel or nearly parallel.*/ 
+		/*! Check if 2 lines/segments are parallel or nearly parallel.*/
 		bool nearlyParallel( const line2d<T>& line, const T factor = relativeErrorFactor<T>()) const
 		{
 			const vector2d<T> a = getVector();
@@ -112,14 +110,14 @@ class line2d
 		}
 
 		/*! returns a intersection point of 2 lines (if lines are not parallel). Behaviour
-		undefined if lines are parallel or coincident. 
+		undefined if lines are parallel or coincident.
 		It's on optimized intersectWith with checkOnlySegments=false and ignoreCoincidentLines=true
 		*/
 		vector2d<T> fastLinesIntersection( const line2d<T>& l) const
 		{
 			const f32 commonDenominator = (f32)((l.end.Y - l.start.Y)*(end.X - start.X) -
 				(l.end.X - l.start.X)*(end.Y - start.Y));
-			
+
 			if ( commonDenominator != 0.f )
 			{
 				const f32 numeratorA = (f32)((l.end.X - l.start.X)*(start.Y - l.start.Y) -
@@ -129,7 +127,7 @@ class line2d
 
 				// Calculate the intersection point.
 				return vector2d<T> (
-					(T)(start.X + uA * (end.X - start.X)), 
+					(T)(start.X + uA * (end.X - start.X)),
 					(T)(start.Y + uA * (end.Y - start.Y))
 					);
 			}
@@ -293,7 +291,7 @@ class line2d
 		/** Assumes that the point is already somewhere on the line. */
 		bool isPointBetweenStartAndEnd(const vector2d<T>& point) const
 		{
-			return point.isBetweenPoints(start, end); 
+			return point.isBetweenPoints(start, end);
 		}
 
 		//! Get the closest point on this line to a point

include/quaternion.h

@@ -55,9 +55,6 @@ class quaternion
 		//! inequality operator
 		bool operator!=(const quaternion& other) const;
 
-		//! Assignment operator
-		inline quaternion& operator=(const quaternion& other);
-
 #ifndef IRR_TEST_BROKEN_QUATERNION_USE
 		//! Matrix assignment operator
 		inline quaternion& operator=(const matrix4& other);
@@ -240,15 +237,6 @@ inline bool quaternion::operator!=(const quaternion& other) const
 	return !(*this == other);
 }
 
-// assignment operator
-inline quaternion& quaternion::operator=(const quaternion& other)
-{
-	X = other.X;
-	Y = other.Y;
-	Z = other.Z;
-	W = other.W;
-	return *this;
-}
 
 #ifndef IRR_TEST_BROKEN_QUATERNION_USE
 // matrix assignment operator