From 704d34b2e4cb7b7b8709fa2ed11518c3bc057ca8 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 28 Apr 2021 17:44:01 +0300
Subject: [PATCH] bls|ci: Fix C++17 build, add it to CI (#4055)

* ci: Add C++17 build

* bls: Add explicit CBLSSecretKey copy ctor and operator=
---
 .gitlab-ci.yml | 7 +++++++
 ci/matrix.sh   | 8 ++++++++
 src/bls/bls.h  | 2 ++
 3 files changed, 17 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52391aa2c2..95458e4ce6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -237,6 +237,13 @@ linux64-build:
   variables:
     BUILD_TARGET: linux64
 
+linux64_cxx17-build:
+  extends: .build-template
+  needs:
+    - x86_64-unknown-linux-gnu-debug
+  variables:
+    BUILD_TARGET: linux64_cxx17
+
 linux64_nowallet-build:
   extends:
     - .build-template
diff --git a/ci/matrix.sh b/ci/matrix.sh
index 5fe1c363ab..3ff611c36c 100755
--- a/ci/matrix.sh
+++ b/ci/matrix.sh
@@ -67,6 +67,14 @@ elif [ "$BUILD_TARGET" = "linux64" ]; then
   export PYZMQ=true
   export RUN_UNITTESTS=true
   export RUN_INTEGRATIONTESTS=true
+elif [ "$BUILD_TARGET" = "linux64_cxx17" ]; then
+  export HOST=x86_64-unknown-linux-gnu
+  export DEP_OPTS="NO_UPNP=1 DEBUG=1"
+  export BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports --enable-crash-hooks --enable-c++17"
+  export CPPFLAGS="-DDEBUG_LOCKORDER -DENABLE_DASH_DEBUG -DARENA_DEBUG"
+  export PYZMQ=true
+  export RUN_UNITTESTS=true
+  export RUN_INTEGRATIONTESTS=true
 elif [ "$BUILD_TARGET" = "linux64_nowallet" ]; then
   export HOST=x86_64-unknown-linux-gnu
   export DEP_OPTS="NO_WALLET=1"
diff --git a/src/bls/bls.h b/src/bls/bls.h
index 80f4f19f6c..47be409ad9 100644
--- a/src/bls/bls.h
+++ b/src/bls/bls.h
@@ -231,6 +231,8 @@ public:
     using CBLSWrapper::CBLSWrapper;
 
     CBLSSecretKey() {}
+    CBLSSecretKey(const CBLSSecretKey&) = default;
+    CBLSSecretKey& operator=(const CBLSSecretKey&) = default;
 
     void AggregateInsecure(const CBLSSecretKey& o);
     static CBLSSecretKey AggregateInsecure(const std::vector<CBLSSecretKey>& sks);