diff options
author | Dmitry Trifonov <slonegg@gmail.com> | 2017-04-18 08:48:07 -0700 |
---|---|---|
committer | Eric <eric@efcs.ca> | 2017-04-18 09:48:07 -0600 |
commit | 09b93ccc6a9aed84c269b6f5b8130c878e518ebb (patch) | |
tree | d23a97f6f84ad14c9431ae38478430df18e3844b /src/colorprint.cc | |
parent | 46afd8e69339b546526706056da9dd5009fa01f1 (diff) | |
download | google-benchmark-09b93ccc6a9aed84c269b6f5b8130c878e518ebb.tar.gz |
fix android compilation (#372)
* fix android compilation
* checking __GLIBCXX__ and __GLIBCPP__ macro in addition to __ANDROID__
* using vsnprintf instead of std::vsnprintf to compile on Android
* removed __GLIBCPP__ check on Android
* StringPrintF instead of std::to_string for Android
Diffstat (limited to 'src/colorprint.cc')
-rw-r--r-- | src/colorprint.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/colorprint.cc b/src/colorprint.cc index 513376b..2dec4a8 100644 --- a/src/colorprint.cc +++ b/src/colorprint.cc @@ -89,7 +89,7 @@ std::string FormatString(const char* msg, va_list args) { std::size_t size = 256; char local_buff[256]; - auto ret = std::vsnprintf(local_buff, size, msg, args_cp); + auto ret = vsnprintf(local_buff, size, msg, args_cp); va_end(args_cp); @@ -104,7 +104,7 @@ std::string FormatString(const char* msg, va_list args) { // we did not provide a long enough buffer on our first attempt. size = (size_t)ret + 1; // + 1 for the null byte std::unique_ptr<char[]> buff(new char[size]); - ret = std::vsnprintf(buff.get(), size, msg, args); + ret = vsnprintf(buff.get(), size, msg, args); CHECK(ret > 0 && ((size_t)ret) < size); return buff.get(); } |