Skip to content
This repository was archived by the owner on Jul 16, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_policy(SET CMP0025 NEW)
cmake_policy(SET CMP0048 NEW)

# Name the project.
project(libdart VERSION 1.2.1)
project(libdart VERSION 1.2.2)
cmake_minimum_required(VERSION 3.1.0)
include(CheckIncludeFileCXX)

Expand Down
2 changes: 1 addition & 1 deletion include/dart.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static_assert(false, "libdart requires a c++14 enabled compiler.");
// Version macros for conditional compilation/feature checks.
#define DART_MAJOR_VERSION 1
#define DART_MINOR_VERSION 2
#define DART_PATCH_VERSION 1
#define DART_PATCH_VERSION 2

/*----- Type Declarations -----*/

Expand Down
4 changes: 2 additions & 2 deletions include/dart/connector/json.tcc
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ namespace dart {
detail::heap_parser<RefCount> context;

// Parse!
rapidjson::StringStream ss(json.data());
rapidjson::MemoryStream ss(json.data(), json.size());
if (reader.Parse<flags>(ss, context)) {
return context.curr_obj;
} else {
Expand All @@ -152,7 +152,7 @@ namespace dart {
std::string errmsg = "dart::heap could not parse the given string due to: \"";
errmsg += rapidjson::GetParseError_En(err);
errmsg += "\" near \"";
errmsg += std::string {json.substr(off ? off - 1 : off, 10)};
errmsg += std::string {json.substr(off ? off - 1 : off, off + 10 < json.size() ? 10 : shim::string_view::npos)};
errmsg += "\"";
throw parse_error(errmsg.data());
}
Expand Down