Damn merge conflicts.

Daniel Lemire · Daniel Lemire · commit 544fa576413d · 2020-06-23T19:15:47.000-04:00
diff --git a/include/simdjson/dom/element.h b/include/simdjson/dom/element.h
@@ -473,8 +473,8 @@ struct simdjson_result<dom::element> : public internal::simdjson_result_base<dom
   really_inline bool is_array() const noexcept;
   really_inline bool is_object() const noexcept;
   really_inline bool is_string() const noexcept;
-  really_inline bool is_int64_t() const noexcept;
-  really_inline bool is_uint64_t() const noexcept;
+  really_inline bool is_int64() const noexcept;
+  really_inline bool is_uint64() const noexcept;
   really_inline bool is_double() const noexcept;
   really_inline bool is_bool() const noexcept;
   really_inline bool is_null() const noexcept;
diff --git a/include/simdjson/inline/element.h b/include/simdjson/inline/element.h
@@ -80,11 +80,11 @@ really_inline bool simdjson_result<dom::element>::is_object() const noexcept {
 really_inline bool simdjson_result<dom::element>::is_string() const noexcept {
   return !error() && first.is_string();
 }
-really_inline bool simdjson_result<dom::element>::is_int64_t() const noexcept {
-  return !error() && first.is_int64_t();
+really_inline bool simdjson_result<dom::element>::is_int64() const noexcept {
+  return !error() && first.is_int64();
 }
-really_inline bool simdjson_result<dom::element>::is_uint64_t() const noexcept {
-  return !error() && first.is_uint64_t();
+really_inline bool simdjson_result<dom::element>::is_uint64() const noexcept {
+  return !error() && first.is_uint64();
 }
 really_inline bool simdjson_result<dom::element>::is_double() const noexcept {
   return !error() && first.is_double();
diff --git a/tests/cast_tester.h b/tests/cast_tester.h
@@ -251,8 +251,8 @@ template<> bool cast_tester<array>::named_is(simdjson_result<element> element) {
 template<> bool cast_tester<object>::named_is(simdjson_result<element> element) { return element.is_object(); }
 template<> bool cast_tester<const char *>::named_is(simdjson_result<element> element) { return element.is_string(); }
 template<> bool cast_tester<std::string_view>::named_is(simdjson_result<element> element) { return element.is_string(); }
-template<> bool cast_tester<uint64_t>::named_is(simdjson_result<element> element) { return element.is_uint64_t(); }
-template<> bool cast_tester<int64_t>::named_is(simdjson_result<element> element) { return element.is_int64_t(); }
+template<> bool cast_tester<uint64_t>::named_is(simdjson_result<element> element) { return element.is_uint64(); }
+template<> bool cast_tester<int64_t>::named_is(simdjson_result<element> element) { return element.is_int64(); }
 template<> bool cast_tester<double>::named_is(simdjson_result<element> element) { return element.is_double(); }
 template<> bool cast_tester<bool>::named_is(simdjson_result<element> element) { return element.is_bool(); }
 

Original file line number	Diff line number	Diff line change
`@@ -80,11 +80,11 @@ really_inline bool simdjson_result<dom::element>::is_object() const noexcept {`
`80`	`80`	`really_inline bool simdjson_result<dom::element>::is_string() const noexcept {`
`81`	`81`	`return !error() && first.is_string();`
`82`	`82`	`}`
`83`		`-really_inline bool simdjson_result<dom::element>::is_int64_t() const noexcept {`
`84`		`- return !error() && first.is_int64_t();`
	`83`	`+really_inline bool simdjson_result<dom::element>::is_int64() const noexcept {`
	`84`	`+ return !error() && first.is_int64();`
`85`	`85`	`}`
`86`		`-really_inline bool simdjson_result<dom::element>::is_uint64_t() const noexcept {`
`87`		`- return !error() && first.is_uint64_t();`
	`86`	`+really_inline bool simdjson_result<dom::element>::is_uint64() const noexcept {`
	`87`	`+ return !error() && first.is_uint64();`
`88`	`88`	`}`
`89`	`89`	`really_inline bool simdjson_result<dom::element>::is_double() const noexcept {`
`90`	`90`	`return !error() && first.is_double();`