Skip to content

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

Merge branch '4.x' of github.com:fmtlib/fmt into 4.x

parents a9c0bb4b ea2cf449
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
CMakeLists.txt
View file @ bdab94ba
...@@ -3,7 +3,7 @@ message(STATUS "CMake version: ${CMAKE_VERSION}") ...@@ -3,7 +3,7 @@ message(STATUS "CMake version: ${CMAKE_VERSION}")
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
if (POLICY CMP0048) # Version variables if (POLICY CMP0048) # Version variables
cmake_policy(SET CMP0048 OLD) cmake_policy(SET CMP0048 NEW)
endif () endif ()
if (POLICY CMP0063) # Visibility if (POLICY CMP0063) # Visibility
......
fmt/format.h
View file @ bdab94ba
...@@ -2099,7 +2099,6 @@ void ArgMap<Char>::init(const ArgList &args) { ...@@ -2099,7 +2099,6 @@ void ArgMap<Char>::init(const ArgList &args) {
/*nothing*/; /*nothing*/;
} }
} }
return;
} }
for (unsigned i = 0; i != ArgList::MAX_PACKED_ARGS; ++i) { for (unsigned i = 0; i != ArgList::MAX_PACKED_ARGS; ++i) {
internal::Arg::Type arg_type = args.type(i); internal::Arg::Type arg_type = args.type(i);
......
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