From db97c6a7d9b201f2737608e0720c0e7e1e2aa786 Mon Sep 17 00:00:00 2001 From: Ben RUBSON Date: Mon, 9 Oct 2017 19:27:04 +0200 Subject: [PATCH] Correctly sort headers to get rid of llvm-include-order warnings --- encfs/DirNode.cpp | 25 ++++++++++++------------- encfs/FileNode.cpp | 12 ++++++------ encfs/readpassphrase.cpp | 4 ++-- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/encfs/DirNode.cpp b/encfs/DirNode.cpp index ca473f8..d5447d7 100644 --- a/encfs/DirNode.cpp +++ b/encfs/DirNode.cpp @@ -18,30 +18,29 @@ * along with this program. If not, see . */ +#include "DirNode.h" + #include #include +#include +#ifdef __linux__ +#include +#endif #include #include #include #include -#include - -#include "DirNode.h" -#include "FSConfig.h" -#include "FileNode.h" -#include "FileUtils.h" -#include "NameIO.h" -#ifdef __linux__ -#include -#endif - -#include "easylogging++.h" -#include #include +#include #include "Context.h" #include "Error.h" +#include "FSConfig.h" +#include "FileNode.h" +#include "FileUtils.h" #include "Mutex.h" +#include "NameIO.h" +#include "easylogging++.h" using namespace std; diff --git a/encfs/FileNode.cpp b/encfs/FileNode.cpp index e07763c..022c384 100644 --- a/encfs/FileNode.cpp +++ b/encfs/FileNode.cpp @@ -18,22 +18,22 @@ * along with this program. If not, see . */ +#include "FileNode.h" + #include #include +#include #include -#include -#include -#include #ifdef __linux__ #include #endif - -#include +#include +#include +#include #include "CipherFileIO.h" #include "Error.h" #include "FileIO.h" -#include "FileNode.h" #include "FileUtils.h" #include "MACFileIO.h" #include "Mutex.h" diff --git a/encfs/readpassphrase.cpp b/encfs/readpassphrase.cpp index 0dabad3..93750f7 100644 --- a/encfs/readpassphrase.cpp +++ b/encfs/readpassphrase.cpp @@ -37,6 +37,8 @@ static const char rcsid[] = #ifndef HAVE_READPASSPHRASE +#include "readpassphrase.h" + #include #include #include @@ -48,8 +50,6 @@ static const char rcsid[] = #include #include -#include "readpassphrase.h" - #ifdef TCSASOFT #define _T_FLUSH (TCSAFLUSH | TCSASOFT) #else