Changed use of microsoft specific sealed keyword to /* final */ to indicate intent

diff --git a/accelerator/cpu/image/image_mixer.h b/accelerator/cpu/image/image_mixer.h
index 22742e3ac7636c952a557a5d5a70146a880d1d62..b61f88a29f60c5db757166af494eed4586378d26 100644 (file)
--- a/accelerator/cpu/image/image_mixer.h
+++ b/accelerator/cpu/image/image_mixer.h
@@ -22,7 +22,7 @@ namespace caspar { namespace accelerator { namespace cpu {
        
 typedef std::vector<uint8_t, tbb::cache_aligned_allocator<uint8_t>> buffer;
 
-class image_mixer sealed : public core::image_mixer
+class image_mixer /* final */ : public core::image_mixer
 {
 public:
 

diff --git a/accelerator/ogl/image/image_kernel.h b/accelerator/ogl/image/image_kernel.h
index bf5eedd0908d2a05d65bc6423915db7651aae0d9..859d2553517d0dbb4e7ebb14c3b12380c513a21b 100644 (file)
--- a/accelerator/ogl/image/image_kernel.h
+++ b/accelerator/ogl/image/image_kernel.h
@@ -42,7 +42,7 @@ struct keyer_def
 };
 typedef enum_class<keyer_def> keyer;
 
-struct draw_params sealed
+struct draw_params /* final */
 {
        core::pixel_format_desc                                         pix_desc;
        std::vector<spl::shared_ptr<class texture>>     textures;
@@ -62,7 +62,7 @@ struct draw_params sealed
        }
 };
 
-class image_kernel sealed
+class image_kernel /* final */
 {
        image_kernel(const image_kernel&);
        image_kernel& operator=(const image_kernel&);

diff --git a/accelerator/ogl/image/image_mixer.h b/accelerator/ogl/image/image_mixer.h
index 12b3105bb27cc7a7752da6866f374a936463a22a..5d225278a9b39f084cd6abc9e968827d0a70480b 100644 (file)
--- a/accelerator/ogl/image/image_mixer.h
+++ b/accelerator/ogl/image/image_mixer.h
@@ -39,7 +39,7 @@ FORWARD2(caspar, core, struct frame_transform);
 
 namespace caspar { namespace accelerator { namespace ogl {
        
-class image_mixer sealed : public core::image_mixer
+class image_mixer /* final */ : public core::image_mixer
 {
        image_mixer(const image_mixer&);
        image_mixer& operator=(const image_mixer&);

diff --git a/accelerator/ogl/util/buffer.h b/accelerator/ogl/util/buffer.h
index 2b2c00863bd3d5136d8690142d7081cc24952461..2f6b7826dc47489317fb2ca7262e2549ed0070ae 100644 (file)
--- a/accelerator/ogl/util/buffer.h
+++ b/accelerator/ogl/util/buffer.h
@@ -28,7 +28,7 @@
 
 namespace caspar { namespace accelerator { namespace ogl {
                        
-class buffer sealed
+class buffer /* final */
 {
        buffer(const buffer&);
        buffer& operator=(const buffer&);

diff --git a/accelerator/ogl/util/device.h b/accelerator/ogl/util/device.h
index 7577285fd4389cc94d71c2c21312b86e484a177c..b837f39aa9273b17e279f8234979752c80763ab0 100644 (file)
--- a/accelerator/ogl/util/device.h
+++ b/accelerator/ogl/util/device.h
@@ -30,7 +30,7 @@ namespace caspar { namespace accelerator { namespace ogl {
 
 class texture;
 
-class device sealed : public std::enable_shared_from_this<device>
+class device /* final */ : public std::enable_shared_from_this<device>
 {      
        device(const device&);
        device& operator=(const device&);

diff --git a/accelerator/ogl/util/shader.h b/accelerator/ogl/util/shader.h
index a2ec9ecf8bf3adad067edb8ee9858fc09ea8d39d..20f1f4904f9e3ac31e451020ede5f7a79e2c2f3c 100644 (file)
--- a/accelerator/ogl/util/shader.h
+++ b/accelerator/ogl/util/shader.h
@@ -27,7 +27,7 @@
 
 namespace caspar { namespace accelerator { namespace ogl {
                
-class shader sealed
+class shader /* final */
 {
        shader(const shader&);
        shader& operator=(const shader&);

diff --git a/accelerator/ogl/util/texture.h b/accelerator/ogl/util/texture.h
index c9d2762d59b6ab5ce75c14fad798dda0ffc744ff..66405a34feb1bcdd1fee9d35c1eecd5e9e0103d0 100644 (file)
--- a/accelerator/ogl/util/texture.h
+++ b/accelerator/ogl/util/texture.h
@@ -30,7 +30,7 @@ namespace caspar { namespace accelerator { namespace ogl {
 class buffer;
 class device;
 
-class texture sealed
+class texture /* final */
 {
        texture(const texture&);
        texture& operator=(const texture&);

diff --git a/common/array.h b/common/array.h
index 8ae95bc000b437ec8d33636eb40b96f387f60a1e..bf0b1fcf1c17f64c1d69745d572df4814818d79a 100644 (file)
--- a/common/array.h
+++ b/common/array.h
@@ -11,7 +11,7 @@
 namespace caspar {
        
 template<typename T>
-class array sealed
+class array /* final */
 {
        array(const array<std::uint8_t>&);
        array& operator=(const array<std::uint8_t>&);
@@ -77,7 +77,7 @@ private:
 };
 
 template<typename T>
-class array<const T> sealed
+class array<const T> /* final */
 {
 public:
 

diff --git a/common/executor.h b/common/executor.h
index 7f781cc64540688e95dcd63554443d5cd8174278..2e9f0bbccbd0d6f6ec447df9dabb803085ef6ce1 100644 (file)
--- a/common/executor.h
+++ b/common/executor.h
@@ -53,7 +53,7 @@ struct task_priority_def
 };
 typedef enum_class<task_priority_def> task_priority;
 
-class executor sealed
+class executor /* final */
 {      
        executor(const executor&);
        executor& operator=(const executor&);

diff --git a/common/reactive.h b/common/reactive.h
index 0428bdbdb85dba0103862ac2a05040f91bfde3a1..d9140f6cae8167e24a0e289fc890f2d588249871 100644 (file)
--- a/common/reactive.h
+++ b/common/reactive.h
@@ -181,7 +181,7 @@ private:
 };
 
 template<typename I, typename O = I>
-class basic_subject_impl : public subject<I, O>
+class basic_subject_impl /* final */ : public subject<I, O>
 {      
     template <typename, typename> friend class basic_subject_impl;
 

diff --git a/core/consumer/output.h b/core/consumer/output.h
index 00e69cbc5440cc60009d12e098028bf3adcf6274..02e021f8c939c5e32c1fdac740ad182a04e8dac9 100644 (file)
--- a/core/consumer/output.h
+++ b/core/consumer/output.h
@@ -34,7 +34,7 @@ FORWARD2(caspar, diagnostics, class graph);
 
 namespace caspar { namespace core {
        
-class output sealed : public monitor::observable
+class output /* final */ : public monitor::observable
 {
        output(const output&);
        output& operator=(const output&);

diff --git a/core/frame/draw_frame.h b/core/frame/draw_frame.h
index 672097c13af83c758e87bed7c95d6151e3bb7668..af32f26a971d7c09b331c9641d62fb3356f49012 100644 (file)
--- a/core/frame/draw_frame.h
+++ b/core/frame/draw_frame.h
@@ -33,7 +33,7 @@ namespace caspar { namespace core {
        
 struct frame_transform;
 
-class draw_frame sealed
+class draw_frame /* final */
 {
 public:                
        // Static Members

diff --git a/core/frame/frame.h b/core/frame/frame.h
index 882ffad8f91db9dc14be2cd5d24b9c7b0e92e03e..803f0f586213249b059f61452a329d3567114777 100644 (file)
--- a/core/frame/frame.h
+++ b/core/frame/frame.h
@@ -24,7 +24,7 @@ namespace caspar { namespace core {
 typedef std::vector<int32_t, tbb::cache_aligned_allocator<int32_t>> audio_buffer;
 class frame_geometry;
 
-class mutable_frame sealed
+class mutable_frame /* final */
 {
        mutable_frame(const mutable_frame&);
        mutable_frame& operator=(const mutable_frame&);
@@ -71,7 +71,7 @@ private:
        spl::unique_ptr<impl> impl_;
 };
 
-class const_frame sealed
+class const_frame /* final */
 {
 public:        
 

diff --git a/core/frame/frame_transform.h b/core/frame/frame_transform.h
index 8b82f3d8445c134ca93a496c525772e024275529..a109f429eec4f5d44a17798f46319da4b04530b1 100644 (file)
--- a/core/frame/frame_transform.h
+++ b/core/frame/frame_transform.h
@@ -28,7 +28,7 @@
 
 namespace caspar { namespace core {
                        
-struct levels sealed
+struct levels /* final */
 {
        levels() 
                : min_input(0.0)
@@ -45,7 +45,7 @@ struct levels sealed
        double max_output;
 };
 
-struct image_transform sealed
+struct image_transform /* final */
 {
 public:
        image_transform();
@@ -74,7 +74,7 @@ public:
 bool operator==(const image_transform& lhs, const image_transform& rhs);
 bool operator!=(const image_transform& lhs, const image_transform& rhs);
 
-struct audio_transform sealed
+struct audio_transform /* final */
 {
 public:
        audio_transform();
@@ -92,7 +92,7 @@ bool operator==(const audio_transform& lhs, const audio_transform& rhs);
 bool operator!=(const audio_transform& lhs, const audio_transform& rhs);
 
 //__declspec(align(16)) 
-struct frame_transform sealed
+struct frame_transform /* final */
 {
 public:
        frame_transform();

diff --git a/core/frame/pixel_format.h b/core/frame/pixel_format.h
index a41d7228c5bc461b1fa58c2ab4a57d9ee73588d7..d98c8ba02486bb710aaaa155981883cb1eaa4748 100644 (file)
--- a/core/frame/pixel_format.h
+++ b/core/frame/pixel_format.h
@@ -50,7 +50,7 @@ struct pixel_format_def
 };
 typedef enum_class<pixel_format_def> pixel_format;
 
-struct pixel_format_desc sealed
+struct pixel_format_desc /* final */
 {
        struct plane
        {

diff --git a/core/mixer/audio/audio_mixer.h b/core/mixer/audio/audio_mixer.h
index 2d1f862bc6780cef1049d9faea819745f75023b7..ceb40136d7e3cc78fb2916f341d11e2e745d1c12 100644 (file)
--- a/core/mixer/audio/audio_mixer.h
+++ b/core/mixer/audio/audio_mixer.h
@@ -36,7 +36,7 @@ namespace caspar { namespace core {
                
 typedef std::vector<int32_t, tbb::cache_aligned_allocator<int32_t>> audio_buffer;
 
-class audio_mixer sealed : public frame_visitor
+class audio_mixer /* final */ : public frame_visitor
 {
        audio_mixer(const audio_mixer&);
        audio_mixer& operator=(const audio_mixer&);

diff --git a/core/mixer/mixer.h b/core/mixer/mixer.h
index d580fae4dcf90dc7a561e7dffcc1f9f5096ff436..2fcdbc6f3e194d8bc1bccd367e0f644d75fe3d71 100644 (file)
--- a/core/mixer/mixer.h
+++ b/core/mixer/mixer.h
@@ -38,7 +38,7 @@ FORWARD2(caspar, diagnostics, class graph);
 
 namespace caspar { namespace core {
        
-class mixer sealed
+class mixer /* final */
 {
        mixer(const mixer&);
        mixer& operator=(const mixer&);

diff --git a/core/monitor/monitor.h b/core/monitor/monitor.h
index ba6d7af282b703fe494c5db07c12cdfd388c8a19..447ee352a342a8ea67dc7e00716e939bb677c4fd 100644 (file)
--- a/core/monitor/monitor.h
+++ b/core/monitor/monitor.h
@@ -42,7 +42,7 @@ namespace caspar { namespace monitor {
        
 // path
 
-class path sealed
+class path /* final */
 {
 public:        
 
@@ -106,7 +106,7 @@ std::ostream& operator<<(std::ostream& o, const param& p);
 
 // event
 
-class event sealed
+class event /* final */
 {      
 public:        
        
@@ -153,7 +153,7 @@ typedef reactive::observable<monitor::event>        observable;
 typedef reactive::observer<monitor::event>             observer;
 typedef reactive::subject<monitor::event>              subject;
        
-class basic_subject sealed : public reactive::subject<monitor::event>
+class basic_subject /* final */ : public reactive::subject<monitor::event>
 {          
        basic_subject(const basic_subject&);
        basic_subject& operator=(const basic_subject&);

diff --git a/core/producer/layer.h b/core/producer/layer.h
index b35bb570d629b90cbb31de793ab7740a05a10aaa..792bc4d827eeae4cfd6a4e8e1a09e61b16ec45b4 100644 (file)
--- a/core/producer/layer.h
+++ b/core/producer/layer.h
@@ -38,7 +38,7 @@ FORWARD1(boost, template<typename T> class optional);
 
 namespace caspar { namespace core {
        
-class layer sealed : public monitor::observable, public interaction_sink
+class layer /* final */ : public monitor::observable, public interaction_sink
 {
        layer(const layer&);
        layer& operator=(const layer&);

diff --git a/core/producer/stage.h b/core/producer/stage.h
index 70a5f8ad92b92883eca1aae376f75a134413dffe..4f542b6a6c9f3d09ae6f64bf4042a6ac84016637 100644 (file)
--- a/core/producer/stage.h
+++ b/core/producer/stage.h
@@ -45,7 +45,7 @@ namespace caspar { namespace core {
 
 typedef reactive::observable<std::map<int, class draw_frame>> frame_observable;
        
-class stage sealed : public monitor::observable, public frame_observable, public interaction_sink
+class stage /* final */ : public monitor::observable, public frame_observable, public interaction_sink
 {
        stage(const stage&);
        stage& operator=(const stage&);

diff --git a/core/video_channel.cpp b/core/video_channel.cpp
index 6614f48567d43cf327ac472fd5456ddd048134b9..10418e85f1a404f835d3e2d6146d354d1c06ff41 100644 (file)
--- a/core/video_channel.cpp
+++ b/core/video_channel.cpp
@@ -47,7 +47,7 @@
 
 namespace caspar { namespace core {
 
-struct video_channel::impl sealed
+struct video_channel::impl /* final */
 {
        monitor::basic_subject                                                  event_subject_;
 

diff --git a/core/video_channel.h b/core/video_channel.h
index 2390819a9b26ea3205134177fcfdf38b3c04a2f8..91379e6fc2ba5f8aac6ab143b22aa8af0007c99b 100644 (file)
--- a/core/video_channel.h
+++ b/core/video_channel.h
@@ -39,7 +39,7 @@ FORWARD2(caspar, core, class frame_factory);
 
 namespace caspar { namespace core {
        
-class video_channel sealed : public monitor::observable
+class video_channel /* final */ : public monitor::observable
 {
        video_channel(const video_channel&);
        video_channel& operator=(const video_channel&);

diff --git a/core/video_format.h b/core/video_format.h
index 0d9eee8718b85c155f9ab78b083d845561962ad3..2c3ed106f4a404ef5cdc330c64ce51c7fe6375bc 100644 (file)
--- a/core/video_format.h
+++ b/core/video_format.h
@@ -82,7 +82,7 @@ struct field_mode_def
 };
 typedef enum_class<field_mode_def> field_mode;
 
-struct video_format_desc sealed
+struct video_format_desc /* final */
 {
        video_format            format;         
 

diff --git a/shell/server.h b/shell/server.h
index 9c701f8102c101c9baf98104b3df996584cbf6dc..51c3a5a0d2a412e9afc1a2d402455215ede7ec7a 100644 (file)
--- a/shell/server.h
+++ b/shell/server.h
@@ -37,8 +37,8 @@ namespace core {
        class thumbnail_generator;
 }
 
-class server sealed : public monitor::observable
-                                       , boost::noncopyable
+class server /* final */ : public monitor::observable
+                                                , boost::noncopyable
 {
 public:
        explicit server(boost::promise<bool>& shutdown_server_now);