From 46a962eb5ddd4c37a67129fdda4b6615e986b8f1 Mon Sep 17 00:00:00 2001 From: Ethan Date: Thu, 29 Aug 2019 21:32:58 +0200 Subject: [PATCH 1/3] externals: update fmt to 6.0.0 --- externals/fmt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/fmt b/externals/fmt index 9e554999c..7512a55aa 160000 --- a/externals/fmt +++ b/externals/fmt @@ -1 +1 @@ -Subproject commit 9e554999ce02cf86fcdfe74fe740c4fe3f5a56d5 +Subproject commit 7512a55aa3ae309587ca89668ef9ec4074a51a1f From 5adbe66ae83fa1b8cbebb2e340d2f8040bf3b16d Mon Sep 17 00:00:00 2001 From: Ethan Date: Thu, 29 Aug 2019 21:34:51 +0200 Subject: [PATCH 2/3] accommodate for fmt update --- src/core/hle/service/fatal/fatal.cpp | 2 +- src/core/reporter.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/fatal/fatal.cpp b/src/core/hle/service/fatal/fatal.cpp index fe49c2161..01fa06ad3 100644 --- a/src/core/hle/service/fatal/fatal.cpp +++ b/src/core/hle/service/fatal/fatal.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include "common/file_util.h" #include "common/logging/log.h" #include "common/scm_rev.h" diff --git a/src/core/reporter.cpp b/src/core/reporter.cpp index 5d4c3e6ea..4a0b103e4 100644 --- a/src/core/reporter.cpp +++ b/src/core/reporter.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include "common/file_util.h" From 30448641f2168bb6a234078279a9b46c90aa327b Mon Sep 17 00:00:00 2001 From: Ethan Date: Thu, 29 Aug 2019 22:44:49 +0200 Subject: [PATCH 3/3] Fix clang-format --- src/core/reporter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/reporter.cpp b/src/core/reporter.cpp index 4a0b103e4..cfe0771e2 100644 --- a/src/core/reporter.cpp +++ b/src/core/reporter.cpp @@ -5,8 +5,8 @@ #include #include -#include #include +#include #include #include "common/file_util.h"