Refactored to use range based for instead of BOOST_FOREACH

[casparcg] / shell / main.cpp

diff --git a/shell/main.cpp b/shell/main.cpp
index 2d462a463cafacda19c02249c8e08b9e57ae807a..5a850369089350aa5bf986ea4131cdc11f4aba69 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -25,6 +25,9 @@
 
 #include "stdafx.h"
 
+#include <tbb/task_scheduler_init.h>
+#include <tbb/task_scheduler_observer.h>
+
 #ifdef _DEBUG
        #define _CRTDBG_MAP_ALLOC
        #include <stdlib.h>
@@ -58,12 +61,8 @@
 #include <common/os/windows/current_version.h>
 #include <common/os/windows/system_info.h>
 
-#include <tbb/task_scheduler_init.h>
-#include <tbb/task_scheduler_observer.h>
-
 #include <boost/property_tree/detail/file_parser_error.hpp>
 #include <boost/property_tree/xml_parser.hpp>
-#include <boost/foreach.hpp>
 #include <boost/locale.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string/predicate.hpp>
@@ -71,6 +70,8 @@
 #include <boost/thread/future.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
 
+#include <future>
+
 #include <signal.h>
 
 using namespace caspar;
@@ -147,12 +148,12 @@ void print_info()
        CASPAR_LOG(info) << system_product_name();
        
        CASPAR_LOG(info) << L"Decklink " << decklink::version();
-       BOOST_FOREACH(auto device, decklink::device_list())
-               CASPAR_LOG(info) << L" - " << device;   
+       for (auto device : decklink::device_list())
+               CASPAR_LOG(info) << L" - " << device;
                
        CASPAR_LOG(info) << L"Bluefish " << bluefish::version();
-       BOOST_FOREACH(auto device, bluefish::device_list())
-               CASPAR_LOG(info) << L" - " << device;   
+       for (auto device : bluefish::device_list())
+               CASPAR_LOG(info) << L" - " << device;
        
        CASPAR_LOG(info) << L"Flash "                   << flash::version();
        CASPAR_LOG(info) << L"FreeImage "               << image::version();
@@ -181,7 +182,7 @@ LONG WINAPI UserUnhandledExceptionFilter(EXCEPTION_POINTERS* info)
        return EXCEPTION_CONTINUE_EXECUTION;
 }
 
-void do_run(server& caspar_server, boost::promise<bool>& shutdown_server_now)
+void do_run(server& caspar_server, std::promise<bool>& shutdown_server_now)
 {
        // Create a dummy client which prints amcp responses to console.
        auto console_client = spl::make_shared<IO::ConsoleClientInfo>();
@@ -283,8 +284,8 @@ void do_run(server& caspar_server, boost::promise<bool>& shutdown_server_now)
 
 bool run()
 {
-       boost::promise<bool> shutdown_server_now;
-       boost::unique_future<bool> shutdown_server = shutdown_server_now.get_future();
+       std::promise<bool> shutdown_server_now;
+       std::future<bool> shutdown_server = shutdown_server_now.get_future();
 
        // Create server object which initializes channels, protocols and controllers.
        server caspar_server(shutdown_server_now);
@@ -385,7 +386,7 @@ int main(int argc, wchar_t* argv[])
                print_info();
                
                std::wstringstream str;
-               boost::property_tree::xml_writer_settings<wchar_t> w(' ', 3);
+               boost::property_tree::xml_writer_settings<std::wstring> w(' ', 3);
                boost::property_tree::write_xml(str, env::properties(), w);
                CASPAR_LOG(info) << L"casparcg.config:\n-----------------------------------------\n" << str.str().c_str() << L"-----------------------------------------";