From 079b1c293e6d0f613ca66aa3a9e7a710b67f6b8a Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 2 Nov 2010 14:00:50 +0000 Subject: [PATCH] From Chuck Seberino, "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." --- src/osgPlugins/vrml/ReaderWriterVRML2.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/osgPlugins/vrml/ReaderWriterVRML2.cpp b/src/osgPlugins/vrml/ReaderWriterVRML2.cpp index 8f30699c2..519e5bad5 100644 --- a/src/osgPlugins/vrml/ReaderWriterVRML2.cpp +++ b/src/osgPlugins/vrml/ReaderWriterVRML2.cpp @@ -110,16 +110,15 @@ class resource_fetcher: public openvrml::resource_fetcher 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"))