Skip to content

Commit

Permalink
Merge branch 'fallthrough' of github.com:cppformat/cppformat
Browse files Browse the repository at this point in the history
  • Loading branch information
vitaut committed Feb 9, 2015
2 parents 267382a + 618dd9d commit 04a21bb
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions format.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,6 @@
# define FMT_NOEXCEPT(expr)
#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
// This should be used in the private: declarations for a class
#define FMT_DISALLOW_COPY_AND_ASSIGN(TypeName) \
Expand Down Expand Up @@ -880,7 +874,7 @@ class ArgVisitor {
switch (arg.type) {
default:
assert(false);
FMT_FALLTHROUGH;
return Result();
case Arg::INT:
return FMT_DISPATCH(visit_int(arg.int_value));
case Arg::UINT:
Expand Down

0 comments on commit 04a21bb

Please sign in to comment.