diff --git a/indra/llvfs/lldiriterator.cpp b/indra/llvfs/lldiriterator.cpp
index cef016e0c..fec8af6fe 100644
--- a/indra/llvfs/lldiriterator.cpp
+++ b/indra/llvfs/lldiriterator.cpp
@@ -63,10 +63,10 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask)
 	{
 		mIter = fs::directory_iterator(dir_path);
 	}
-#if BOOST_FILESYSTEM_VERSION == 2
-	catch (fs::basic_filesystem_error<fs::path>& e)
-#else
+#if BOOST_FILESYSTEM_VERSION >= 3
 	catch (fs::filesystem_error& e)
+#else
+	catch (fs::basic_filesystem_error<fs::path>& e)
 #endif
 	{
 		llerrs << e.what() << llendl;
@@ -112,10 +112,10 @@ bool LLDirIterator::Impl::next(std::string &fname)
 	while (mIter != end_itr && !found)
 	{
 		boost::smatch match;
-#if BOOST_FILESYSTEM_VERSION == 2
-		std::string name = mIter->path().filename();
-#else
+#if BOOST_FILESYSTEM_VERSION >= 3
 		std::string name = mIter->path().filename().string();
+#else
+		std::string name = mIter->path().filename();
 #endif
 		if (found = boost::regex_match(name, match, mFilterExp))
 		{