From c1cec6e9a42d8b95d8630fb7c3dd81aeffba44f0 Mon Sep 17 00:00:00 2001 From: Bucky Kittinger Date: Wed, 7 Jun 2023 17:18:48 -0400 Subject: [PATCH 1/3] small change --- contract/include/evm_runtime/evm_contract.hpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/contract/include/evm_runtime/evm_contract.hpp b/contract/include/evm_runtime/evm_contract.hpp index e1893d8e..33151344 100644 --- a/contract/include/evm_runtime/evm_contract.hpp +++ b/contract/include/evm_runtime/evm_contract.hpp @@ -148,7 +148,6 @@ class [[eosio::contract]] evm_contract : public contract } // namespace evm_runtime -namespace std { template DataStream& operator<<(DataStream& ds, const std::basic_string& bs) { @@ -157,4 +156,3 @@ DataStream& operator<<(DataStream& ds, const std::basic_string& bs) ds.write((const char*)bs.data(), bs.size()); return ds; } -} // namespace std From 045fd261fde43d97a67d60f5ac51e53a2ac2f734 Mon Sep 17 00:00:00 2001 From: Bucky Kittinger Date: Wed, 7 Jun 2023 18:18:49 -0400 Subject: [PATCH 2/3] update workflow to use cdt 4.0.0 --- .github/workflows/contract.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/contract.yml b/.github/workflows/contract.yml index 1e2faa4f..cc1bf830 100644 --- a/.github/workflows/contract.yml +++ b/.github/workflows/contract.yml @@ -53,7 +53,7 @@ jobs: with: owner: AntelopeIO repo: cdt - target: 'v3.1.0' + target: 'v4.0.0' prereleases: false file: 'cdt_.*amd64.deb' token: ${{ secrets.GITHUB_TOKEN }} From 96652a35b3cf2085684ec3477c7db772899c319a Mon Sep 17 00:00:00 2001 From: Bucky Kittinger Date: Thu, 8 Jun 2023 18:18:20 -0400 Subject: [PATCH 3/3] update to still allow for v3.1.0 CDT to build --- contract/include/evm_runtime/evm_contract.hpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contract/include/evm_runtime/evm_contract.hpp b/contract/include/evm_runtime/evm_contract.hpp index 33151344..73ac92a5 100644 --- a/contract/include/evm_runtime/evm_contract.hpp +++ b/contract/include/evm_runtime/evm_contract.hpp @@ -148,6 +148,10 @@ class [[eosio::contract]] evm_contract : public contract } // namespace evm_runtime +#if __eosio_cdt_major__ <= 3 +namespace std { +#endif + template DataStream& operator<<(DataStream& ds, const std::basic_string& bs) { @@ -156,3 +160,9 @@ DataStream& operator<<(DataStream& ds, const std::basic_string& bs) ds.write((const char*)bs.data(), bs.size()); return ds; } + +#if __eosio_cdt_major__ <= 3 +} +#endif + +