jasder
/
simdjson
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Fix copy constructor issue on older gcc

This commit is contained in:
John Keiser 2020-06-21 11:49:52 -07:00
parent ae1bd891e7
commit 1b1a122b1f
5 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/simdjson/dom/document_stream.h
View File

@ -143,8 +143,7 @@ public:
private: private:
document_stream &operator=(const document_stream &) = delete; // Disallow copying document_stream &operator=(const document_stream &) = delete; // Disallow copying
document_stream(const document_stream &other) = delete; // Disallow copying
document_stream(document_stream &other) = delete; // Disallow copying
/** /**
* Construct a document_stream. Does not allocate or parse anything until the iterator is * Construct a document_stream. Does not allocate or parse anything until the iterator is

2
singleheader/amalgamate_demo.cpp
View File

@ -1,4 +1,4 @@
/* auto-generated on Sat Jun 20 21:35:29 PDT 2020. Do not edit! */ /* auto-generated on Sun Jun 21 11:49:12 PDT 2020. Do not edit! */
#include <iostream> #include <iostream>
#include "simdjson.h" #include "simdjson.h"

2
singleheader/simdjson.cpp
View File

@ -1,4 +1,4 @@
/* auto-generated on Sat Jun 20 21:35:29 PDT 2020. Do not edit! */ /* auto-generated on Sun Jun 21 11:49:12 PDT 2020. Do not edit! */
/* begin file src/simdjson.cpp */ /* begin file src/simdjson.cpp */
#include "simdjson.h" #include "simdjson.h"

14
singleheader/simdjson.h
View File

@ -1,4 +1,4 @@
/* auto-generated on Sat Jun 20 21:50:03 PDT 2020. Do not edit! */ /* auto-generated on Sun Jun 21 11:49:12 PDT 2020. Do not edit! */
/* begin file include/simdjson.h */ /* begin file include/simdjson.h */
#ifndef SIMDJSON_H #ifndef SIMDJSON_H
#define SIMDJSON_H #define SIMDJSON_H
@ -3778,8 +3778,7 @@ public:
private: private:
document_stream &operator=(const document_stream &) = delete; // Disallow copying document_stream &operator=(const document_stream &) = delete; // Disallow copying
document_stream(const document_stream &other) = delete; // Disallow copying
document_stream(document_stream &other) = delete; // Disallow copying
/** /**
* Construct a document_stream. Does not allocate or parse anything until the iterator is * Construct a document_stream. Does not allocate or parse anything until the iterator is
@ -3867,8 +3866,8 @@ private:
#endif // SIMDJSON_THREADS_ENABLED #endif // SIMDJSON_THREADS_ENABLED
friend class dom::parser; friend class dom::parser;
friend class simdjson_result<dom::document_stream>; friend struct simdjson_result<dom::document_stream>;
friend class internal::simdjson_result_base<dom::document_stream>; friend struct internal::simdjson_result_base<dom::document_stream>;
}; // class document_stream }; // class document_stream
@ -5574,7 +5573,6 @@ really_inline dom::document_stream::iterator simdjson_result<dom::document_strea
} }
#endif // SIMDJSON_EXCEPTIONS #endif // SIMDJSON_EXCEPTIONS
} // namespace simdjson } // namespace simdjson
#endif // SIMDJSON_INLINE_DOCUMENT_STREAM_H #endif // SIMDJSON_INLINE_DOCUMENT_STREAM_H
/* end file include/simdjson/inline/document_stream.h */ /* end file include/simdjson/inline/document_stream.h */
@ -6302,7 +6300,9 @@ really_inline void simdjson_result_base<T>::tie(T &value, error_code &error) &&
template<typename T> template<typename T>
WARN_UNUSED really_inline error_code simdjson_result_base<T>::get(T &value) && noexcept { WARN_UNUSED really_inline error_code simdjson_result_base<T>::get(T &value) && noexcept {
return std::forward<simdjson_result_base<T>>(*this).get(value); error_code error;
std::forward<simdjson_result_base<T>>(*this).tie(value, error);
return error;
} }
template<typename T> template<typename T>

21
tests/errortests.cpp
View File

@ -105,12 +105,8 @@ namespace parser_load {
TEST_START(); TEST_START();
dom::parser parser; dom::parser parser;
dom::document_stream stream; dom::document_stream stream;
ASSERT_SUCCESS(parser.load_many(NONEXISTENT_FILE).get(stream)); ASSERT_ERROR(parser.load_many(NONEXISTENT_FILE).get(stream), IO_ERROR);
for (auto doc : stream) { TEST_SUCCEED();
ASSERT_ERROR(doc.error(), IO_ERROR);
TEST_SUCCEED();
}
TEST_FAIL("No documents returned");
} }
bool padded_string_load_nonexistent() { bool padded_string_load_nonexistent() {
TEST_START(); TEST_START();
@ -122,21 +118,16 @@ namespace parser_load {
bool parser_load_chain() { bool parser_load_chain() {
TEST_START(); TEST_START();
dom::parser parser; dom::parser parser;
auto error = parser.load(NONEXISTENT_FILE)["foo"].get<uint64_t>().error(); UNUSED uint64_t foo;
ASSERT_ERROR(error, IO_ERROR); ASSERT_ERROR( parser.load(NONEXISTENT_FILE)["foo"].get(foo) , IO_ERROR);
TEST_SUCCEED(); TEST_SUCCEED();
} }
bool parser_load_many_chain() { bool parser_load_many_chain() {
TEST_START(); TEST_START();
dom::parser parser; dom::parser parser;
dom::document_stream stream; dom::document_stream stream;
ASSERT_SUCCESS( parser.load_many(NONEXISTENT_FILE).get(stream) ); ASSERT_ERROR( parser.load_many(NONEXISTENT_FILE).get(stream) , IO_ERROR );
for (auto doc : stream) { TEST_SUCCEED();
auto error = doc["foo"].get<uint64_t>().error();
ASSERT_ERROR(error, IO_ERROR);
TEST_SUCCEED();
}
TEST_FAIL("No documents returned");
} }
bool run() { bool run() {
return true return true