Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/libdcp

1 files changed, 7 insertions, 2 deletions

diff --git a/asdcplib/src/KM_fileio.cpp b/asdcplib/src/KM_fileio.cpp
index b13d8ba2..2914f982 100644
--- a/asdcplib/src/KM_fileio.cpp
+++ b/asdcplib/src/KM_fileio.cpp
@@ -1237,8 +1237,13 @@ Kumu::DirScanner::GetNext (char* filename)
 	if (_iterator == boost::filesystem::directory_iterator()) {
 		return RESULT_ENDOFFILE;
 	}
-	
-	strncpy (filename, boost::filesystem::path(*_iterator).filename().generic_string().c_str(), MaxFilePath);
+
+#if BOOST_FILESYSTEM_VERSION == 3	
+	std::string f = boost::filesystem::path(*_iterator).filename().generic_string();
+#else
+	std::string f = boost::filesystem::path(*_iterator).filename();
+#endif	
+	strncpy (filename, f.c_str(), MaxFilePath);
 	++_iterator;
 	return RESULT_OK;
 }