Fixes to shuffle Array slice_

include/asl/Array.h

@@ -153,7 +153,7 @@ class Array
 		T* operator->() {return &(a[i]);}
 		operator bool() const {return i < j;}
 		T& operator[](int k) {return a[i+k];}
-		const T& operator[](int k) const {return a[i+k];}
+		T& operator[](int k) const {return a[i+k];}
 		int length() const {return j-i;}
 	};
 	int r() {return d().rc;}
@@ -603,6 +603,7 @@ class Array
 	Enumerator all() {return Enumerator(*this);}
 	Enumerator all() const {return Enumerator(*this);}
 	Enumerator slice_(int i, int j=0) {if(j==0) j=length();return Enumerator(*this, i, j);}
+	Enumerator slice_(int i, int j = 0) const {if(j==0) j=length();return Enumerator(*this, i, j);}
 };
 
 typedef Array<byte> ByteArray;

include/asl/defs.h

@@ -196,6 +196,24 @@ inline T rad2deg(T x) {return (T)(x*57.29577951308232);}
 
 static const double PI = 3.14159265358979323;
 
+template<class T>
+inline void vswap(T& a, T& b)
+{
+	T A = a;
+	a = b;
+	b = A;
+}
+
+template<class T>
+inline void swap(T& a, T& b)
+{
+	char t[sizeof(T)];
+	memcpy(t, &a, sizeof(T));
+	memcpy(&a, &b, sizeof(T));
+	memcpy(&b, t, sizeof(T));
+}
+
+
 /**
 Endianness types for binary parsing/writing
 */
@@ -295,6 +313,12 @@ class ASL_API Random
 	*/
 	template <typename E>
 	void shuffle(E& a) { shuffle(&a[0], a.length()); }
+
+	/**
+	Shuffles an array of elements in place.
+	*/
+	template<typename E>
+	void shuffle(const E& a) { shuffle(&a[0], a.length()); }
 };
 
 extern ASL_API Random random; //!< A global random number generator
@@ -354,18 +378,6 @@ inline T max(T a, T b) {if(a>b) return a; else return b;}
 template <class T>
 inline T min(T a, T b) {if(a<b) return a; else return b;}
 
-template <class T>
-inline void vswap(T& a, T& b) {T A=a; a=b; b=A;}
-
-template <class T>
-inline void swap(T& a, T& b)
-{
-	char t[sizeof(T)];
-	memcpy(t, &a, sizeof(T));
-	memcpy(&a, &b, sizeof(T));
-	memcpy(&b, t, sizeof(T));
-}
-
 }
 
 inline void* operator new (size_t, int* p) { return p; }