comparison vamp-support/PreservingPluginHandleMapper.h @ 280:4b581a498981

Use override throughout

  */
 class PreservingPluginHandleMapper : public PluginHandleMapper
 {
     class NotAPlugin : public Vamp::Plugin
     {
-        #define STR(x) std::string get##x() const { return "not-a-plugin"; }
+        #define STR(x) std::string get##x() const override { return "not-a-plugin"; }
     public:
         STR(Identifier) STR(Name) STR(Description) STR(Maker) STR(Copyright)
-        int getPluginVersion() const { return 1; }
-        bool initialise(size_t, size_t, size_t) { return false; }
-        void reset() { }
-        InputDomain getInputDomain() const { return TimeDomain; }
-        OutputList getOutputDescriptors() const { return {}; }
-        FeatureSet process(const float *const *, Vamp::RealTime) { return {}; }
-        FeatureSet getRemainingFeatures() { return {}; }
+        int getPluginVersion() const override { return 1; }
+        bool initialise(size_t, size_t, size_t) override { return false; }
+        void reset() override { }
+        InputDomain getInputDomain() const override { return TimeDomain; }
+        OutputList getOutputDescriptors() const override { return {}; }
+        FeatureSet process(const float *const *, Vamp::RealTime) override { return {}; }
+        FeatureSet getRemainingFeatures() override { return {}; }
         NotAPlugin() : Plugin(1) { }
     };
     
 public:
     PreservingPluginHandleMapper() :

 
     virtual ~PreservingPluginHandleMapper() {
         delete m_plugin;
     }
 
-    virtual Handle pluginToHandle(Vamp::Plugin *p) const noexcept {
+    Handle pluginToHandle(Vamp::Plugin *p) const noexcept override {
         if (!p) return INVALID_HANDLE;
 	if (p == m_plugin) return m_handle;
 	else {
 	    std::cerr << "PreservingPluginHandleMapper: p = " << p
 		      << " differs from saved m_plugin " << m_plugin

 		      << std::endl;
             return INVALID_HANDLE;
 	}
     }
 
-    virtual Vamp::Plugin *handleToPlugin(Handle h) const noexcept {
+    Vamp::Plugin *handleToPlugin(Handle h) const noexcept override {
         if (h == INVALID_HANDLE) return nullptr;
         if (h == m_handle) return m_plugin;
         if (m_handle != INVALID_HANDLE) {
             std::cerr << "PreservingPluginHandleMapper: m_handle " << m_handle
                       << " is non-null when a new handle (" << h

         // rules or the C++ object memory model.
         m_plugin = new NotAPlugin();
         return m_plugin;
     }
 
-    virtual const std::shared_ptr<PluginOutputIdMapper> pluginToOutputIdMapper
-    (Vamp::Plugin *p) const noexcept {
+    const std::shared_ptr<PluginOutputIdMapper> pluginToOutputIdMapper
+    (Vamp::Plugin *p) const noexcept override {
         if (!p) return {};
         return m_omapper;
     }
         
-    virtual const std::shared_ptr<PluginOutputIdMapper> handleToOutputIdMapper
-    (Handle h) const noexcept {
+    const std::shared_ptr<PluginOutputIdMapper> handleToOutputIdMapper
+    (Handle h) const noexcept override {
         if (h == INVALID_HANDLE) return {};
         return m_omapper;
     }
     
 private: