--- a/include/serialize.h	Thu May 08 09:21:25 2008 +0200
+++ b/include/serialize.h	Sat May 10 14:29:37 2008 +0200
@@ -42,7 +42,7 @@
  */
 class Indexer
 {
-	map <void *, int> indexmap;
+	map <const void *, int> indexmap;
 	int index;
 public:
 	Indexer(): indexmap(), index(0) {};
@@ -55,9 +55,9 @@
 	 * @retval true        if object was found
 	 * @retval false       if new index was made for the object
 	 */
-	bool get(void *o, int &retidx);
+	bool get(const void *o, int &retidx);
 
-	const int &operator[](void *o) { return indexmap[o]; };
+	const int &operator[](const void *o) { return indexmap[o]; };
 };
 
 extern Indexer vertex_index, shape_index;
@@ -65,9 +65,8 @@
 void resetSerializer();
 Shape *loadShape(istream &st, Material *mat);
 
-ostream & operator<<(ostream &st, Shape &o);
-ostream & operator<<(ostream &st, Vertex &o);
-ostream & operator<<(ostream &st, Container &o);
-istream & operator>>(istream &st, Vector &v);
+ostream & operator<<(ostream &st, const Shape &o);
+ostream & operator<<(ostream &st, const Vertex &o);
+ostream & operator<<(ostream &st, const Container &o);
 
 #endif