2.1.0: Don't use virtual for override functions.

[casparcg] / core / producer / frame_producer.cpp

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index 2312605de47367ee3ca400f862cd57375d59d537..bfc00d4e338ae4cef9c1a97386fd81364ba5d018 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -66,7 +66,7 @@ const spl::shared_ptr<frame_producer>& frame_producer::empty()
                virtual void unsubscribe(const monitor::observable::observer_ptr& o){}  \r
                virtual std::wstring name() const {return L"empty";}\r
        \r
-               virtual boost::property_tree::wptree info() const override\r
+               boost::property_tree::wptree info() const override\r
                {\r
                        boost::property_tree::wptree info;\r
                        info.add(L"type", L"empty-producer");\r
@@ -118,14 +118,14 @@ public:
                }).detach(); \r
        }\r
        \r
-       virtual draw_frame      receive(int flags) override                                                                                                                                                             {return producer_->receive(flags);}\r
-       virtual draw_frame      last_frame() const override                                                                                                                                                             {return producer_->last_frame();}\r
-       virtual std::wstring                                                                            print() const override                                                                                                                  {return producer_->print();}\r
-       virtual std::wstring                                                                            name() const override                                                                                                                   {return producer_->name();}\r
-       virtual boost::property_tree::wptree                                            info() const override                                                                                                                   {return producer_->info();}\r
-       virtual boost::unique_future<std::wstring>                                      call(const std::wstring& str) override                                                                                  {return producer_->call(str);}\r
-       virtual void                                                                                            leading_producer(const spl::shared_ptr<frame_producer>& producer) override              {return producer_->leading_producer(producer);}\r
-       virtual uint32_t                                                                                        nb_frames() const override                                                                                                              {return producer_->nb_frames();}\r
+       draw_frame      receive(int flags) override                                                                                                                                                             {return producer_->receive(flags);}\r
+       draw_frame      last_frame() const override                                                                                                                                                             {return producer_->last_frame();}\r
+       std::wstring                                                                            print() const override                                                                                                                  {return producer_->print();}\r
+       std::wstring                                                                            name() const override                                                                                                                   {return producer_->name();}\r
+       boost::property_tree::wptree                                            info() const override                                                                                                                   {return producer_->info();}\r
+       boost::unique_future<std::wstring>                                      call(const std::wstring& str) override                                                                                  {return producer_->call(str);}\r
+       void                                                                                            leading_producer(const spl::shared_ptr<frame_producer>& producer) override              {return producer_->leading_producer(producer);}\r
+       uint32_t                                                                                        nb_frames() const override                                                                                                              {return producer_->nb_frames();}\r
        virtual void subscribe(const monitor::observable::observer_ptr& o)                                                                                                                                                      {return producer_->subscribe(o);}\r
        virtual void unsubscribe(const monitor::observable::observer_ptr& o)                                                                                                                                            {return producer_->unsubscribe(o);}\r
 };\r