diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-02-27 13:27:23 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-02-27 13:27:23 +1100 |
| commit | 4434a57717efbec42d67c571890fc848183e500f (patch) | |
| tree | c5de0aff85545ab1a8d4f6fe925560eadcd9de23 | |
| parent | c81bc073334745825241e9817bc30aee2418ff9c (diff) | |
| download | scintilla-mirror-4434a57717efbec42d67c571890fc848183e500f.tar.gz | |
Backport: Added <utility> and <tuple> to header order and moved POSIX header <sys/time.h> after standard C++ language headers.
Backport of changeset 6461:abc640b89c43.
| -rw-r--r-- | cocoa/PlatCocoa.h | 4 | ||||
| -rw-r--r-- | cocoa/PlatCocoa.mm | 4 | ||||
| -rw-r--r-- | scripts/HeaderOrder.txt | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/cocoa/PlatCocoa.h b/cocoa/PlatCocoa.h index 05d2598f4..7557fbd35 100644 --- a/cocoa/PlatCocoa.h +++ b/cocoa/PlatCocoa.h @@ -7,13 +7,13 @@ #ifndef PLATCOCOA_H #define PLATCOCOA_H -#include <sys/time.h> - #include <cstdlib> #include <cassert> #include <cstring> #include <cstdio> +#include <sys/time.h> + #include <Cocoa/Cocoa.h> #include "Platform.h" diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index 6547631ad..ea4149d97 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -12,8 +12,6 @@ * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt). */ -#include <sys/time.h> - #include <cstddef> #include <cstdlib> #include <cassert> @@ -25,6 +23,8 @@ #include <map> #include <memory> +#include <sys/time.h> + #import <Foundation/NSGeometry.h> #import "Platform.h" diff --git a/scripts/HeaderOrder.txt b/scripts/HeaderOrder.txt index 4d384d8b9..04f036473 100644 --- a/scripts/HeaderOrder.txt +++ b/scripts/HeaderOrder.txt @@ -14,7 +14,6 @@ #include <assert.h> #include <ctype.h> #include <limits.h> -#include <sys/time.h> #include <wchar.h> // C++ wrappers of C standard library @@ -33,6 +32,8 @@ // C++ standard library #include <stdexcept> #include <new> +#include <utility> +#include <tuple> #include <string> #include <vector> #include <deque> @@ -47,6 +48,9 @@ #include <iostream> #include <sstream> +// POSIX +#include <sys/time.h> + // GTK+ headers #include <glib.h> #include <gmodule.h> |