From db6bf153615b5841d47653e17fc566bd1fa460fc Mon Sep 17 00:00:00 2001 From: John Keiser Date: Sun, 6 Dec 2020 16:29:53 -0800 Subject: [PATCH] Allow all array/object/etc. to be copied --- include/simdjson/generic/ondemand/array.h | 7 ------- include/simdjson/generic/ondemand/array_iterator.h | 3 --- include/simdjson/generic/ondemand/field.h | 8 -------- include/simdjson/generic/ondemand/object.h | 8 -------- include/simdjson/generic/ondemand/object_iterator.h | 6 ------ include/simdjson/generic/ondemand/raw_json_string.h | 3 --- include/simdjson/generic/ondemand/value.h | 9 --------- include/simdjson/generic/ondemand/value_iterator.h | 7 ------- 8 files changed, 51 deletions(-) diff --git a/include/simdjson/generic/ondemand/array.h b/include/simdjson/generic/ondemand/array.h index 46f222b4b..739ebf9a4 100644 --- a/include/simdjson/generic/ondemand/array.h +++ b/include/simdjson/generic/ondemand/array.h @@ -18,10 +18,6 @@ public: * Exists so you can declare a variable and later assign to it before use. */ simdjson_really_inline array() noexcept = default; - simdjson_really_inline array(array &&other) noexcept = default; - simdjson_really_inline array &operator=(array &&other) noexcept = default; - array(const array &) = delete; - array &operator=(const array &) = delete; /** * Begin array iteration. @@ -96,10 +92,7 @@ struct simdjson_result : public SIMDJS public: simdjson_really_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::array &&value) noexcept; ///< @private simdjson_really_inline simdjson_result(error_code error) noexcept; ///< @private - simdjson_really_inline simdjson_result() noexcept = default; - simdjson_really_inline simdjson_result(simdjson_result &&a) noexcept = default; - simdjson_really_inline ~simdjson_result() noexcept = default; ///< @private simdjson_really_inline simdjson_result begin() noexcept; simdjson_really_inline simdjson_result end() noexcept; diff --git a/include/simdjson/generic/ondemand/array_iterator.h b/include/simdjson/generic/ondemand/array_iterator.h index 2ab68d75b..23b376648 100644 --- a/include/simdjson/generic/ondemand/array_iterator.h +++ b/include/simdjson/generic/ondemand/array_iterator.h @@ -75,10 +75,7 @@ struct simdjson_result : publ public: simdjson_really_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::array_iterator &&value) noexcept; ///< @private simdjson_really_inline simdjson_result(error_code error) noexcept; ///< @private - simdjson_really_inline simdjson_result() noexcept = default; - simdjson_really_inline simdjson_result(simdjson_result &&a) noexcept = default; - simdjson_really_inline ~simdjson_result() noexcept = default; ///< @private // // Iterator interface diff --git a/include/simdjson/generic/ondemand/field.h b/include/simdjson/generic/ondemand/field.h index c560acbde..b29711d40 100644 --- a/include/simdjson/generic/ondemand/field.h +++ b/include/simdjson/generic/ondemand/field.h @@ -20,11 +20,6 @@ public: */ simdjson_really_inline field() noexcept; - simdjson_really_inline field(field &&other) noexcept = default; - simdjson_really_inline field &operator=(field &&other) noexcept = default; - simdjson_really_inline field(const field &other) noexcept = delete; - simdjson_really_inline field &operator=(const field &other) noexcept = delete; - /** * Get the key as a string_view (for higher speed, consider raw_key). * We deliberately use a more cumbersome name (unescaped_key) to force users @@ -67,10 +62,7 @@ struct simdjson_result : public SIMDJS public: simdjson_really_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::field &&value) noexcept; ///< @private simdjson_really_inline simdjson_result(error_code error) noexcept; ///< @private - simdjson_really_inline simdjson_result() noexcept = default; - simdjson_really_inline simdjson_result(simdjson_result &&a) noexcept = default; - simdjson_really_inline ~simdjson_result() noexcept = default; ///< @private simdjson_really_inline simdjson_result unescaped_key() noexcept; simdjson_really_inline simdjson_result key() noexcept; diff --git a/include/simdjson/generic/ondemand/object.h b/include/simdjson/generic/ondemand/object.h index cecef88be..8138e84c1 100644 --- a/include/simdjson/generic/ondemand/object.h +++ b/include/simdjson/generic/ondemand/object.h @@ -16,11 +16,6 @@ public: */ simdjson_really_inline object() noexcept = default; - simdjson_really_inline object(object &&other) noexcept = default; - simdjson_really_inline object &operator=(object &&other) noexcept = default; - object(const object &) = delete; - object &operator=(const object &) = delete; - simdjson_really_inline object_iterator begin() noexcept; simdjson_really_inline object_iterator end() noexcept; @@ -76,10 +71,7 @@ struct simdjson_result : public SIMDJ public: simdjson_really_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::object &&value) noexcept; ///< @private simdjson_really_inline simdjson_result(error_code error) noexcept; ///< @private - simdjson_really_inline simdjson_result() noexcept = default; - simdjson_really_inline simdjson_result(simdjson_result &&a) noexcept = default; - simdjson_really_inline ~simdjson_result() noexcept = default; ///< @private simdjson_really_inline simdjson_result begin() noexcept; simdjson_really_inline simdjson_result end() noexcept; diff --git a/include/simdjson/generic/ondemand/object_iterator.h b/include/simdjson/generic/ondemand/object_iterator.h index b7557ca14..20d90ceab 100644 --- a/include/simdjson/generic/ondemand/object_iterator.h +++ b/include/simdjson/generic/ondemand/object_iterator.h @@ -15,9 +15,6 @@ public: */ simdjson_really_inline object_iterator() noexcept = default; - simdjson_really_inline object_iterator(const object_iterator &o) noexcept = default; - simdjson_really_inline object_iterator &operator=(const object_iterator &o) noexcept = default; - // // Iterator interface // @@ -71,10 +68,7 @@ struct simdjson_result : pub public: simdjson_really_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::object_iterator &&value) noexcept; ///< @private simdjson_really_inline simdjson_result(error_code error) noexcept; ///< @private - simdjson_really_inline simdjson_result() noexcept = default; - simdjson_really_inline simdjson_result(simdjson_result &&a) noexcept = default; - simdjson_really_inline ~simdjson_result() noexcept = default; ///< @private // // Iterator interface diff --git a/include/simdjson/generic/ondemand/raw_json_string.h b/include/simdjson/generic/ondemand/raw_json_string.h index 758f37931..bfe0ec7e8 100644 --- a/include/simdjson/generic/ondemand/raw_json_string.h +++ b/include/simdjson/generic/ondemand/raw_json_string.h @@ -32,9 +32,6 @@ public: */ simdjson_really_inline raw_json_string() noexcept = default; - simdjson_really_inline raw_json_string(const raw_json_string &other) noexcept = default; - simdjson_really_inline raw_json_string &operator=(const raw_json_string &other) noexcept = default; - /** * Create a new invalid raw_json_string pointed at the given location in the JSON. * diff --git a/include/simdjson/generic/ondemand/value.h b/include/simdjson/generic/ondemand/value.h index a5f854d5b..46ba794e8 100644 --- a/include/simdjson/generic/ondemand/value.h +++ b/include/simdjson/generic/ondemand/value.h @@ -22,12 +22,6 @@ public: */ simdjson_really_inline value() noexcept = default; - simdjson_really_inline value(value &&other) noexcept = default; - simdjson_really_inline value &operator=(value && other) noexcept = default; - simdjson_really_inline value(const value &) noexcept = default; - simdjson_really_inline value &operator=(const value &) noexcept = default; - simdjson_really_inline ~value() noexcept = default; - /** * Get this value as the given type. * @@ -310,10 +304,7 @@ struct simdjson_result : public SIMDJS public: simdjson_really_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::value &&value) noexcept; ///< @private simdjson_really_inline simdjson_result(error_code error) noexcept; ///< @private - simdjson_really_inline simdjson_result() noexcept = default; - simdjson_really_inline simdjson_result(simdjson_result &&a) noexcept = default; - simdjson_really_inline ~simdjson_result() noexcept = default; ///< @private simdjson_really_inline simdjson_result get_array() && noexcept; simdjson_really_inline simdjson_result get_array() & noexcept; diff --git a/include/simdjson/generic/ondemand/value_iterator.h b/include/simdjson/generic/ondemand/value_iterator.h index e3bb6d837..1e48724d4 100644 --- a/include/simdjson/generic/ondemand/value_iterator.h +++ b/include/simdjson/generic/ondemand/value_iterator.h @@ -26,10 +26,6 @@ protected: public: simdjson_really_inline value_iterator() noexcept = default; - simdjson_really_inline value_iterator(value_iterator &&other) noexcept = default; - simdjson_really_inline value_iterator &operator=(value_iterator &&other) noexcept = default; - simdjson_really_inline value_iterator(const value_iterator &other) noexcept = default; - simdjson_really_inline value_iterator &operator=(const value_iterator &other) noexcept = default; /** * Denote that we're starting a document. @@ -276,10 +272,7 @@ struct simdjson_result : publ public: simdjson_really_inline simdjson_result(SIMDJSON_IMPLEMENTATION::ondemand::value_iterator &&value) noexcept; ///< @private simdjson_really_inline simdjson_result(error_code error) noexcept; ///< @private - simdjson_really_inline simdjson_result() noexcept = default; - simdjson_really_inline simdjson_result(simdjson_result &&a) noexcept = default; - simdjson_really_inline ~simdjson_result() noexcept = default; ///< @private }; } // namespace simdjson