Updating asset and symbol

contracts/CMakeLists.txt

@@ -2,7 +2,7 @@
 # these directories go as -isystem <dir> to avoid warnings from code of third-party libraries
 set(DEFAULT_SYSTEM_INCLUDE_FOLDERS ${CMAKE_SOURCE_DIR}/contracts/libc++/upstream/include ${CMAKE_SOURCE_DIR}/contracts/musl/upstream/include ${Boost_INCLUDE_DIR})
 
-set(STANDARD_INCLUDE_FOLDERS ${CMAKE_SOURCE_DIR}/contracts ${CMAKE_SOURCE_DIR}/externals/magic_get/include)
+set(STANDARD_INCLUDE_FOLDERS ${CMAKE_SOURCE_DIR}/contracts ${CMAKE_BINARY_DIR}/contracts ${CMAKE_SOURCE_DIR}/externals/magic_get/include)
 
 add_subdirectory(eosiolib)
 add_subdirectory(musl)

contracts/eosiolib/CMakeLists.txt

-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/core_symbol.hpp.in ${CMAKE_CURRENT_SOURCE_DIR}/core_symbol.hpp)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/core_symbol.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/core_symbol.hpp)
 
 add_wast_library(TARGET eosiolib
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}" ${CMAKE_SOURCE_DIR}/externals/magic_get/include
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
-)
\ No newline at end of file
+)

contracts/eosiolib/asset.hpp

@@ -174,9 +174,9 @@ namespace eosio {
        */
       asset& operator*=( int64_t a ) {
          eosio_assert( a == 0 || (amount * a) / a == amount, "multiplication overflow or underflow" );
+         amount *= a;
          eosio_assert( -max_amount <= amount, "multiplication underflow" );
          eosio_assert( amount <= max_amount,  "multiplication overflow" );
-         amount *= a;
          return *this;
       }
 

contracts/eosiolib/core_symbol.hpp

-/** @file 
- *    @copyright defined in eos/LICENSE.txt 
- *
- * \warning This file is machine generated. DO NOT EDIT.  See core_symbol.hpp.in for changes.
- */
-
-#define CORE_SYMBOL S(4,SYS)