Merge pull request #1467 from murraystevenson/boost182compatibility

Boost 1.82 Compatibility

Author: johnhaddon

Changes

@@ -1,7 +1,10 @@
 10.5.x.x (relative to 10.5.14.0)
 ========
 
+Fixes
+-----
 
+- Boost : Fixed compatibility with Boost 1.82.
 
 10.5.14.0 (relative to 10.5.13.1)
 =========

src/IECore/FileNameParameter.cpp

@@ -87,7 +87,7 @@ bool FileNameParameter::valueValid( const Object *value, std::string *reason ) c
 	// extensions check
 	if( extensions().size() )
 	{
-		string ext = boost::filesystem::extension(boost::filesystem::path( s->readable()));
+		string ext = boost::filesystem::path( s->readable() ).extension().string();
 
 		const vector<string> &exts = extensions();
 		bool found = false;

src/IECore/FileSequenceParameter.cpp

@@ -41,7 +41,7 @@
 
 #include "boost/algorithm/string/classification.hpp"
 #include "boost/algorithm/string/split.hpp"
-#include "boost/filesystem/convenience.hpp"
+#include "boost/filesystem/path.hpp"
 
 #include <algorithm>
 #include <cassert>
@@ -130,7 +130,7 @@ bool FileSequenceParameter::valueValid( const Object *value, std::string *reason
 
 	if ( m_extensions.size() )
 	{
-		std::string ext = boost::filesystem::extension( boost::filesystem::path( fileSequence->getFileName() ) );
+		std::string ext = boost::filesystem::path( fileSequence->getFileName() ).extension().string();
 		if ( ext.size() && ext[0] == '.' )
 		{
 			ext = ext.substr( 1, ext.size() - 1 );

src/IECore/FileSequenceVectorParameter.cpp

@@ -41,7 +41,7 @@
 
 #include "boost/algorithm/string/classification.hpp"
 #include "boost/algorithm/string/split.hpp"
-#include "boost/filesystem/convenience.hpp"
+#include "boost/filesystem/path.hpp"
 
 #include <algorithm>
 #include <cassert>
@@ -131,7 +131,7 @@ bool FileSequenceVectorParameter::valueValid( const Object *value, std::string *
 
 		if ( m_extensions.size() )
 		{
-			std::string ext = boost::filesystem::extension( boost::filesystem::path( fileSequence->getFileName() ) );
+			std::string ext = boost::filesystem::path( fileSequence->getFileName() ).extension().string();
 			if ( ext.size() && ext[0] == '.' )
 			{
 				ext = ext.substr( 1, ext.size() - 1 );
@@ -257,7 +257,7 @@ FileSequencePtr FileSequenceVectorParameter::parseFileSequence( const std::strin
 			frameList = FrameList::parse( tail );
 			found = true;
 		}
-		
+
 		catch ( Exception & )
 		{
 			fileSequenceCopy = fileSequenceCopy.substr( 0, spaceIndex )
@@ -267,7 +267,7 @@ FileSequencePtr FileSequenceVectorParameter::parseFileSequence( const std::strin
 
 			spaceIndex = fileSequenceCopy.find_first_of( " " );
 		}
-		
+
 	}
 
 	return new FileSequence( filename, frameList );

src/IECore/IndexedIO.cpp

@@ -36,7 +36,7 @@
 
 #include "IECore/Exception.h"
 
-#include "boost/filesystem/convenience.hpp"
+#include "boost/filesystem/path.hpp"
 #include "boost/algorithm/string.hpp"
 
 #include <iostream>
@@ -67,16 +67,14 @@ static CreatorMap &creators()
 
 IE_CORE_DEFINERUNTIMETYPEDDESCRIPTION( IndexedIO )
 
-namespace fs = boost::filesystem;
-
 const IndexedIO::EntryID IndexedIO::rootName("/");
 const IndexedIO::EntryIDList IndexedIO::rootPath;
 
 IndexedIOPtr IndexedIO::create( const std::string &path, const IndexedIO::EntryIDList &root, IndexedIO::OpenMode mode, const CompoundData *options )
 {
 	IndexedIOPtr result = nullptr;
 
-	std::string extension = fs::extension(path);
+	std::string extension = boost::filesystem::path( path ).extension().string();
 	boost::to_lower( extension );
 
 	const CreatorMap &createFns = creators();

src/IECore/Reader.cpp

@@ -40,7 +40,7 @@
 
 #include "boost/algorithm/string/classification.hpp"
 #include "boost/algorithm/string/split.hpp"
-#include "boost/filesystem/convenience.hpp"
+#include "boost/filesystem/path.hpp"
 
 using namespace std;
 using namespace IECore;
@@ -84,7 +84,7 @@ ReaderPtr Reader::create( const std::string &fileName )
 	bool knownExtension = false;
 	ExtensionsToFnsMap *m = extensionsToFns();
 	assert( m );
-	string ext = extension(boost::filesystem::path(fileName));
+	string ext = boost::filesystem::path( fileName ).extension().string();
 	if( ext!="" )
 	{
 		ExtensionsToFnsMap::const_iterator it = m->find( ext );

src/IECore/SearchPath.cpp

@@ -106,7 +106,7 @@ std::string SearchPath::getPaths( const std::string &separator ) const
 boost::filesystem::path SearchPath::find( const boost::filesystem::path &file ) const
 {
 	// if it's a full path then there's no need to do any searching
-	if( file.is_complete() )
+	if( file.is_absolute() )
 	{
 		if( exists( file ) )
 		{

src/IECore/Writer.cpp

@@ -41,7 +41,7 @@
 
 #include "boost/algorithm/string/classification.hpp"
 #include "boost/algorithm/string/split.hpp"
-#include "boost/filesystem/convenience.hpp"
+#include "boost/filesystem/path.hpp"
 
 #include <cassert>
 
@@ -116,7 +116,7 @@ void Writer::registerWriter( const std::string &extensions, CanWriteFn canWrite,
 
 WriterPtr Writer::create( ObjectPtr object, const std::string &fileName )
 {
-	string ext = extension(boost::filesystem::path(fileName));
+	string ext = boost::filesystem::path( fileName ).extension().string();
 
 	ExtensionsToFnsMap *m = extensionsToFns();
 	assert( m );
@@ -146,7 +146,7 @@ WriterPtr Writer::create( ObjectPtr object, const std::string &fileName )
 
 WriterPtr Writer::create( const std::string &fileName )
 {
-	string ext = extension(boost::filesystem::path(fileName));
+	string ext = boost::filesystem::path( fileName ).extension().string();
 
 	ExtensionsToFnsMap *m = extensionsToFns();
 	ExtensionsToFnsMap::const_iterator it = m->find( ext );

src/IECoreScene/SceneInterface.cpp

@@ -34,7 +34,7 @@
 
 #include "IECoreScene/SceneInterface.h"
 
-#include "boost/filesystem/convenience.hpp"
+#include "boost/filesystem/path.hpp"
 #include "boost/tokenizer.hpp"
 #include "boost/algorithm/string.hpp"
 
@@ -104,7 +104,7 @@ SceneInterfacePtr SceneInterface::create( const std::string &path, IndexedIO::Op
 {
 	SceneInterfacePtr result = nullptr;
 
-	std::string extension = boost::filesystem::extension(path);
+	std::string extension = boost::filesystem::path( path ).extension().string();
 	boost::algorithm::to_lower( extension );
 	IndexedIO::OpenModeFlags openMode = IndexedIO::OpenModeFlags( mode & (IndexedIO::Read|IndexedIO::Write|IndexedIO::Append) );
 	std::pair< std::string, IndexedIO::OpenModeFlags > key( extension, openMode );