Merge pull request #249 from fingera/3-force-exec-compile-time

Force execute compile time
EOSIO · Nov 9, 2018 · 925332b · 925332b
2 parents 94c517c + dce6822
commit 925332b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/libraries/eosiolib/name.hpp b/libraries/eosiolib/name.hpp
@@ -218,5 +218,6 @@ namespace eosio {
  */
 template <typename T, T... Str>
 inline constexpr eosio::name operator""_n() {
-   return eosio::name{std::string_view{eosio::detail::to_const_char_arr<Str...>::value, sizeof...(Str)}};
+   constexpr auto x = eosio::name{std::string_view{eosio::detail::to_const_char_arr<Str...>::value, sizeof...(Str)}};
+   return x;
 }
diff --git a/modules/EosioWasmToolchain.cmake.in b/modules/EosioWasmToolchain.cmake.in
@@ -37,7 +37,6 @@ include_directories(
 macro(add_contract CONTRACT_NAME TARGET)
    add_executable( ${TARGET}.wasm ${ARGN} )
    target_compile_options( ${TARGET}.wasm PUBLIC -abigen )
-   set_target_properties( ${TARGET}.wasm PROPERTIES LINKER_LANGUAGE C )
    get_target_property(BINOUTPUT ${TARGET}.wasm BINARY_DIR)
    target_compile_options( ${TARGET}.wasm PUBLIC -abigen_output=${BINOUTPUT}/${TARGET}.abi )
    target_compile_options( ${TARGET}.wasm PUBLIC -contract ${CONTRACT_NAME} )