Skip to content

F
fmt
Commit 04a21bbb authored by Victor Zverovich's avatar Victor Zverovich
Browse files
Options

Merge branch 'fallthrough' of github.com:cppformat/cppformat

parents 267382af 618dd9d6
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 7 deletions
format.h
View file @ 04a21bbb
...@@ -119,12 +119,6 @@ ...@@ -119,12 +119,6 @@
# define FMT_NOEXCEPT(expr) # define FMT_NOEXCEPT(expr)
#endif #endif
#if FMT_HAS_CPP_ATTRIBUTE(clang::fallthrough)
# define FMT_FALLTHROUGH [[clang::fallthrough]]
#else
# define FMT_FALLTHROUGH
#endif
// A macro to disallow the copy constructor and operator= functions // A macro to disallow the copy constructor and operator= functions
// This should be used in the private: declarations for a class // This should be used in the private: declarations for a class
#define FMT_DISALLOW_COPY_AND_ASSIGN(TypeName) \ #define FMT_DISALLOW_COPY_AND_ASSIGN(TypeName) \
...@@ -880,7 +874,7 @@ class ArgVisitor { ...@@ -880,7 +874,7 @@ class ArgVisitor {
switch (arg.type) { switch (arg.type) {
default: default:
assert(false); assert(false);
FMT_FALLTHROUGH; return Result();
case Arg::INT: case Arg::INT:
return FMT_DISPATCH(visit_int(arg.int_value)); return FMT_DISPATCH(visit_int(arg.int_value));
case Arg::UINT: case Arg::UINT:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment