From 3eb92cbe8a70bf810c3424a13bb2db43aabbd7b0 Mon Sep 17 00:00:00 2001
From: cignoni <paolo.cignoni@isti.cnr.it>
Date: Thu, 17 Feb 2011 11:38:01 +0000
Subject: [PATCH] harmless gcc warnings

---
 wrap/io_trimesh/import_obj.h | 12 ++++++------
 wrap/io_trimesh/import_off.h |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wrap/io_trimesh/import_obj.h b/wrap/io_trimesh/import_obj.h
index 4cbf2735..bee25ed6 100644
--- a/wrap/io_trimesh/import_obj.h
+++ b/wrap/io_trimesh/import_obj.h
@@ -713,7 +713,7 @@ public:
 	* \param stream	The object providing the input stream
 	*	\param tokens	The "tokens" in the next line
 	*/
-	inline static const void TokenizeNextLine(std::ifstream &stream, std::vector< std::string > &tokens)
+        inline static void TokenizeNextLine(std::ifstream &stream, std::vector< std::string > &tokens)
 	{
 		if(stream.eof()) return;
 		std::string line;
@@ -744,7 +744,7 @@ public:
 		while (from<length);
 	} // end TokenizeNextLine
 
-	inline static const void SplitToken(std::string token, int &vId, int &nId, int &tId, int mask)
+        inline static void SplitToken(std::string token, int &vId, int &nId, int &tId, int mask)
 	{
   		  std::string vertex;
 			  std::string texcoord;
@@ -760,12 +760,12 @@ public:
 		if(mask & Mask::IOM_WEDGNORMAL)   nId = atoi(normal.c_str())   - 1;
 	}
 
-	inline static const void SplitVToken(std::string token, std::string &vertex) 
+        inline static void SplitVToken(std::string token, std::string &vertex)
 	{
 		vertex = token; 
 	}
 
-	inline static const void SplitVVTToken(std::string token, std::string &vertex, std::string &texcoord)
+        inline static void SplitVVTToken(std::string token, std::string &vertex, std::string &texcoord)
 	{
 		vertex.clear();
 		texcoord.clear();
@@ -794,7 +794,7 @@ public:
 		}
 	}	// end of SplitVVTToken
 
-	inline static const void SplitVVNToken(std::string token, std::string &vertex, std::string &normal)
+        inline static void SplitVVNToken(std::string token, std::string &vertex, std::string &normal)
 	{
 		vertex.clear();
 		normal.clear();
@@ -824,7 +824,7 @@ public:
 		}
 	}	// end of SplitVVNToken
 
-	inline static const void SplitVVTVNToken(std::string token, std::string &vertex, std::string &texcoord, std::string &normal)
+        inline static void SplitVVTVNToken(std::string token, std::string &vertex, std::string &texcoord, std::string &normal)
 	{
 		vertex.clear();
 		texcoord.clear();
diff --git a/wrap/io_trimesh/import_off.h b/wrap/io_trimesh/import_off.h
index d340c0e1..c26e3f2b 100644
--- a/wrap/io_trimesh/import_off.h
+++ b/wrap/io_trimesh/import_off.h
@@ -540,7 +540,7 @@ namespace vcg
 				* \param stream	The object providing the input stream
 				*	\param tokens	The "tokens" in the next line
 				*/
-				inline static const void TokenizeNextLine(std::ifstream &stream, std::vector< std::string > &tokens)
+                                inline static void TokenizeNextLine(std::ifstream &stream, std::vector< std::string > &tokens)
 				{
 					std::string line;
 					do
@@ -558,7 +558,7 @@ namespace vcg
 						if(from!=length)
 						{
 							to = from+1;
-							while ( (line[to]!=' ' && line[to] != '\t'  || line[to] == '\r') && to!=length)
+                            while ( (((line[to]!=' ') && (line[to] != '\t'))  || (line[to] == '\r')) && to!=length)
 								to++;
 							tokens.push_back(line.substr(from, to-from).c_str());
 							from = to;