manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

harmless gcc warnings

This commit is contained in:
Paolo Cignoni 2011-02-17 11:38:01 +00:00
parent 88107edef1
commit 3eb92cbe8a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wrap/io_trimesh/import_obj.h
View File

@ -713,7 +713,7 @@ public:
* \param stream The object providing the input stream * \param stream The object providing the input stream
* \param tokens The "tokens" in the next line * \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; if(stream.eof()) return;
std::string line; std::string line;
@ -744,7 +744,7 @@ public:
while (from<length); while (from<length);
} // end TokenizeNextLine } // 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 vertex;
std::string texcoord; std::string texcoord;
@ -760,12 +760,12 @@ public:
if(mask & Mask::IOM_WEDGNORMAL) nId = atoi(normal.c_str()) - 1; 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; 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(); vertex.clear();
texcoord.clear(); texcoord.clear();
@ -794,7 +794,7 @@ public:
} }
} // end of SplitVVTToken } // 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(); vertex.clear();
normal.clear(); normal.clear();
@ -824,7 +824,7 @@ public:
} }
} // end of SplitVVNToken } // 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(); vertex.clear();
texcoord.clear(); texcoord.clear();

4
wrap/io_trimesh/import_off.h
View File

@ -540,7 +540,7 @@ namespace vcg
* \param stream The object providing the input stream * \param stream The object providing the input stream
* \param tokens The "tokens" in the next line * \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; std::string line;
do do
@ -558,7 +558,7 @@ namespace vcg
if(from!=length) if(from!=length)
{ {
to = from+1; 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++; to++;
tokens.push_back(line.substr(from, to-from).c_str()); tokens.push_back(line.substr(from, to-from).c_str());
from = to; from = to;