From 960286f4193bc509f596a4db1f4fbfb0b6de4d36 Mon Sep 17 00:00:00 2001
From: Alessandro Di Federico <ale@clearmind.me>
Date: Mon, 23 Apr 2018 23:09:19 +0200
Subject: [PATCH] Reorder Boost includes

Include directives are groups by library, the groups should be sorted
from the most general (i.e., the STL) to the most specific (the local
includes).

This commit ensures that Boost includes are before LLVM includes.
---
 codegenerator.cpp            | 10 +++++-----
 jumptargetmanager.h          |  2 ++
 osra.cpp                     |  6 +++---
 tests/Unit/stackanalysis.cpp |  2 --
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/codegenerator.cpp b/codegenerator.cpp
index 792d17a71..1e283d06d 100644
--- a/codegenerator.cpp
+++ b/codegenerator.cpp
@@ -16,6 +16,11 @@
 #include <set>
 #include <utility>
 
+// Boost includes
+#include <boost/icl/interval_map.hpp>
+#include <boost/type_traits/is_same.hpp>
+#include <boost/icl/right_open_interval.hpp>
+
 // LLVM includes
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/ExecutionEngine/RuntimeDyld.h"
@@ -33,11 +38,6 @@
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 
-// Boost includes
-#include <boost/icl/interval_map.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/icl/right_open_interval.hpp>
-
 // Local includes
 #include "codegenerator.h"
 #include "debug.h"
diff --git a/jumptargetmanager.h b/jumptargetmanager.h
index e98ed225d..e0e20b499 100644
--- a/jumptargetmanager.h
+++ b/jumptargetmanager.h
@@ -10,6 +10,8 @@
 #include <map>
 #include <set>
 #include <vector>
+
+// Boost includes
 #include <boost/icl/interval_set.hpp>
 #include <boost/icl/interval_map.hpp>
 #include <boost/type_traits/is_same.hpp>
diff --git a/osra.cpp b/osra.cpp
index cd14ac59b..d28d8fb52 100644
--- a/osra.cpp
+++ b/osra.cpp
@@ -10,6 +10,9 @@
 #include <cstdint>
 #include <vector>
 
+// Boost includes
+#include <boost/icl/interval_set.hpp>
+
 // LLVM includes
 #include "llvm/ADT/Optional.h"
 #include "llvm/Analysis/ConstantFolding.h"
@@ -22,9 +25,6 @@
 #include "llvm/Support/raw_os_ostream.h"
 #include "llvm/Pass.h"
 
-// Boost includes
-#include <boost/icl/interval_set.hpp>
-
 // Local includes
 #include "datastructures.h"
 #include "debug.h"
diff --git a/tests/Unit/stackanalysis.cpp b/tests/Unit/stackanalysis.cpp
index ca1020c41..0a6ceb738 100644
--- a/tests/Unit/stackanalysis.cpp
+++ b/tests/Unit/stackanalysis.cpp
@@ -5,8 +5,6 @@
 // This file is distributed under the MIT License. See LICENSE.md for details.
 //
 
-// Standard includes
-
 // Boost includes
 #define BOOST_TEST_MODULE StackAnalysis
 #include <boost/test/unit_test.hpp>