summaryrefslogtreecommitdiff
path: root/flower
diff options
context:
space:
mode:
authorDan Eble <nine.fierce.ballads@gmail.com>2015-08-08 13:11:02 -0400
committerDan Eble <nine.fierce.ballads@gmail.com>2015-08-20 06:53:21 -0400
commit7d71f371e483a4a305fc16a2b3fbce879a464253 (patch)
treeb6f46eca45e5bbb881a576846cefceb37abf8098 /flower
parent1f2b44363dce100b9fac6459ef4e6c37dfd62444 (diff)
Issue 4560: group #include directives at top of file
This is so that using-declarations can later be added without appearing before #includes.
Diffstat (limited to 'flower')
-rw-r--r--flower/file-path.cc3
-rw-r--r--flower/include/direction.hh1
-rw-r--r--flower/std-string.cc3
3 files changed, 4 insertions, 3 deletions
diff --git a/flower/file-path.cc b/flower/file-path.cc
index 09e9c4a2fa..65cd517e5a 100644
--- a/flower/file-path.cc
+++ b/flower/file-path.cc
@@ -39,13 +39,14 @@
#define PATHSEP ':'
#endif
+#include <algorithm>
+
vector<string>
File_path::directories () const
{
return dirs_;
}
-#include <algorithm>
void
File_path::parse_path (const string &p)
{
diff --git a/flower/include/direction.hh b/flower/include/direction.hh
index de13ef4ca8..0d36c0f7c7 100644
--- a/flower/include/direction.hh
+++ b/flower/include/direction.hh
@@ -20,6 +20,7 @@
#ifndef DIRECTION_HH
#define DIRECTION_HH
+#include <algorithm>
#include "axis.hh"
enum Direction
diff --git a/flower/std-string.cc b/flower/std-string.cc
index 9666b9e9c3..593a286d84 100644
--- a/flower/std-string.cc
+++ b/flower/std-string.cc
@@ -19,6 +19,7 @@
#include "std-string.hh"
#include "string-convert.hh"
+#include "std-vector.hh"
string
to_string (const string &s)
@@ -116,8 +117,6 @@ string_copy (const string &s)
return dest;
}
-#include "std-vector.hh"
-
vector<string>
string_split (string str, char c)
{