use boost 1.73

mbonani · Oct 13, 2020 · 43189ea · 43189ea
1 parent aee313f
commit 43189ea
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 20 deletions.
diff --git a/Brewfile b/Brewfile
@@ -3,4 +3,5 @@ brew 'cmake'
 brew 'ccache'
 brew 'python3'
 brew 'imagemagick'
-brew 'p7zip'
+brew 'p7zip'
+brew 'boost'
diff --git a/CMakeModules/FindBoost.cmake b/CMakeModules/FindBoost.cmake
@@ -1142,7 +1142,7 @@ else()
   # _Boost_COMPONENT_HEADERS.  See the instructions at the top of
   # _Boost_COMPONENT_DEPENDENCIES.
   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
-    "1.72.0" "1.72" "1.70.0" "1.70" "1.69.0" "1.69"
+    "1.74.0" "1.74" "1.73.0" "1.73" "1.72.0" "1.72" "1.70.0" "1.70" "1.69.0" "1.69"
     "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
     "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
     "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"

diff --git a/CMakeModules/boost.cmake b/CMakeModules/boost.cmake
@@ -1,15 +1,15 @@
 if (NOT BUILD_SHARED_LIBS)
     set(Boost_USE_STATIC_LIBS   ON)
 endif()
-find_package(Boost 1.72 COMPONENTS chrono system filesystem thread regex date_time program_options OPTIONAL_COMPONENTS python27)
+find_package(Boost 1.73 COMPONENTS chrono system filesystem thread regex date_time program_options OPTIONAL_COMPONENTS python27)
 add_definitions(-DBOOST_ALL_NO_LIB)
 if(WIN32)
     add_definitions(-DBOOST_USE_WINDOWS_H)
 endif()
 if(NOT WIN32 AND NOT Boost_FOUND)
     include( ExternalProject )
-    set( boost_URL "http://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.gz" )
-    set( boost_SHA256 "c66e88d5786f2ca4dbebb14e06b566fb642a1a6947ad8cc9091f9f445134143f" )
+    set( boost_URL "http://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.gz" )
+    set( boost_SHA256 "9995e192e68528793755692917f9eb6422f3052a53c5e13ba278a228af6c7acf" )
     set( boost_bootstrap ./bootstrap.sh)
     set( boost_b2 ./b2 )
     set( boost_INSTALL ${CMAKE_BINARY_DIR}/third_party/boost )

diff --git a/aseba/thymio-device-manager/serialacceptor_osx.cpp b/aseba/thymio-device-manager/serialacceptor_osx.cpp
@@ -1,7 +1,7 @@
 #include "serialacceptor.h"
 #include <algorithm>
 #include <boost/asio.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/beast/core/bind_handler.hpp>
 #include "log.h"
 

diff --git a/aseba/thymio-device-manager/serialacceptor_udev.cpp b/aseba/thymio-device-manager/serialacceptor_udev.cpp
@@ -1,7 +1,7 @@
 #include "serialacceptor.h"
 #include <algorithm>
 #include <boost/asio.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/beast/core/bind_handler.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/scope_exit.hpp>

diff --git a/aseba/thymio-device-manager/serialacceptor_win32.cpp b/aseba/thymio-device-manager/serialacceptor_win32.cpp
@@ -2,7 +2,7 @@
 #include <algorithm>
 #include <charconv>
 #include <boost/asio.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/beast/core/bind_handler.hpp>
 #include "log.h"
 

diff --git a/aseba/thymio-device-manager/system_sleep_manager.h b/aseba/thymio-device-manager/system_sleep_manager.h
@@ -2,7 +2,7 @@
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/deadline_timer.hpp>
 #include <vector>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/chrono.hpp>
 
 #ifdef __APPLE__

diff --git a/aseba/thymio-device-manager/usbdevice.h b/aseba/thymio-device-manager/usbdevice.h
@@ -7,7 +7,7 @@
 #include <boost/beast/core/bind_handler.hpp>
 #include <boost/beast/core/detail/type_traits.hpp>
 #include <boost/beast/core.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <map>
 
 // Include asio before libusb !

diff --git a/aseba/thymio-device-manager/wireless_configurator_service.cpp b/aseba/thymio-device-manager/wireless_configurator_service.cpp
@@ -24,12 +24,12 @@ void wireless_configurator_service::enable() {
 
 #ifdef MOBSYA_TDM_ENABLE_SERIAL
     auto& service = boost::asio::use_service<serial_acceptor_service>(this->m_ctx);
-    service.device_unplugged.connect(boost::bind(&wireless_configurator_service::device_unplugged, this, _1));
+    service.device_unplugged.connect(boost::bind(&wireless_configurator_service::device_unplugged, this, boost::placeholders::_1));
 #endif
 
 #ifdef MOBSYA_TDM_ENABLE_USB
     auto& service = boost::asio::use_service<usb_acceptor_service>(this->m_ctx);
-    service.device_unplugged.connect(boost::bind(&wireless_configurator_service::device_unplugged, this, _1));
+    service.device_unplugged.connect(boost::bind(&wireless_configurator_service::device_unplugged, this, boost::placeholders::_1));
 #endif
 }
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -25,7 +25,7 @@ variables:
 - name: vpl3_url
   value: "https://github.com/Mobsya/ci-data/releases/download/data/vpl3-thymio-suite.tar.gz"
 - name: vcpkg_commit
-  value: "c4f0372c638831d8d524feb1039611852eca6512"
+  value: "cccef600decd1091a20a0b4d8a2e61f7041eb686"
 - name: visual_bootstrapper
   value: "https://github.com/Mobsya/ci-data/releases/download/data/vs_enterprise.exe"
 
@@ -211,11 +211,6 @@ jobs:
       brew switch qt 5.13.2 
     displayName: 'Setting Qt version to 5.13.2'
 
-  - script: |
-      brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/ae73ba09216a7f8b2c0503e57221db020bcd3471/Formula/boost.rb
-      brew switch boost 1.72.0
-    displayName: 'Setting Boost version to 1.72.0'
-
   - script: |
       brew uninstall openssl; brew uninstall openssl; brew install https://github.com/tebelorg/Tump/releases/download/v1.0.0/openssl.rb
       brew info openssl

diff --git a/flatpak/org.mobsya.ThymioSuite.json b/flatpak/org.mobsya.ThymioSuite.json
@@ -50,8 +50,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url":  "http://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.gz",
-                    "sha256": "c66e88d5786f2ca4dbebb14e06b566fb642a1a6947ad8cc9091f9f445134143f"
+                    "url":  "http://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.gz",
+                    "sha256": "9995e192e68528793755692917f9eb6422f3052a53c5e13ba278a228af6c7acf"
                 }
             ],
             "buildsystem": "simple",