fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-30 10:47:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #236 from Jopie64/master

Browse Source 
Silence some performance warnings in Visual Studio
This commit is contained in:
Victor Zverovich
2015-12-01 06:58:09 -08:00
parent fac207816c 328c8888ec
commit 19de4a863a
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
format.h
View File

@ -28,7 +28,13 @@
#ifndef FMT_FORMAT_H_ #ifndef FMT_FORMAT_H_
#define FMT_FORMAT_H_ #define FMT_FORMAT_H_
#if defined _MSC_VER && _MSC_VER <= 1500
typedef unsigned int uint32_t;
typedef unsigned long long uint64_t;
typedef long long intmax_t;
#else
#include <stdint.h> #include <stdint.h>
#endif
#include <cassert> #include <cassert>
#include <cmath> #include <cmath>
@ -256,7 +262,7 @@ class numeric_limits<fmt::internal::DummyInt> :
// isinf macro > std::isinf > ::isinf > fmt::internal::isinf // isinf macro > std::isinf > ::isinf > fmt::internal::isinf
if (check(sizeof(isinf(x)) == sizeof(bool) || if (check(sizeof(isinf(x)) == sizeof(bool) ||
sizeof(isinf(x)) == sizeof(int))) { sizeof(isinf(x)) == sizeof(int))) {
return isinf(x); return !!isinf(x);
} }
return !_finite(static_cast<double>(x)); return !_finite(static_cast<double>(x));
} }
@ -267,7 +273,7 @@ class numeric_limits<fmt::internal::DummyInt> :
using namespace fmt::internal; using namespace fmt::internal;
if (check(sizeof(isnan(x)) == sizeof(bool) || if (check(sizeof(isnan(x)) == sizeof(bool) ||
sizeof(isnan(x)) == sizeof(int))) { sizeof(isnan(x)) == sizeof(int))) {
return isnan(x); return !!isnan(x);
} }
return _isnan(static_cast<double>(x)) != 0; return _isnan(static_cast<double>(x)) != 0;
} }
@ -276,7 +282,7 @@ class numeric_limits<fmt::internal::DummyInt> :
static bool isnegative(double x) { static bool isnegative(double x) {
using namespace fmt::internal; using namespace fmt::internal;
if (check(sizeof(signbit(x)) == sizeof(int))) if (check(sizeof(signbit(x)) == sizeof(int)))
return signbit(x); return !!signbit(x);
if (x < 0) return true; if (x < 0) return true;
if (!isnotanumber(x)) return false; if (!isnotanumber(x)) return false;
int dec = 0, sign = 0; int dec = 0, sign = 0;
@ -313,7 +319,7 @@ void format(BasicFormatter<Char> &f, const Char *&format_str, const T &value);
/** /**
\rst \rst
A string reference. It can be constructed from a C string or ``std::string``. A string reference. It can be constructed from a C string or ``std::string``.
You can use one of the following typedefs for common character types: You can use one of the following typedefs for common character types:
+------------+-------------------------+ +------------+-------------------------+
@ -1454,7 +1460,7 @@ class BasicFormatter : private internal::FormatterBase {
private: private:
BasicWriter<Char> &writer_; BasicWriter<Char> &writer_;
internal::ArgMap<Char> map_; internal::ArgMap<Char> map_;
FMT_DISALLOW_COPY_AND_ASSIGN(BasicFormatter); FMT_DISALLOW_COPY_AND_ASSIGN(BasicFormatter);
using internal::FormatterBase::get_arg; using internal::FormatterBase::get_arg;
@ -1958,7 +1964,7 @@ class SystemError : public internal::RuntimeError {
*error_code* is a system error code as given by ``errno``. *error_code* is a system error code as given by ``errno``.
If *error_code* is not a valid error code such as -1, the system message If *error_code* is not a valid error code such as -1, the system message
may look like "Unknown error -1" and is platform-dependent. may look like "Unknown error -1" and is platform-dependent.
**Example**:: **Example**::
// This throws a SystemError with the description // This throws a SystemError with the description
@ -2147,7 +2153,7 @@ class BasicWriter {
/** /**
\rst \rst
Writes formatted data. Writes formatted data.
*args* is an argument list representing arbitrary arguments. *args* is an argument list representing arbitrary arguments.
**Example**:: **Example**::
@ -2675,7 +2681,7 @@ typedef BasicMemoryWriter<wchar_t> WMemoryWriter;
This class template provides operations for formatting and writing data This class template provides operations for formatting and writing data
into a fixed-size array. For writing into a dynamically growing buffer into a fixed-size array. For writing into a dynamically growing buffer
use :class:`fmt::BasicMemoryWriter`. use :class:`fmt::BasicMemoryWriter`.
Any write method will throw ``std::runtime_error`` if the output doesn't fit Any write method will throw ``std::runtime_error`` if the output doesn't fit
into the array. into the array.
@ -3208,7 +3214,7 @@ inline namespace literals {
C++11 literal equivalent of :func:`fmt::format`. C++11 literal equivalent of :func:`fmt::format`.
**Example**:: **Example**::
using namespace fmt::literals; using namespace fmt::literals;
std::string message = "The answer is {}"_format(42); std::string message = "The answer is {}"_format(42);
\endrst \endrst
@ -3223,7 +3229,7 @@ operator"" _format(const wchar_t *s, std::size_t) { return {s}; }
C++11 literal equivalent of :func:`fmt::arg`. C++11 literal equivalent of :func:`fmt::arg`.
**Example**:: **Example**::
using namespace fmt::literals; using namespace fmt::literals;
print("Elapsed time: {s:.2f} seconds", "s"_a=1.23); print("Elapsed time: {s:.2f} seconds", "s"_a=1.23);
\endrst \endrst