feedc0de/fmt
1
0
Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

More cleanup

Browse Source
This commit is contained in:
Victor Zverovich
2019-06-11 22:11:47 -07:00
parent 5e293bd97a
commit 9d7b64a259
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/fmt/core.h
View File

@@ -1228,8 +1228,6 @@ struct is_contiguous<internal::buffer<Char>> : std::true_type {};
namespace internal { namespace internal {
// Workaround for a SFINAE issue in gcc < 9:
// https://stackoverflow.com/q/56436995/471164
template <typename OutputIt> template <typename OutputIt>
struct is_contiguous_back_insert_iterator : std::false_type {}; struct is_contiguous_back_insert_iterator : std::false_type {};
template <typename Container> template <typename Container>

9
include/fmt/format.h
View File

@@ -37,6 +37,8 @@
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>
#include "core.h"
#ifdef __clang__ #ifdef __clang__
# define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__) # define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__)
#else #else
@@ -57,8 +59,6 @@
# define FMT_CUDA_VERSION 0 # define FMT_CUDA_VERSION 0
#endif #endif
#include "core.h"
#if FMT_GCC_VERSION >= 406 || FMT_CLANG_VERSION #if FMT_GCC_VERSION >= 406 || FMT_CLANG_VERSION
# pragma GCC diagnostic push # pragma GCC diagnostic push
@@ -2270,10 +2270,7 @@ void handle_dynamic_spec(Spec& value, arg_ref<typename Context::char_type> ref,
/** The default argument formatter. */ /** The default argument formatter. */
template <typename Range> template <typename Range>
class arg_formatter class arg_formatter : public internal::arg_formatter_base<Range> {
: public internal::function<
typename internal::arg_formatter_base<Range>::iterator>,
public internal::arg_formatter_base<Range> {
private: private:
typedef typename Range::value_type char_type; typedef typename Range::value_type char_type;
typedef internal::arg_formatter_base<Range> base; typedef internal::arg_formatter_base<Range> base;

5
include/fmt/printf.h
View File

@@ -204,10 +204,7 @@ template <typename OutputIt, typename Char> class basic_printf_context;
\endrst \endrst
*/ */
template <typename Range> template <typename Range>
class printf_arg_formatter class printf_arg_formatter : public internal::arg_formatter_base<Range> {
: public internal::function<
typename internal::arg_formatter_base<Range>::iterator>,
public internal::arg_formatter_base<Range> {
public: public:
typedef decltype(std::declval<Range>().begin()) iterator; typedef decltype(std::declval<Range>().begin()) iterator;