Update hunter (#17)

* Update outcome and hunter

Author: kamilsa

.github/workflows/ci.yml

@@ -27,18 +27,18 @@ jobs:
           key: ${{ github.job }}-${{ env.CACHE_VERSION }}
       - name: build
         env:
-          DEVELOPER_DIR: /Applications/Xcode_11.7.app/Contents/Developer
+          DEVELOPER_DIR: /Applications/Xcode_13.3.app/Contents/Developer
         run: ./scripts/build.sh
 
   Linux:
     strategy:
       fail-fast: false
       matrix:
         options:
-          - name: "Linux: gcc-9"
-            run: ./scripts/build.sh -DCMAKE_CXX_COMPILER=g++-9
-          - name: "Linux: clang-10"
-            run: ./scripts/build.sh -DCMAKE_CXX_COMPILER=clang++-10
+          - name: "Linux: gcc-12"
+            run: ./scripts/build.sh -DCMAKE_CXX_COMPILER=g++-12
+          - name: "Linux: clang-14"
+            run: ./scripts/build.sh -DCMAKE_CXX_COMPILER=clang++
     name: "${{ matrix.options.name }}"
     runs-on: ubuntu-latest
     steps:

CMakeLists.txt

@@ -8,8 +8,8 @@ cmake_minimum_required(VERSION 3.12)
 include(${CMAKE_CURRENT_LIST_DIR}/cmake/HunterGate.cmake)
 
 HunterGate(
-    URL https://github.com/soramitsu/soramitsu-hunter/archive/tags/v0.23.257-soramitsu17.tar.gz
-    SHA1 c7ccd337314b27485b75d0f0f5d5b42e7e3c2629
+    URL  "https://github.com/soramitsu/soramitsu-hunter/archive/v0.23.257-soramitsu42.tar.gz"
+    SHA1 "6f54ad82c2322ff0e234ab96a44a12da1478f1be"
 )
 
 project(Scale LANGUAGES CXX VERSION 1.0.0)

docker/ci.Dockerfile

@@ -18,12 +18,12 @@ RUN apt-get update && \
 # add repos for llvm and newer gcc and install docker
 RUN apt-get update && apt-get install --no-install-recommends -y \
         build-essential \
-        gcc-9 \
-        g++-9 \
-        llvm-9-dev \
-        clang-9 \
-        clang-tidy-9 \
-        clang-format-9 \
+        gcc-12 \
+        g++-12 \
+        llvm-14-dev \
+        clang-14 \
+        clang-tidy-14 \
+        clang-format-14 \
         make \
         git \
         ccache \
@@ -47,18 +47,18 @@ RUN set -e; \
     rm -rf /tmp/sonar*
 
 # set env
-ENV LLVM_ROOT=/usr/lib/llvm-9
-ENV LLVM_DIR=/usr/lib/llvm-9/lib/cmake/llvm/
+ENV LLVM_ROOT=/usr/lib/llvm-14
+ENV LLVM_DIR=/usr/lib/llvm-14/lib/cmake/llvm/
 ENV PATH=${LLVM_ROOT}/bin:${LLVM_ROOT}/share/clang:${PATH}
-ENV CC=gcc-9
-ENV CXX=g++-9
+ENV CC=gcc-12
+ENV CXX=g++-12
 
 # set default compilers and tools
-RUN update-alternatives --install /usr/bin/python       python       /usr/bin/python3              90 && \
-    update-alternatives --install /usr/bin/clang-tidy   clang-tidy   /usr/bin/clang-tidy-9         90 && \
-    update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-9       90 && \
-    update-alternatives --install /usr/bin/clang        clang        /usr/lib/llvm-9/bin/clang-9   90 && \
-    update-alternatives --install /usr/bin/clang++      clang++      /usr/bin/clang++-9            90 && \
-    update-alternatives --install /usr/bin/gcc          gcc          /usr/bin/gcc-9                90 && \
-    update-alternatives --install /usr/bin/g++          g++          /usr/bin/g++-9                90 && \
-    update-alternatives --install /usr/bin/gcov         gcov         /usr/bin/gcov-9               90
+RUN update-alternatives --install /usr/bin/python       python       /usr/bin/python3               90 && \
+    update-alternatives --install /usr/bin/clang-tidy   clang-tidy   /usr/bin/clang-tidy-14         90 && \
+    update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-14       90 && \
+    update-alternatives --install /usr/bin/clang        clang        /usr/lib/llvm-14/bin/clang-14  90 && \
+    update-alternatives --install /usr/bin/clang++      clang++      /usr/bin/clang++-14            90 && \
+    update-alternatives --install /usr/bin/gcc          gcc          /usr/bin/gcc-12                90 && \
+    update-alternatives --install /usr/bin/g++          g++          /usr/bin/g++-12                90 && \
+    update-alternatives --install /usr/bin/gcov         gcov         /usr/bin/gcov-12               90

include/scale/outcome/outcome.hpp

@@ -25,6 +25,14 @@ using result = basic_result<R, S, NoValuePolicy>;
 
 } // namespace scale::outcome
 
-#define OUTCOME_TRY(...) BOOST_OUTCOME_TRY(__VA_ARGS__)
+// To define OUTCOME_TRY macro, we will need to create OUTCOME_TRY_1 and
+// OUTCOME_TRY_2 depending on number of arguments
+#define OUTCOME_TRY_1(...) BOOST_OUTCOME_TRY(__VA_ARGS__)
+#define OUTCOME_TRY_2(...) BOOST_OUTCOME_TRY(auto __VA_ARGS__)
+
+// trick from https://stackoverflow.com/a/11763277 to overload OUTCOME_TRY
+#define GET_MACRO(_1, _2, NAME, ...) NAME
+#define OUTCOME_TRY(...) \
+  GET_MACRO(__VA_ARGS__, OUTCOME_TRY_2, OUTCOME_TRY_1)(__VA_ARGS__)
 
 #endif // SCALE_OUTCOME_OUTCOME

include/scale/scale_decoder_stream.hpp

@@ -7,7 +7,9 @@
 #define SCALE_CORE_SCALE_SCALE_DECODER_STREAM_HPP
 
 #include <array>
+#include <deque>
 #include <iterator>
+#include <list>
 #include <optional>
 
 #include <boost/variant.hpp>

include/scale/scale_encoder_stream.hpp

@@ -7,6 +7,7 @@
 #define SCALE_CORE_SCALE_SCALE_ENCODER_STREAM_HPP
 
 #include <deque>
+#include <list>
 #include <optional>
 
 #include <boost/variant.hpp>