summaryrefslogtreecommitdiff
path: root/src/import.cc
diff options
context:
space:
mode:
authorDon Bright <hugh.m.bright@gmail.com>2013-05-26 03:37:26 (GMT)
committerDon Bright <hugh.m.bright@gmail.com>2013-05-26 03:37:26 (GMT)
commit31c88a434b3201d88819b485f74da843c2728cb2 (patch)
tree6fc7bffe22a7b685aa2cf18143796ace29d4fb8b /src/import.cc
parent164902fa76efac9f88bbd9aa6cbd1eb8c3fa00fb (diff)
merge branch to get windows "library path" working. tweak build system,
eliminate several compiler warnings.
Diffstat (limited to 'src/import.cc')
-rw-r--r--src/import.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/import.cc b/src/import.cc
index 2180684..b5d67d2 100644
--- a/src/import.cc
+++ b/src/import.cc
@@ -204,7 +204,7 @@ PolySet *ImportNode::evaluate_polyset(class PolySetEvaluator *) const
boost::regex ex_vertices("\\s*vertex\\s+([^\\s]+)\\s+([^\\s]+)\\s+([^\\s]+)");
bool binary = false;
- int file_size = f.tellg();
+ std::streampos file_size = f.tellg();
f.seekg(80);
if (!f.eof()) {
uint32_t facenum = 0;
contact: Jan Huwald // Impressum