From 5c0d7ee1579b531a0b66e41c984e24f8177834d1 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 11 Apr 2018 17:34:48 +0200 Subject: [PATCH 1/2] Fix return that can't be reached --- fmt/format.h | 1 - 1 file changed, 1 deletion(-) diff --git a/fmt/format.h b/fmt/format.h index 649d39ee..761baa33 100644 --- a/fmt/format.h +++ b/fmt/format.h @@ -2099,7 +2099,6 @@ void ArgMap::init(const ArgList &args) { /*nothing*/; } } - return; } for (unsigned i = 0; i != ArgList::MAX_PACKED_ARGS; ++i) { internal::Arg::Type arg_type = args.type(i); From ea2cf449f74310fac1b14c96ad8bd8e52cf26fe7 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 11 Apr 2018 17:39:38 +0200 Subject: [PATCH 2/2] Stop newer CMake's from warning about OLD policy --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d99babdb..98c5594f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ message(STATUS "CMake version: ${CMAKE_VERSION}") cmake_minimum_required(VERSION 2.8.12) if (POLICY CMP0048) # Version variables - cmake_policy(SET CMP0048 OLD) + cmake_policy(SET CMP0048 NEW) endif () if (POLICY CMP0063) # Visibility