Robert, Here is a minor fix for the vrml plugin when building with Visual Studio 2010. 2010 has updated STL/TR1 libraries that create a naming conflict with the current source. The fix is to remove the 'using boost::next' line and use the fully-qualified boost::next to get rid of the ambiguity. Here is the patch and attached changes.
ReaderWriterVRML2.cpp
Description: Binary data
--- OpenSceneGraph-trunk/src/osgPlugins/vrml/ReaderWriterVRML2.cpp (revision
11835)
+++ OpenSceneGraph-trunk/src/osgPlugins/vrml/ReaderWriterVRML2.cpp (working
copy)
@@ -110,16 +110,15 @@
using std::find;
using std::string;
using boost::algorithm::iequals;
- using boost::next;
string media_type = "application/octet-stream";
const string::const_reverse_iterator dot_pos =
find(this->url_.rbegin(), this->url_.rend(), '.');
- if (dot_pos == this->url_.rend() ||
next(dot_pos.base()) == this->url_.end())
+ if (dot_pos == this->url_.rend() ||
boost::next(dot_pos.base()) == this->url_.end())
{
return media_type;
}
- const string::const_iterator hash_pos =
find(next(dot_pos.base()), this->url_.end(), '#');
+ const string::const_iterator hash_pos =
find(boost::next(dot_pos.base()), this->url_.end(), '#');
const string ext(dot_pos.base(), hash_pos);
if (iequals(ext, "wrl") || iequals(ext, "vrml"))
Thanks
Chuck Seberino
_______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
