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

Revert problematic pragma

Browse Source
This commit is contained in:
Victor Zverovich
2018-02-18 05:38:32 +00:00
parent 18ac98700e
commit 8ca3ab2c4c
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/fmt/core.h
View File

@ -870,7 +870,8 @@ namespace internal {
template <typename Context, typename T> template <typename Context, typename T>
class get_type { class get_type {
public: public:
typedef decltype(make_value<Context>(std::declval<typename std::decay<T>::type&>())) value_type; typedef decltype(make_value<Context>(
std::declval<typename std::decay<T>::type&>())) value_type;
static const type value = value_type::type_tag; static const type value = value_type::type_tag;
}; };

6
include/fmt/format.h
View File

@ -642,13 +642,7 @@ class null_terminating_iterator {
return ptr_ >= other.ptr_; return ptr_ >= other.ptr_;
} }
// 'fmt::internal::pointer_from': the inline specifier cannot be used
// when a friend declaration refers to a specialization of a function
// pointer_from is defined with the inline specifier, but declared without,
// so this looks like a bug in the compiler.
friend FMT_CONSTEXPR_DECL const Char *pointer_from<Char>( friend FMT_CONSTEXPR_DECL const Char *pointer_from<Char>(
# pragma warning(suppress: 4396)
null_terminating_iterator it); null_terminating_iterator it);
private: private: