External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warning about moved from object (#3889)

Browse Source
This commit is contained in:
Niels Lohmann 2022-12-18 17:20:30 +01:00 committed by GitHub
parent 2ca8dabeb9
commit 80dfb049b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/nlohmann/detail/string_concat.hpp
View File

@ -25,28 +25,28 @@ inline std::size_t concat_length()
} }
template<typename... Args> template<typename... Args>
inline std::size_t concat_length(const char* cstr, Args&& ... rest); inline std::size_t concat_length(const char* cstr, const Args& ... rest);
template<typename StringType, typename... Args> template<typename StringType, typename... Args>
inline std::size_t concat_length(const StringType& str, Args&& ... rest); inline std::size_t concat_length(const StringType& str, const Args& ... rest);
template<typename... Args> template<typename... Args>
inline std::size_t concat_length(const char /*c*/, Args&& ... rest) inline std::size_t concat_length(const char /*c*/, const Args& ... rest)
{ {
return 1 + concat_length(std::forward<Args>(rest)...); return 1 + concat_length(rest...);
} }
template<typename... Args> template<typename... Args>
inline std::size_t concat_length(const char* cstr, Args&& ... rest) inline std::size_t concat_length(const char* cstr, const Args& ... rest)
{ {
// cppcheck-suppress ignoredReturnValue // cppcheck-suppress ignoredReturnValue
return ::strlen(cstr) + concat_length(std::forward<Args>(rest)...); return ::strlen(cstr) + concat_length(rest...);
} }
template<typename StringType, typename... Args> template<typename StringType, typename... Args>
inline std::size_t concat_length(const StringType& str, Args&& ... rest) inline std::size_t concat_length(const StringType& str, const Args& ... rest)
{ {
return str.size() + concat_length(std::forward<Args>(rest)...); return str.size() + concat_length(rest...);
} }
template<typename OutStringType> template<typename OutStringType>
@ -137,7 +137,7 @@ template<typename OutStringType = std::string, typename... Args>
inline OutStringType concat(Args && ... args) inline OutStringType concat(Args && ... args)
{ {
OutStringType str; OutStringType str;
str.reserve(concat_length(std::forward<Args>(args)...)); str.reserve(concat_length(args...));
concat_into(str, std::forward<Args>(args)...); concat_into(str, std::forward<Args>(args)...);
return str; return str;
} }

18
single_include/nlohmann/json.hpp
View File

@ -4169,28 +4169,28 @@ inline std::size_t concat_length()
} }
template<typename... Args> template<typename... Args>
inline std::size_t concat_length(const char* cstr, Args&& ... rest); inline std::size_t concat_length(const char* cstr, const Args& ... rest);
template<typename StringType, typename... Args> template<typename StringType, typename... Args>
inline std::size_t concat_length(const StringType& str, Args&& ... rest); inline std::size_t concat_length(const StringType& str, const Args& ... rest);
template<typename... Args> template<typename... Args>
inline std::size_t concat_length(const char /*c*/, Args&& ... rest) inline std::size_t concat_length(const char /*c*/, const Args& ... rest)
{ {
return 1 + concat_length(std::forward<Args>(rest)...); return 1 + concat_length(rest...);
} }
template<typename... Args> template<typename... Args>
inline std::size_t concat_length(const char* cstr, Args&& ... rest) inline std::size_t concat_length(const char* cstr, const Args& ... rest)
{ {
// cppcheck-suppress ignoredReturnValue // cppcheck-suppress ignoredReturnValue
return ::strlen(cstr) + concat_length(std::forward<Args>(rest)...); return ::strlen(cstr) + concat_length(rest...);
} }
template<typename StringType, typename... Args> template<typename StringType, typename... Args>
inline std::size_t concat_length(const StringType& str, Args&& ... rest) inline std::size_t concat_length(const StringType& str, const Args& ... rest)
{ {
return str.size() + concat_length(std::forward<Args>(rest)...); return str.size() + concat_length(rest...);
} }
template<typename OutStringType> template<typename OutStringType>
@ -4281,7 +4281,7 @@ template<typename OutStringType = std::string, typename... Args>
inline OutStringType concat(Args && ... args) inline OutStringType concat(Args && ... args)
{ {
OutStringType str; OutStringType str;
str.reserve(concat_length(std::forward<Args>(args)...)); str.reserve(concat_length(args...));
concat_into(str, std::forward<Args>(args)...); concat_into(str, std::forward<Args>(args)...);
return str; return str;
} }