git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index a0158a0016c22dc7fceb1c732acce74bbc68f13d..9c0987397d049453923354ad3a0259f47c030af7 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -40,7 +40,7 @@
 #include <tbb/concurrent_queue.h>\r
 \r
 #include <boost/timer.hpp>\r
-#include <boost/range/algorithm/rotate.hpp>\r
+#include <boost/range/algorithm.hpp>\r
 \r
 #include <memory>\r
 #include <array>\r
@@ -154,10 +154,7 @@ public:
                enable_video_output();\r
                                                \r
                int n = 0;\r
-               std::generate(reserved_frames_.begin(), reserved_frames_.end(), [&]\r
-               {\r
-                       return std::make_shared<blue_dma_buffer>(format_desc_.size, n++);\r
-               });\r
+               boost::range::generate(reserved_frames_, [&]{return std::make_shared<blue_dma_buffer>(format_desc_.size, n++);});\r
        }\r
 \r
        ~bluefish_consumer()\r
@@ -218,9 +215,9 @@ public:
                if(!frame->image_data().empty())\r
                {\r
                        if(key_only_)                                           \r
-                               fast_memshfl(reserved_frames_.front()->image_data(), frame->image_data().begin(), frame->image_data().size(), 0x0F0F0F0F, 0x0B0B0B0B, 0x07070707, 0x03030303);\r
+                               fast_memshfl(reserved_frames_.front()->image_data(), std::begin(frame->image_data()), frame->image_data().size(), 0x0F0F0F0F, 0x0B0B0B0B, 0x07070707, 0x03030303);\r
                        else\r
-                               fast_memcpy(reserved_frames_.front()->image_data(), frame->image_data().begin(), frame->image_data().size());\r
+                               fast_memcpy(reserved_frames_.front()->image_data(), std::begin(frame->image_data()), frame->image_data().size());\r
                }\r
                else\r
                        fast_memclr(reserved_frames_.front()->image_data(), reserved_frames_.front()->image_size());\r
@@ -263,7 +260,7 @@ public:
                                CASPAR_LOG(warning) << print() << TEXT(" render_buffer_update failed.");\r
                }\r
 \r
-               std::rotate(reserved_frames_.begin(), reserved_frames_.begin() + 1, reserved_frames_.end());\r
+               boost::range::rotate(reserved_frames_, std::begin(reserved_frames_)+1);\r
        }\r
 \r
        void encode_hanc(BLUE_UINT32* hanc_data, void* audio_data, size_t audio_samples, size_t audio_nchannels)\r