Refine EOS standard C++ library

- implement a large part of example exchange contract
EOSIO · Jul 11, 2017 · c5dba14 · c5dba14
1 parent ba22200
commit c5dba14
Show file tree

Hide file tree

Showing 15 changed files with 974 additions and 1,024 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ INCLUDE( VersionMacros )
 INCLUDE( SetupTargetMacros )
 
 set( BLOCKCHAIN_NAME "Eos" )
-set( CMAKE_CXX_STANDARD 14 )
+set( CMAKE_CXX_STANDARD 17 )
 
 set( CLI_CLIENT_EXECUTABLE_NAME eos_client )
 set( GUI_CLIENT_EXECUTABLE_NAME eos )

diff --git a/contracts/currency/Makefile b/contracts/currency/Makefile
@@ -1,5 +1,5 @@
-currency.wast: currency.cpp Makefile eos.hpp currency.hpp
- /usr/local/Cellar/llvm/4.0.0_1/bin/clang-4.0 -emit-llvm --std=c++14 --target=wasm32 -nostdinc -c currency.cpp -I.. -fno-threadsafe-statics -fno-rtti -fno-exceptions -o .currency.bc
+currency.wast: currency.cpp Makefile ../eoslib/eos.hpp currency.hpp
+ /usr/local/Cellar/llvm/4.0.0_1/bin/clang-4.0 -emit-llvm -O3 --std=c++14 --target=wasm32 -c currency.cpp -I.. -fno-threadsafe-statics -fno-rtti -fno-exceptions -o .currency.bc -I /usr/local/Cellar/llvm/4.0.0_1/include/c++/v1/
  /Users/dlarimer/Downloads/llvm/build/bin/llc -asm-verbose=false .currency.bc
  /Users/dlarimer/eos/libraries/binaryen/bin/s2wasm -s 1024 .currency.s > currency.wast
  wc -l currency.wast
@@ -9,6 +9,7 @@ currency.wast: currency.cpp Makefile eos.hpp currency.hpp
  echo ')=====";' >> currency.wast.hpp
 
 # /usr/local/Cellar/llvm/4.0.0_1/bin/clang-4.0 -emit-llvm -O3 --std=c++14 --target=wasm32 -nostdinc -c currency.cpp -I.. -fno-threadsafe-statics -fno-rtti -fno-exceptions -o .currency.bc
+# /usr/local/Cellar/llvm/4.0.0_1/bin/clang-4.0 -emit-llvm --std=c++14 --target=wasm32 -nostdinc -c currency.cpp -I.. -fno-threadsafe-statics -fno-rtti -fno-exceptions -o .currency.bc
 
 test.wast: test.cpp Makefile eos.hpp
  /usr/local/Cellar/llvm/4.0.0_1/bin/clang-4.0 -emit-llvm -O3 --std=c++14 --target=wasm32 -nostdinc -c test.cpp -I.. -fno-threadsafe-statics -fno-rtti -fno-exceptions

diff --git a/contracts/currency/currency.cpp b/contracts/currency/currency.cpp
@@ -25,8 +25,8 @@ void apply_currency_transfer() {
  requireNotice( transfer.to, transfer.from );
  requireAuth( transfer.from );
 
- static CurrencyAccount from_account;
- static CurrencyAccount to_account;
+ CurrencyAccount from_account;
+ CurrencyAccount to_account;
  Db::get( transfer.from, NAME("account"), from_account );
  Db::get( transfer.to, NAME("account"), to_account );
 

diff --git a/contracts/currency/currency.hpp b/contracts/currency/currency.hpp
@@ -1,4 +1,4 @@
-#include "eos.hpp"
+#include <eoslib/eos.hpp>
 
 /**
  * Transfer requires that the sender and receiver be the first two