From f820a2833576dc4bc8759dd0fa94c855ece898ea Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 5 Jan 2004 15:40:44 +0000 Subject: [PATCH] Compile fixes for Win32 --- src/osgPlugins/lwo/Object.cpp | 4 ++-- src/osgPlugins/lwo/iffparser.h | 2 +- src/osgPlugins/lwo/lwo2parser.h | 4 ++-- src/osgPlugins/lwo/lwo2read.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/osgPlugins/lwo/Object.cpp b/src/osgPlugins/lwo/Object.cpp index 1e5aad885..a7d7d59ee 100644 --- a/src/osgPlugins/lwo/Object.cpp +++ b/src/osgPlugins/lwo/Object.cpp @@ -61,8 +61,8 @@ void Object::build(const iff::Chunk_list &data) clips_.clear(); surfaces_.clear(); layers_.clear(); - comment_.clear(); - description_.clear(); + comment_ = ""; + description_ = ""; osg::notify(osg::INFO) << "INFO: lwosg::Object: scanning clips\n"; scan_clips(data); diff --git a/src/osgPlugins/lwo/iffparser.h b/src/osgPlugins/lwo/iffparser.h index c4cb27bd3..8e587d2e7 100644 --- a/src/osgPlugins/lwo/iffparser.h +++ b/src/osgPlugins/lwo/iffparser.h @@ -91,7 +91,7 @@ namespace iff IP_TMP Chunk *GenericParser::parse_chunk(Iter &it, const std::string &context) { std::string tag; - for (int i=0; i<4; ++i) tag.push_back(*(it++)); + for (int i=0; i<4; ++i) tag += *(it++); unsigned int len = ((static_cast(*(it++)) & 0xFF) << 24) | ((static_cast(*(it++)) & 0xFF) << 16) | ((static_cast(*(it++)) & 0xFF) << 8) | diff --git a/src/osgPlugins/lwo/lwo2parser.h b/src/osgPlugins/lwo/lwo2parser.h index e2b41f367..9b8f0caa8 100644 --- a/src/osgPlugins/lwo/lwo2parser.h +++ b/src/osgPlugins/lwo/lwo2parser.h @@ -589,7 +589,7 @@ namespace lwo2 if (tag == "BLOK") { FORM::SURF::BLOK *chk = new FORM::SURF::BLOK; std::string hid; - for (Iter tempit=it; tempit<(it+4); ++tempit) hid.push_back(*tempit); + for (Iter tempit=it; tempit<(it+4); ++tempit) hid += *tempit; chk->header = parse_subchunk(it, "FORM::SURF::BLOK"); while (it < end) { chk->attributes.push_back(parse_subchunk(it, "FORM::SURF::BLOK::" + hid)); @@ -891,7 +891,7 @@ namespace lwo2 LP_TMP iff::Chunk *Parser::parse_subchunk(Iter &it, const std::string &context) { std::string tag; - for (int i=0; i<4; ++i) tag.push_back(*(it++)); + for (int i=0; i<4; ++i) tag += *(it++); unsigned int len = ((static_cast(*(it++)) & 0xFF) << 8) | (static_cast(*(it++)) & 0xFF); os() << "DEBUG INFO: lwo2parser: reading subchunk " << tag << ", length = " << len << ", context = " << context << "\n"; diff --git a/src/osgPlugins/lwo/lwo2read.h b/src/osgPlugins/lwo/lwo2read.h index b2a9a79b2..2f9e76f0c 100644 --- a/src/osgPlugins/lwo/lwo2read.h +++ b/src/osgPlugins/lwo/lwo2read.h @@ -79,7 +79,7 @@ S0 read_S0(Iter &it) { S0 value; while (*it) { - value.push_back(*(it++)); + value += *(it++); } ++it; if (value.length() % 2 == 0) ++it;