Skip to content
This repository was archived by the owner on Aug 2, 2022. It is now read-only.

updated abieos to the latest eosio-2.1.x branch #1122

Open
Max-B1 wants to merge 3 commits into
base: develop-boxed
Choose a base branch
from
+6 −6
Open

updated abieos to the latest eosio-2.1.x branch #1122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
168cdc6
Passthrough return of main within start function of tester WASMs.
arhag May 19, 2021
b69df46
Merge pull request #1101 from EOSIO/tester_start_return
arhag May 19, 2021
2b55724
updated abieos to the latest eosio-2.1.x branch and removed usage of
Max-B1 Jun 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libraries/abieos
Open in desktop
Submodule abieos updated 22 files
+42 −6 CMakeLists.txt
+4 −0 abieos-config.cmake.in
+233 −126 include/eosio/abi.hpp
+6 −0 include/eosio/asset.hpp
+7 −7 include/eosio/check.hpp
+1 −0 include/eosio/crypto.hpp
+4 −0 include/eosio/fixed_bytes.hpp
+16 −0 include/eosio/from_json.hpp
+7 −3 include/eosio/name.hpp
+102 −26 include/eosio/opaque.hpp
+1 −1 include/eosio/reflection.hpp
+153 −32 include/eosio/ship_protocol.hpp
+5 −1 include/eosio/stream.hpp
+71 −12 include/eosio/to_json.hpp
+7 −0 include/eosio/to_key.hpp
+15 −6 include/eosio/types.hpp
+10 −33 src/abi.cpp
+71 −0 src/abieos.cpp
+17 −2 src/abieos.h
+58 −0 src/abieos.hpp
+695 −0 src/ship.abi.cpp
+448 −5 src/test.cpp
2 changes: 1 addition & 1 deletion libraries/eosiolib/contracts/eosio/key_value.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ inline partial_key make_key(T&& t) {
return partial_key(convert_to_key(std::forward<T>(t)));
}
inline partial_key make_key(partial_key&& t) {
return t;
return std::move(t);
Copy link
Copy Markdown
Contributor

@huangminghuang huangminghuang Jun 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as understand, you shouldn't use std::move(t) here. You can check https://stackoverflow.com/questions/14856344/when-should-stdmove-be-used-on-a-function-return-value for explanations about when you should (or should not) use return std::move(...);

Copy link
Copy Markdown
Author

@Max-B1 Max-B1 Jun 24, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not quite sure about the purpose of this function. The old version of it creates a copy of t. So I thought it will make more sense to make it move the content of t.
GCC is complaining about it:

.../key_value.hpp:173:11: warning: local variable 't' will be copied despite being returned by name [-Wreturn-std-move]
   return t;
          ^
.../key_value.hpp:173:11: note: call 'std::move' explicitly to avoid copying
   return t;
          ^
          std::move(t)

Copy link
Copy Markdown
Contributor

@heifner heifner Jun 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe move is appropriate here.

}
inline partial_key make_key(partial_key& t) {
return t;
Expand Down
4 changes: 2 additions & 2 deletions libraries/eosiolib/tester/crt0.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
int main(int argc, char** argv);

extern "C" __attribute__((eosio_wasm_entry)) void initialize() {}
extern "C" __attribute__((eosio_wasm_entry)) void start(void (*f)()) {
extern "C" __attribute__((eosio_wasm_entry)) int start(void (*f)()) {
std::vector<std::string> args = eosio::get_args();
char buf[] = "eosio-tester";
std::vector<char*> argv;
argv.push_back(buf);
for(std::string& s : args) {
argv.push_back(const_cast<char*>(s.data()));
}
main(argv.size(), argv.data());
return main(argv.size(), argv.data());
}
4 changes: 2 additions & 2 deletions libraries/eosiolib/tester/tester.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,10 +365,10 @@ void build_history_result(eosio::test_chain::get_history_result& history_result,
history_result.block = std::move(*blocks_result.block);
}
if (!blocks_result.traces.empty()) {
blocks_result.traces.unpack(history_result.traces);
unpack(blocks_result.traces, history_result.traces);
}
if (blocks_result.deltas.empty()) {
blocks_result.deltas.unpack(history_result.deltas);
unpack(blocks_result.deltas, history_result.deltas);
}
}

Expand Down