Merge pull request EOSIO#150 from EOSIO/fix/quick_fixes

quick fixes
taokayan · Oct 11, 2018 · d86775e · d86775e
2 parents 10e40ff + c1bbc63
commit d86775e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/eosio_llvm b/eosio_llvm
diff --git a/examples/abigen_test/abitest.cpp b/examples/abigen_test/abitest.cpp
@@ -15,11 +15,12 @@ namespace test {
    };
 
    struct testb {
+      float field;
       void printll() { print("testb"); }
    };
 
    // mark this struct as an action and specify the name explicitly
-   struct [[ eosio::action("testc") ]] test_c : testb {
+   struct [[ using eosio: action("testc"), contract("abitest") ]] test_c : testb {
       uint64_t num;
    };
 }
@@ -32,6 +33,7 @@ CONTRACT abitest : public eosio::contract {
       [[ eosio::action("testacta") ]]
       void testact_a( name user, const std::string& s, std::vector<int>& c, std::vector<std::string> sv ) {
          print( "Hello, ", name{user} );
+         symbol sym("TEST", 4);
       }
 
       // mark this method as an action
@@ -59,6 +61,6 @@ typedef eosio::multi_index< "testtab"_n,  abitest::testtable > testtable_t;
 typedef eosio::multi_index< "testtaba"_n, abitest::testtable > testtable_a_t;
 typedef eosio::multi_index< "testtab2"_n, abitest::test_table2 > testtable2_t;
 
-// NOTE THIS IS A TEST CONTRACT AND WILL NOT WORK CORRECTLY, the action `testa` will not be in the dispatcher of this macro
 extern "C" 
-void apply(uint64_t, uint64_t, uint64_t){}
+void apply(uint64_t, uint64_t, uint64_t){
+}
diff --git a/libraries/eosiolib/symbol.hpp b/libraries/eosiolib/symbol.hpp
@@ -176,6 +176,10 @@ namespace eosio {
       : value( (sc.raw() << 8) | static_cast<uint64_t>(precision) )
       {}
 
+      constexpr symbol( std::string_view ss, uint8_t precision )
+      : value( (symbol_code(ss).raw() << 8)  | static_cast<uint64_t>(precision) )
+      {}
+
       /**
        * Is this symbol valid
        */

diff --git a/libraries/libc++/CMakeLists.txt b/libraries/libc++/CMakeLists.txt
@@ -1,6 +1,6 @@
 SET(SRC_FILENAMES algorithm.cpp any.cpp bind.cpp condition_variable.cpp functional.cpp
                   future.cpp ios.cpp iostream.cpp locale.cpp memory.cpp mutex.cpp new.cpp optional.cpp
-                  regex.cpp stdexcept.cpp string.cpp strstream.cpp system_error.cpp
+                  regex.cpp stdexcept.cpp string.cpp strstream.cpp system_error.cpp exception.cpp
                   typeinfo.cpp utility.cpp valarray.cpp variant.cpp vector.cpp eosio.cpp)
 
 SET(SRC_FILES "")

diff --git a/libraries/libc++/libcxx b/libraries/libc++/libcxx
+0 −1		include/ios
+1 −1		include/iostream
+2 −0		include/regex
+1 −0		include/sstream
+1 −0		include/strstream
+4 −0		src/locale.cpp
+3 −1		src/support/runtime/exception_fallback.ipp