From 4e5423b3487771220cdca4c2b1a79c4d74b6afa5 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 21 Sep 2017 19:38:13 +0200 Subject: [PATCH] fix clang compilation (include header ordering) "i18n.h" needs to be included last, after types have been defined or clang bails out: "call to function 'operator<<' is not visible in the template definition" --- libs/ardour/disk_io.cc | 3 ++- libs/ardour/disk_reader.cc | 3 ++- libs/ardour/disk_writer.cc | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libs/ardour/disk_io.cc b/libs/ardour/disk_io.cc index 60e7ea56bb..83f082a4f4 100644 --- a/libs/ardour/disk_io.cc +++ b/libs/ardour/disk_io.cc @@ -19,7 +19,6 @@ #include "pbd/debug.h" #include "pbd/error.h" -#include "pbd/i18n.h" #include "ardour/audioplaylist.h" #include "ardour/butler.h" @@ -36,6 +35,8 @@ #include "ardour/session.h" #include "ardour/session_playlists.h" +#include "pbd/i18n.h" + using namespace ARDOUR; using namespace PBD; using namespace std; diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc index 1e9743a181..3aac9e07f5 100644 --- a/libs/ardour/disk_reader.cc +++ b/libs/ardour/disk_reader.cc @@ -18,7 +18,6 @@ */ #include "pbd/enumwriter.h" -#include "pbd/i18n.h" #include "pbd/memento_command.h" #include "ardour/audioengine.h" @@ -36,6 +35,8 @@ #include "ardour/session.h" #include "ardour/session_playlists.h" +#include "pbd/i18n.h" + using namespace ARDOUR; using namespace PBD; using namespace std; diff --git a/libs/ardour/disk_writer.cc b/libs/ardour/disk_writer.cc index 429eb1e7c9..4306363e58 100644 --- a/libs/ardour/disk_writer.cc +++ b/libs/ardour/disk_writer.cc @@ -17,8 +17,6 @@ */ -#include "pbd/i18n.h" - #include "ardour/analyser.h" #include "ardour/audioengine.h" #include "ardour/audiofilesource.h" @@ -36,6 +34,8 @@ #include "ardour/session.h" #include "ardour/smf_source.h" +#include "pbd/i18n.h" + using namespace ARDOUR; using namespace PBD; using namespace std;