3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-06-02 02:41:49 +02:00
Code Issues Projects Releases Packages Wiki Activity

update jsonrpc++ to v1.2.1

Browse source
This commit is contained in:
badaix 2019-09-18 22:22:23 +02:00
parent f992ffabce
commit 6e9071731c
2 changed files with 38 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

33
.travis.yml
View file

@ -46,6 +46,39 @@ matrix:
env: env:
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
# works on Trusty
- os: linux
addons:
apt:
sources:
- llvm-toolchain-trusty-3.9
packages:
- clang-3.9 libasound2-dev libvorbisidec-dev libvorbis-dev libflac-dev alsa-utils libavahi-client-dev avahi-daemon
env:
- MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
# works on Trusty
- os: linux
addons:
apt:
sources:
- llvm-toolchain-trusty-4.0
packages:
- clang-4.0 libasound2-dev libvorbisidec-dev libvorbis-dev libflac-dev alsa-utils libavahi-client-dev avahi-daemon
env:
- MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"
# works on Trusty
- os: linux
addons:
apt:
sources:
- llvm-toolchain-trusty-5.0
packages:
- clang-5.0 libasound2-dev libvorbisidec-dev libvorbis-dev libflac-dev alsa-utils libavahi-client-dev avahi-daemon
env:
- MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
# build on osx # build on osx
- os: osx - os: osx
osx_image: xcode9.4 osx_image: xcode9.4

10
server/jsonrpcpp.hpp
View file

@ -3,11 +3,11 @@
_( )/ ___) / \ ( ( \( _ \( _ \ / __)( ) ( ) _( )/ ___) / \ ( ( \( _ \( _ \ / __)( ) ( )
/ \) \\___ \( O )/ / ) / ) __/( (__(_ _)(_ _) / \) \\___ \( O )/ / ) / ) __/( (__(_ _)(_ _)
\____/(____/ \__/ \_)__)(__\_)(__) \___)(_) (_) \____/(____/ \__/ \_)__)(__\_)(__) \___)(_) (_)
version 1.2.0 version 1.2.1
https://github.com/badaix/jsonrpcpp https://github.com/badaix/jsonrpcpp
This file is part of jsonrpc++ This file is part of jsonrpc++
Copyright (C) 2017-2018 Johannes Pohl Copyright (C) 2017-2019 Johannes Pohl
This software may be modified and distributed under the terms This software may be modified and distributed under the terms
of the MIT license. See the LICENSE file for details. of the MIT license. See the LICENSE file for details.
@ -869,7 +869,7 @@ inline void Error::parse_json(const Json& json)
code_ = json["code"]; code_ = json["code"];
if (json.count("message") == 0) if (json.count("message") == 0)
throw RpcException("message is missing"); throw RpcException("message is missing");
message_ = json["message"]; message_ = json["message"].get<std::string>();
if (json.count("data") != 0u) if (json.count("data") != 0u)
data_ = json["data"]; data_ = json["data"];
else else
@ -942,7 +942,7 @@ inline void Request::parse_json(const Json& json)
throw InvalidRequestException("method is missing", id_); throw InvalidRequestException("method is missing", id_);
if (!json["method"].is_string()) if (!json["method"].is_string())
throw InvalidRequestException("method must be a string value", id_); throw InvalidRequestException("method must be a string value", id_);
method_ = json["method"]; method_ = json["method"].get<std::string>();
if (method_.empty()) if (method_.empty())
throw InvalidRequestException("method must not be empty", id_); throw InvalidRequestException("method must not be empty", id_);
@ -1235,7 +1235,7 @@ inline void Notification::parse_json(const Json& json)
throw RpcException("method is missing"); throw RpcException("method is missing");
if (!json["method"].is_string()) if (!json["method"].is_string())
throw RpcException("method must be a string value"); throw RpcException("method must be a string value");
method_ = json["method"]; method_ = json["method"].get<std::string>();
if (method_.empty()) if (method_.empty())
throw RpcException("method must not be empty"); throw RpcException("method must not be empty");