Chromium Code Reviews| Index: base/strings/safe_sprintf.h |
| diff --git a/base/strings/safe_sprintf.h b/base/strings/safe_sprintf.h |
| index a1be047955c191fc07ce1835c062f8c45cbfe19e..0ec7d424b3267fe6c3465f63753a4a72fdde155d 100644 |
| --- a/base/strings/safe_sprintf.h |
| +++ b/base/strings/safe_sprintf.h |
| @@ -190,26 +190,6 @@ BASE_EXPORT size_t GetSafeSPrintfSSizeMaxForTest(); |
| } // namespace internal |
| -#if __cplusplus >= 201103 // C++11 |
| - |
| -template<typename... Args> |
| -ssize_t SafeSNPrintf(char* buf, size_t N, const char* fmt, Args... args) { |
| - // Use Arg() object to record type information and then copy arguments to an |
| - // array to make it easier to iterate over them. |
| - const internal::Arg arg_array[] = { args... }; |
| - return internal::SafeSNPrintf(buf, N, fmt, arg_array, arraysize(arg_array)); |
| -} |
| - |
| -template<size_t N, typename... Args> |
| -ssize_t SafeSPrintf(char (&buf)[N], const char* fmt, Args... args) { |
| - // Use Arg() object to record type information and then copy arguments to an |
| - // array to make it easier to iterate over them. |
| - const internal::Arg arg_array[] = { args... }; |
| - return internal::SafeSNPrintf(buf, N, fmt, arg_array, arraysize(arg_array)); |
| -} |
| - |
| -#else // Pre-C++11 |
| - |
| // TODO(markus): C++11 has a much more concise and readable solution for |
| // expressing what we are doing here. Delete the fall-back code for older |
| // compilers as soon as we have fully switched to C++11. |
|
Inactive
2013/12/05 21:36:39
I also removed the last part of this comment.
|
| @@ -426,7 +406,6 @@ ssize_t SafeSPrintf(char (&buf)[N], const char* fmt, T0 arg0) { |
| const internal::Arg arg_array[] = { arg0 }; |
| return internal::SafeSNPrintf(buf, N, fmt, arg_array, arraysize(arg_array)); |
| } |
| -#endif |
| // Fast-path when we don't actually need to substitute any arguments. |
| BASE_EXPORT ssize_t SafeSNPrintf(char* buf, size_t N, const char* fmt); |