[patch] aqsis-1.6.0-boost-1.46.patch

aqsis-1.6.0-boost-1.46.patch (text/plain), 9.11 KB, created by Nickolay Kolchin-Semyonov on 2011-05-14 12:05:41 UTC

diff -rud aqsis-1.6.0/libs/core/api/ri.cpp aqsis-fixed/libs/core/api/ri.cpp
--- aqsis-1.6.0/libs/core/api/ri.cpp	2009-10-11 16:34:29.000000000 +0400
+++ aqsis-fixed/libs/core/api/ri.cpp	2011-05-14 15:53:51.379279262 +0400
@@ -488,12 +488,12 @@
 
 	// Read in the system configuration file.
 	boost::filesystem::path systemRcPath = rootPath / AQSIS_XSTR(AQSIS_MAIN_CONFIG_NAME);
-	std::ifstream rcFile(systemRcPath.file_string().c_str(), std::ios::binary);
+	std::ifstream rcFile(systemRcPath.c_str(), std::ios::binary);
 	if(rcFile)
 	{
 		Aqsis::log() << info
 			<< "Reading system config \"" << systemRcPath << "\"\n";
-		QGetRenderContext()->parseRibStream(rcFile, systemRcPath.file_string());
+		QGetRenderContext()->parseRibStream(rcFile, systemRcPath.native());
 		rcFile.close();
 	}
 	else
@@ -508,22 +508,22 @@
 		boost::filesystem::path homeRcPath = homePath;
 		homeRcPath /= ".aqsisrc";
 
-		std::ifstream rcFile(homeRcPath.file_string().c_str(), std::ios::binary);
+		std::ifstream rcFile(homeRcPath.c_str(), std::ios::binary);
 		if(rcFile)
 		{
 			Aqsis::log() << info << "Reading user config \"" << homeRcPath << "\"\n";
-			QGetRenderContext()->parseRibStream(rcFile, homeRcPath.file_string());
+			QGetRenderContext()->parseRibStream(rcFile, homeRcPath.native());
 		}
 		else
 		{
 			boost::filesystem::path homeRcPath2 = homePath;
 			homeRcPath2 /= "_aqsisrc";
 		
-			std::ifstream rcFile(homeRcPath2.file_string().c_str(), std::ios::binary);
+			std::ifstream rcFile(homeRcPath2.c_str(), std::ios::binary);
 			if(rcFile)
 			{
 				Aqsis::log() << info << "Reading user config \"" << homeRcPath2 << "\"\n";
-				QGetRenderContext()->parseRibStream(rcFile, homeRcPath2.file_string());
+				QGetRenderContext()->parseRibStream(rcFile, homeRcPath2.native());
 			}
 			else
 			{
diff -rud aqsis-1.6.0/libs/core/ddmanager/ddmanager.cpp aqsis-fixed/libs/core/ddmanager/ddmanager.cpp
--- aqsis-1.6.0/libs/core/ddmanager/ddmanager.cpp	2009-10-11 16:34:29.000000000 +0400
+++ aqsis-fixed/libs/core/ddmanager/ddmanager.cpp	2011-05-14 15:54:36.226279253 +0400
@@ -349,7 +349,7 @@
 		}
 		
 		// Load the dynamic object and locate the relevant symbols.
-		CqString strDriverPathAndFile = displayPath.file_string();
+		CqString strDriverPathAndFile = displayPath.native();
 		m_DriverHandle = dspyPlugin.SimpleDLOpen( &strDriverPathAndFile );
 		if ( m_DriverHandle != NULL )
 		{
diff -rud aqsis-1.6.0/libs/core/geometry/blobby.cpp aqsis-fixed/libs/core/geometry/blobby.cpp
--- aqsis-1.6.0/libs/core/geometry/blobby.cpp	2009-10-11 16:34:29.000000000 +0400
+++ aqsis-fixed/libs/core/geometry/blobby.cpp	2011-05-14 15:55:05.682279247 +0400
@@ -392,7 +392,7 @@
 							try
 							{
 								CqString fullName = QGetRenderContext()->poptCurrent()
-									->findRiFile(dboName, "procedural").file_string();
+									->findRiFile(dboName, "procedural").native();
 								DBO_handle = DBO.SimpleDLOpen(&fullName);
 							}
 							catch(XqInvalidFile& /*e*/)
diff -rud aqsis-1.6.0/libs/core/geometry/procedural.cpp aqsis-fixed/libs/core/geometry/procedural.cpp
--- aqsis-1.6.0/libs/core/geometry/procedural.cpp	2009-10-11 16:34:29.000000000 +0400
+++ aqsis-fixed/libs/core/geometry/procedural.cpp	2011-05-14 15:55:58.546279229 +0400
@@ -155,7 +155,7 @@
 				          + CqString ("\" in current searchpath");
 				return;
 			}
-			CqString strRealName = dsoPath.file_string();
+			CqString strRealName = dsoPath.native();
 			void *handle = DLOpen( &strRealName );
 
 			if ( ( m_ppvfcts = ( void * ( * ) ( char * ) ) DLSym(handle, &strConver) ) == NULL )
@@ -315,7 +315,7 @@
 		AQSIS_THROW_XQERROR(XqValidation, EqE_BadToken, "program name not present");
 	// Attempt to find the program in the procedural path
 	std::string progName = QGetRenderContext()->poptCurrent()
-		->findRiFileNothrow(argv[0], "procedural").file_string();
+		->findRiFileNothrow(argv[0], "procedural").native();
 	if(progName.empty())
 	{
 		progName = argv[0];
diff -rud aqsis-1.6.0/libs/core/renderer.cpp aqsis-fixed/libs/core/renderer.cpp
--- aqsis-1.6.0/libs/core/renderer.cpp	2009-10-11 16:34:29.000000000 +0400
+++ aqsis-fixed/libs/core/renderer.cpp	2011-05-14 15:52:43.546279288 +0400
@@ -1195,7 +1195,7 @@
 	if(shaderFile)
 	{
 		Aqsis::log() << info << "Loading shader \"" << strName
-			<< "\" from file \"" << shaderPath.file_string()
+			<< "\" from file \"" << shaderPath.native()
 			<< "\"" << std::endl;
 
 		std::string dsoPath;
diff -rud aqsis-1.6.0/libs/core/texturing_old/texturemap_old.cpp aqsis-fixed/libs/core/texturing_old/texturemap_old.cpp
--- aqsis-1.6.0/libs/core/texturing_old/texturemap_old.cpp	2009-10-11 16:34:29.000000000 +0400
+++ aqsis-fixed/libs/core/texturing_old/texturemap_old.cpp	2011-05-14 15:57:00.906279209 +0400
@@ -578,7 +578,7 @@
 		}
 
 		// Now open it as a tiff file.
-		m_pImage = TIFFOpen( imagePath.file_string().c_str(), "r" );
+		m_pImage = TIFFOpen( imagePath.c_str(), "r" );
 	}
 
 	if ( m_pImage )
@@ -1090,7 +1090,7 @@
 		Aqsis::log() << error << "Cannot open texture file \"" << m_strName.c_str() << "\"" << std::endl;
 		return ;
 	}
-	m_pImage = TIFFOpen(imagePath.file_string().c_str(), "r" );
+	m_pImage = TIFFOpen(imagePath.c_str(), "r" );
 
 	if ( m_pImage )
 	{
diff -rud aqsis-1.6.0/libs/shadervm/dsoshadeops.cpp aqsis-fixed/libs/shadervm/dsoshadeops.cpp
--- aqsis-1.6.0/libs/shadervm/dsoshadeops.cpp	2009-10-11 16:34:32.000000000 +0400
+++ aqsis-fixed/libs/shadervm/dsoshadeops.cpp	2011-05-14 15:50:05.226279338 +0400
@@ -101,13 +101,13 @@
 				// If the path points to a directory, we add each library in the
 				// named directory to the list of DSO candidates.
 				std::vector<std::string> files = Glob(
-						((*path)/"*" SHARED_LIBRARY_SUFFIX).file_string() );
+						((*path)/"*" SHARED_LIBRARY_SUFFIX).native() );
 				m_DSOPathList.insert(m_DSOPathList.end(), files.begin(), files.end());
 			}
 			else
 			{
 				// else add the file itself.
-				m_DSOPathList.push_back(path->file_string());
+				m_DSOPathList.push_back(path->native());
 			}
 		}
 		catch(boost::filesystem::filesystem_error& /*e*/)
diff -rud aqsis-1.6.0/libs/tex/io/exrinputfile.cpp aqsis-fixed/libs/tex/io/exrinputfile.cpp
--- aqsis-1.6.0/libs/tex/io/exrinputfile.cpp	2009-10-11 16:34:32.000000000 +0400
+++ aqsis-fixed/libs/tex/io/exrinputfile.cpp	2011-05-14 15:48:52.225279358 +0400
@@ -163,7 +163,7 @@
 {
 	try
 	{
-		m_exrFile.reset(new Imf::InputFile(fileName.file_string().c_str()));
+		m_exrFile.reset(new Imf::InputFile(fileName.c_str()));
 	}
 	catch(Iex::BaseExc &e)
 	{
diff -rud aqsis-1.6.0/libs/tex/io/magicnumber.cpp aqsis-fixed/libs/tex/io/magicnumber.cpp
--- aqsis-1.6.0/libs/tex/io/magicnumber.cpp	2009-10-11 16:34:32.000000000 +0400
+++ aqsis-fixed/libs/tex/io/magicnumber.cpp	2011-05-14 15:47:40.641279382 +0400
@@ -59,7 +59,7 @@
 
 EqImageFileType guessFileType(const boostfs::path& fileName)
 {
-	std::ifstream inFile(fileName.file_string().c_str());
+	std::ifstream inFile(fileName.c_str());
 	if(!inFile)
 	{
 		AQSIS_THROW_XQERROR(XqInvalidFile, EqE_NoFile, "Cannot open file \""
diff -rud aqsis-1.6.0/libs/tex/io/tiffdirhandle.cpp aqsis-fixed/libs/tex/io/tiffdirhandle.cpp
--- aqsis-1.6.0/libs/tex/io/tiffdirhandle.cpp	2009-10-11 16:34:32.000000000 +0400
+++ aqsis-fixed/libs/tex/io/tiffdirhandle.cpp	2011-05-14 15:47:58.434279378 +0400
@@ -727,7 +727,7 @@
 
 CqTiffFileHandle::CqTiffFileHandle(const boostfs::path& fileName, const char* openMode)
 	: m_fileName(fileName),
-	m_tiffPtr(TIFFOpen(fileName.file_string().c_str(), openMode), safeTiffClose),
+	m_tiffPtr(TIFFOpen(fileName.c_str(), openMode), safeTiffClose),
 	m_isInputFile(openMode[0] == 'r'),
 	m_currDir(0)
 {
diff -rud aqsis-1.6.0/libs/tex/io/zinputfile.cpp aqsis-fixed/libs/tex/io/zinputfile.cpp
--- aqsis-1.6.0/libs/tex/io/zinputfile.cpp	2009-10-11 16:34:32.000000000 +0400
+++ aqsis-fixed/libs/tex/io/zinputfile.cpp	2011-05-14 15:48:29.050279367 +0400
@@ -41,7 +41,7 @@
 CqZInputFile::CqZInputFile(const boostfs::path& fileName)
 	: m_header(),
 	m_fileName(fileName),
-	m_fileStream(fileName.file_string().c_str(), std::ios::in | std::ios::binary),
+	m_fileStream(fileName.c_str(), std::ios::in | std::ios::binary),
 	m_dataBegin(0)
 {
 	if(!m_fileStream.is_open())
diff -rud aqsis-1.6.0/libs/tex/maketexture/maketexture.cpp aqsis-fixed/libs/tex/maketexture/maketexture.cpp
--- aqsis-1.6.0/libs/tex/maketexture/maketexture.cpp	2009-10-11 16:34:32.000000000 +0400
+++ aqsis-fixed/libs/tex/maketexture/maketexture.cpp	2011-05-14 15:49:27.761279347 +0400
@@ -335,8 +335,8 @@
 	{
 		inFileRealName = inFileName.string() + ".tif";
 		TqInt bakeRes = static_cast<TqInt>(paramList.find<TqFloat>("bake", 256));
-		bakeToTiff(inFileName.file_string().c_str(),
-				   inFileRealName.file_string().c_str(), bakeRes);
+		bakeToTiff(inFileName.c_str(),
+				   inFileRealName.c_str(), bakeRes);
 	}
 
 	// Open the input file
diff -rud aqsis-1.6.0/tools/piqsl/displayserverimage.cpp aqsis-fixed/tools/piqsl/displayserverimage.cpp
--- aqsis-1.6.0/tools/piqsl/displayserverimage.cpp	2009-10-11 16:34:32.000000000 +0400
+++ aqsis-fixed/tools/piqsl/displayserverimage.cpp	2011-05-14 15:57:15.682279204 +0400
@@ -98,8 +98,8 @@
 		++index;
 	}
 
-	setFilename(uniquePath.file_string());
-	saveToFile(uniquePath.file_string());
+	setFilename(uniquePath.native());
+	saveToFile(uniquePath.native());
 }