mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2025-04-18 11:42:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of compile-time strings when including ostream.h (#768)

Browse Source
This commit is contained in:
Victor Zverovich 2018-06-10 19:05:27 +02:00
parent e3707ef14b
commit 9ff3b6af2e
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/fmt/ostream.h
View File

@ -53,8 +53,7 @@ struct test_stream : std::basic_ostream<Char> {
void operator<<(null); void operator<<(null);
}; };
// Checks if T has an overloaded operator<< which is a free function (not a // Checks if T has a user-defined operator<< (e.g. not a member of std::ostream).
// member of std::ostream).
template <typename T, typename Char> template <typename T, typename Char>
class is_streamable { class is_streamable {
private: private:
@ -69,7 +68,9 @@ class is_streamable {
typedef decltype(test<T>(0)) result; typedef decltype(test<T>(0)) result;
public: public:
static const bool value = result::value; // std::string operator<< is not considered user-defined because we handle strings
// specially.
static const bool value = result::value && !std::is_same<T, std::string>::value;
}; };
// Disable conversion to int if T has an overloaded operator<< which is a free // Disable conversion to int if T has an overloaded operator<< which is a free

4
test/ostream-test.cc
View File

@ -163,3 +163,7 @@ TEST(OStreamTest, Join) {
int v[3] = {1, 2, 3}; int v[3] = {1, 2, 3};
EXPECT_EQ("1, 2, 3", fmt::format("{}", fmt::join(v, v + 3, ", "))); EXPECT_EQ("1, 2, 3", fmt::format("{}", fmt::join(v, v + 3, ", ")));
} }
TEST(OStreamTest, ConstexprString) {
EXPECT_EQ("42", format(fmt("{}"), std::string("42")));
}