diff src/vamp-hostsdk/PluginLoader.cpp @ 477:628a5b8ff634

Revert to C++98 -- this library is not supposed to use C++11
author Chris Cannam
date Fri, 18 Nov 2016 14:02:49 +0000
parents 0545cd3f1738
children 762b79b49c31
line wrap: on
line diff
--- a/src/vamp-hostsdk/PluginLoader.cpp	Fri Nov 18 12:53:21 2016 +0000
+++ b/src/vamp-hostsdk/PluginLoader.cpp	Fri Nov 18 14:02:49 2016 +0000
@@ -213,11 +213,13 @@
 PluginLoader::PluginKeyList
 PluginLoader::Impl::listPlugins() 
 {
-    if (!m_allPluginsEnumerated) enumeratePlugins({});
+    if (!m_allPluginsEnumerated) enumeratePlugins(Enumeration());
 
     vector<PluginKey> plugins;
-    for (const auto &mi: m_pluginLibraryNameMap) {
-        plugins.push_back(mi.first);
+    for (map<PluginKey, string>::const_iterator i =
+             m_pluginLibraryNameMap.begin();
+         i != m_pluginLibraryNameMap.end(); ++i) {
+        plugins.push_back(i->first);
     }
 
     return plugins;
@@ -259,10 +261,11 @@
             std::cerr << "WARNING: Vamp::HostExt::PluginLoader: "
                       << "Invalid plugin key \"" << enumeration.key
                       << "\" in enumerate" << std::endl;
-            return {};
+            return vector<string>();
         }
         filter.type = Files::Filter::Matching;
-        filter.libraryNames = { libraryName };
+        filter.libraryNames.clear();
+        filter.libraryNames.push_back(libraryName);
         break;
     }