diff --git a/json_value.cpp b/json_value.cpp index c8f1139..9758db5 100644 --- a/json_value.cpp +++ b/json_value.cpp @@ -259,7 +259,7 @@ Value::CZString::CZString(const CZString& other) { storage_.length_ = other.storage_.length_; } -Value::CZString::CZString(CZString&& other) +Value::CZString::CZString(CZString&& other)noexcept : cstr_(other.cstr_), index_(other.index_) { other.cstr_ = nullptr; } @@ -285,7 +285,7 @@ Value::CZString& Value::CZString::operator=(const CZString& other) { return *this; } -Value::CZString& Value::CZString::operator=(CZString&& other) { +Value::CZString& Value::CZString::operator=(CZString&& other)noexcept { cstr_ = other.cstr_; index_ = other.index_; other.cstr_ = nullptr; @@ -433,7 +433,7 @@ Value::Value(const Value& other) { dupMeta(other); } -Value::Value(Value&& other) { +Value::Value(Value&& other)noexcept { initBasic(nullValue); swap(other); } @@ -448,7 +448,7 @@ Value& Value::operator=(const Value& other) { return *this; } -Value& Value::operator=(Value&& other) { +Value& Value::operator=(Value&& other) noexcept { other.swap(*this); return *this; } @@ -1374,7 +1374,7 @@ bool Value::isObject() const { return type() == objectValue; } Value::Comments::Comments(const Comments& that) : ptr_{cloneUnique(that.ptr_)} {} -Value::Comments::Comments(Comments&& that) +Value::Comments::Comments(Comments&& that)noexcept : ptr_{std::move(that.ptr_)} {} Value::Comments& Value::Comments::operator=(const Comments& that) { @@ -1382,7 +1382,7 @@ Value::Comments& Value::Comments::operator=(const Comments& that) { return *this; } -Value::Comments& Value::Comments::operator=(Comments&& that) { +Value::Comments& Value::Comments::operator=(Comments&& that)noexcept { ptr_ = std::move(that.ptr_); return *this; } diff --git a/transferServiceExe.cpp b/transferServiceExe.cpp index eeb9e50..5ac3a63 100644 --- a/transferServiceExe.cpp +++ b/transferServiceExe.cpp @@ -315,7 +315,7 @@ void playVoiceV3(char * ip, char *json, int port,int maxVol) { //ºëÊ¢·¢×¨Óà //sprintf(ipVoiceBoxParam,"{\"loop\":{\"gap\":2,\"times\":2},\"prompt\":false,\"queue\":false,\"rcn\":\"0\",\"rdn\":\"0\",\"reg\":0,\"speed\":50,\"sync\":false,\"text\":\"%s\",\"vcn\":\"xiaoyan\",\"volume\":100}", json); - sprintf(ipVoiceBoxParam, "{\"loop\":{\"gap\":2,\"times\":2},\"prompt\":false,\"queue\":false,\"rcn\":\"0\",\"rdn\":\"0\",\"reg\":0,\"speed\":50,\"sync\":false,\"text\":\"%s\",\"vcn\":\"xiaoyan\",\"volume\":%d}", buffer, maxVol); + sprintf(ipVoiceBoxParam, "{\"loop\":{\"gap\":1,\"times\":2},\"prompt\":false,\"queue\":true,\"rcn\":\"0\",\"rdn\":\"0\",\"reg\":0,\"speed\":50,\"sync\":false,\"text\":\"%s\",\"vcn\":\"xiaoyan\",\"volume\":%d}", buffer, maxVol); //printf("json=%s\n", json); //string decodeJson = json; diff --git a/transferServiceExe.vcxproj b/transferServiceExe.vcxproj index 4abdae0..32d8667 100644 --- a/transferServiceExe.vcxproj +++ b/transferServiceExe.vcxproj @@ -108,6 +108,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) ./include/;./include/VzClientSDK;./include/HCNetSdk;./include/VehicleDevSDK;./include/DHSdk;%(AdditionalIncludeDirectories) + stdcpp14 Console