diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-03-12 16:31:17 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2020-03-12 19:03:12 -0700 |
| commit | c846ee0d1b603e141fc536078b920caedae3bf6f (patch) | |
| tree | 0ef1e8e597ed8c33a897fe1023c0c05618a60489 /src/client | |
| parent | 69a51e12c98af064012bc37716cabd77366d6a83 (diff) | |
replace stdarg.h with cstdarg
The former was deprecated in C++14. The Standard says they are the same:
The contents of the header<cstdarg>are the same as the C standard library
header<stdarg.h>, with the following changes: The restrictions that ISO C
places on the second parameter to the va_start macro in header<stdarg.h>
are different in this International Standard. The parameter parmN is the
rightmost parameter in the variable parameter list of the function
definition (the one just before the...).219If the parameter parmN is a
pack expansion (17.5.3) or an entity resulting from a lambda capture
(8.1.5), the program is ill-formed, no diagnostic required. If the
parameter parmN is of a reference type, or of a type that is not
compatible with the type that results when passing an argument for which
there is no parameter, the behavior is undefined.
Also changed va_list to the std:: namespace version, which is the same.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/Response.cxx | 6 | ||||
| -rw-r--r-- | src/client/Response.hxx | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/client/Response.cxx b/src/client/Response.cxx index 207489fa6..7c8118e6f 100644 --- a/src/client/Response.cxx +++ b/src/client/Response.cxx @@ -41,7 +41,7 @@ Response::Write(const char *data) noexcept } bool -Response::FormatV(const char *fmt, va_list args) noexcept +Response::FormatV(const char *fmt, std::va_list args) noexcept { return Write(FormatStringV(fmt, args).c_str()); } @@ -49,7 +49,7 @@ Response::FormatV(const char *fmt, va_list args) noexcept bool Response::Format(const char *fmt, ...) noexcept { - va_list args; + std::va_list args; va_start(args, fmt); bool success = FormatV(fmt, args); va_end(args); @@ -78,7 +78,7 @@ Response::FormatError(enum ack code, const char *fmt, ...) noexcept Format("ACK [%i@%u] {%s} ", (int)code, list_index, command); - va_list args; + std::va_list args; va_start(args, fmt); FormatV(fmt, args); va_end(args); diff --git a/src/client/Response.hxx b/src/client/Response.hxx index f5898b16b..b2c72cf48 100644 --- a/src/client/Response.hxx +++ b/src/client/Response.hxx @@ -23,8 +23,9 @@ #include "protocol/Ack.hxx" #include "util/Compiler.h" +#include <cstdarg> + #include <stddef.h> -#include <stdarg.h> template<typename T> struct ConstBuffer; class Client; @@ -74,7 +75,7 @@ public: bool Write(const void *data, size_t length) noexcept; bool Write(const char *data) noexcept; - bool FormatV(const char *fmt, va_list args) noexcept; + bool FormatV(const char *fmt, std::va_list args) noexcept; bool Format(const char *fmt, ...) noexcept; static constexpr size_t MAX_BINARY_SIZE = 8192; |