From 6adce788a83651cab1ebe2e8f9e2118718b1bdd6 Mon Sep 17 00:00:00 2001 From: Sandwich Date: Mon, 24 Dec 2018 17:44:10 +0100 Subject: [PATCH 1/4] Replace uint256_t with checksum256 --- libraries/eosiolib/multi_index.hpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libraries/eosiolib/multi_index.hpp b/libraries/eosiolib/multi_index.hpp index 0182964064e..9008b34b942 100644 --- a/libraries/eosiolib/multi_index.hpp +++ b/libraries/eosiolib/multi_index.hpp @@ -207,10 +207,12 @@ struct indexed_by { * EOSIO Multi-Index table also supports up to 16 secondary indices. The type of the secondary indices could be any of: * - uint64_t * - uint128_t - * - uint256_t * - double * - long double * + * `uint256_t` is not support for use as a secondary index, instead use the following + * - eosio::checksum256 + * * @tparam TableName - name of the table * @tparam T - type of the data stored inside the table * @tparam Indices - secondary indices for the table, up to 16 indices is supported here @@ -225,13 +227,13 @@ struct indexed_by { * uint64_t primary; * uint64_t secondary_1; * uint128_t secondary_2; - * uint256_t secondary_3; + * checksum256 secondary_3; * double secondary_4; * long double secondary_5; * uint64_t primary_key() const { return primary; } * uint64_t get_secondary_1() const { return secondary_1; } * uint128_t get_secondary_2() const { return secondary_2; } - * uint256_t get_secondary_3() const { return secondary_3; } + * checksum256 get_secondary_3() const { return secondary_3; } * double get_secondary_4() const { return secondary_4; } * long double get_secondary_5() const { return secondary_5; } * }; @@ -243,9 +245,9 @@ struct indexed_by { * multi_index<"mytable"_n, record, * indexed_by< "bysecondary1"_n, const_mem_fun >, * indexed_by< "bysecondary2"_n, const_mem_fun >, - * indexed_by< "bysecondary3"_n, const_mem_fun >, - * indexed_by< "bysecondary4"_n, const_mem_fun >, - * indexed_by< "bysecondary5"_n, const_mem_fun > + * indexed_by< "bysecondary4"_n, const_mem_fun >, + * indexed_by< "bysecondary5"_n, const_mem_fun >, + * indexed_by< "bysecondary6"_n, const_mem_fun > * > table( code, scope); * } * } From aa088000022a188bf08d498b6f4b6b9dd234e57d Mon Sep 17 00:00:00 2001 From: Sandwich Date: Mon, 24 Dec 2018 17:55:39 +0100 Subject: [PATCH 2/4] fix index names --- eosio_llvm | 2 +- libraries/eosiolib/multi_index.hpp | 6 +++--- libraries/libc++/libcxx | 2 +- libraries/libc/musl | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eosio_llvm b/eosio_llvm index 798a37dc0de..e0f9c15ad41 160000 --- a/eosio_llvm +++ b/eosio_llvm @@ -1 +1 @@ -Subproject commit 798a37dc0de68ba4fd5bb2988e45f7d022b3bb65 +Subproject commit e0f9c15ad4199a628dda25df589cad1634d01c5b diff --git a/libraries/eosiolib/multi_index.hpp b/libraries/eosiolib/multi_index.hpp index 9008b34b942..01f5f688dc7 100644 --- a/libraries/eosiolib/multi_index.hpp +++ b/libraries/eosiolib/multi_index.hpp @@ -245,9 +245,9 @@ struct indexed_by { * multi_index<"mytable"_n, record, * indexed_by< "bysecondary1"_n, const_mem_fun >, * indexed_by< "bysecondary2"_n, const_mem_fun >, - * indexed_by< "bysecondary4"_n, const_mem_fun >, - * indexed_by< "bysecondary5"_n, const_mem_fun >, - * indexed_by< "bysecondary6"_n, const_mem_fun > + * indexed_by< "bysecondary3"_n, const_mem_fun >, + * indexed_by< "bysecondary4"_n, const_mem_fun >, + * indexed_by< "bysecondary5"_n, const_mem_fun > * > table( code, scope); * } * } diff --git a/libraries/libc++/libcxx b/libraries/libc++/libcxx index bfc1bddd181..5e49eb58072 160000 --- a/libraries/libc++/libcxx +++ b/libraries/libc++/libcxx @@ -1 +1 @@ -Subproject commit bfc1bddd181bb0b1a62610d526f01385a919d0cb +Subproject commit 5e49eb58072f2cc63879ea7f990f254e7514c774 diff --git a/libraries/libc/musl b/libraries/libc/musl index 208f308e1cd..88b5e4c8e7e 160000 --- a/libraries/libc/musl +++ b/libraries/libc/musl @@ -1 +1 @@ -Subproject commit 208f308e1cd7816f61fc83b3f1cd2e5da3f4a5a7 +Subproject commit 88b5e4c8e7e058df0cec57f676089e4f03c639be From f867011fe4a9d24e8caedc05d045a482477cee5c Mon Sep 17 00:00:00 2001 From: Sandwich Date: Mon, 24 Dec 2018 22:24:43 +0100 Subject: [PATCH 3/4] remove mention of uint256_t entirely --- libraries/eosiolib/multi_index.hpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/libraries/eosiolib/multi_index.hpp b/libraries/eosiolib/multi_index.hpp index 01f5f688dc7..8d275d50729 100644 --- a/libraries/eosiolib/multi_index.hpp +++ b/libraries/eosiolib/multi_index.hpp @@ -209,8 +209,6 @@ struct indexed_by { * - uint128_t * - double * - long double - * - * `uint256_t` is not support for use as a secondary index, instead use the following * - eosio::checksum256 * * @tparam TableName - name of the table From 20589e95134031e78d49d11c42f2d2767dde18ea Mon Sep 17 00:00:00 2001 From: Bucky Kittinger Date: Wed, 2 Jan 2019 11:45:27 -0500 Subject: [PATCH 4/4] trying to resolve submodule issue --- eosio_llvm | 2 +- libraries/libc++/libcxx | 2 +- libraries/libc/musl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eosio_llvm b/eosio_llvm index e0f9c15ad41..798a37dc0de 160000 --- a/eosio_llvm +++ b/eosio_llvm @@ -1 +1 @@ -Subproject commit e0f9c15ad4199a628dda25df589cad1634d01c5b +Subproject commit 798a37dc0de68ba4fd5bb2988e45f7d022b3bb65 diff --git a/libraries/libc++/libcxx b/libraries/libc++/libcxx index 5e49eb58072..bfc1bddd181 160000 --- a/libraries/libc++/libcxx +++ b/libraries/libc++/libcxx @@ -1 +1 @@ -Subproject commit 5e49eb58072f2cc63879ea7f990f254e7514c774 +Subproject commit bfc1bddd181bb0b1a62610d526f01385a919d0cb diff --git a/libraries/libc/musl b/libraries/libc/musl index 88b5e4c8e7e..208f308e1cd 160000 --- a/libraries/libc/musl +++ b/libraries/libc/musl @@ -1 +1 @@ -Subproject commit 88b5e4c8e7e058df0cec57f676089e4f03c639be +Subproject commit 208f308e1cd7816f61fc83b3f1cd2e5da3f4a5a7