From 5f1a06f2aad96409d654ed432f55ba37d005ca94 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 20 May 2022 21:41:29 +0200 Subject: [PATCH] NO-OP sort includes - fixes macOS and --no-nls builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ardour's "pbd/i18n.h" needs to be included last, after all template specialization, otherwise there will be an ambiguity: ``` boost/function_types/detail/class_transform.hpp:23:26: error: ‘boost::mpl::placeholders::_’ has not been declared using mpl::placeholders::_; ``` --- gtk2_ardour/sfdb_freesound_mootcher.cc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gtk2_ardour/sfdb_freesound_mootcher.cc b/gtk2_ardour/sfdb_freesound_mootcher.cc index 9311c73776..12ee14d63c 100644 --- a/gtk2_ardour/sfdb_freesound_mootcher.cc +++ b/gtk2_ardour/sfdb_freesound_mootcher.cc @@ -39,30 +39,31 @@ *************************************************************************************/ -#include "sfdb_freesound_mootcher.h" - -#include "pbd/xml++.h" -#include "pbd/error.h" +#include #include #include -#include #include #include "pbd/gstdio_compat.h" -#include "pbd/i18n.h" +#include "pbd/error.h" +#include "pbd/pthread_utils.h" +#include "pbd/openuri.h" +#include "pbd/xml++.h" #include "ardour/audio_library.h" #include "ardour/debug.h" #include "ardour/filesystem_paths.h" -#include "ardour/rc_configuration.h" -#include "pbd/pthread_utils.h" -#include "pbd/openuri.h" + +#include "widgets/prompter.h" #include "ardour_dialog.h" +#include "sfdb_freesound_mootcher.h" #include "gui_thread.h" -#include "widgets/prompter.h" +#include "ui_config.h" + +#include "pbd/i18n.h" using namespace PBD;