--- linuxsampler/trunk/src/db/InstrumentsDbUtilities.cpp	2017/01/16 14:08:15	3090
+++ linuxsampler/trunk/src/db/InstrumentsDbUtilities.cpp	2017/01/16 15:01:21	3091
@@ -251,7 +251,7 @@
     }
 
     StringListPtr DirectoryFinder::GetDirectories() {
-#if __cplusplus >= 201103L
+#if __cplusplus >= 201103L && !CONFIG_NO_CPP11STL
         return std::move(pDirectories);
 #else
         return pDirectories;
@@ -368,7 +368,7 @@
     }
 
     StringListPtr InstrumentFinder::GetInstruments() {
-#if __cplusplus >= 201103L
+#if __cplusplus >= 201103L && !CONFIG_NO_CPP11STL
         return std::move(pInstruments);
 #else
         return pInstruments;