diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-12-26 14:58:26 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-12-30 21:48:56 +0100 |
| commit | 8ab6f683cd316acf57bb89ed83932a267c5aa3c2 (patch) | |
| tree | 4ccb6033dae1e87e55aa00dbbc395c536dc8be49 /src/iso19111 | |
| parent | 7acbe96928d564ac86f74c319e4d37143352671b (diff) | |
| download | PROJ-8ab6f683cd316acf57bb89ed83932a267c5aa3c2.tar.gz PROJ-8ab6f683cd316acf57bb89ed83932a267c5aa3c2.zip | |
Merge projects.h into proj_internal.h
Diffstat (limited to 'src/iso19111')
| -rw-r--r-- | src/iso19111/c_api.cpp | 3 | ||||
| -rw-r--r-- | src/iso19111/coordinateoperation.cpp | 2 | ||||
| -rw-r--r-- | src/iso19111/datum.cpp | 2 | ||||
| -rw-r--r-- | src/iso19111/factory.cpp | 2 | ||||
| -rw-r--r-- | src/iso19111/io.cpp | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp index 0fe0c247..20629e8b 100644 --- a/src/iso19111/c_api.cpp +++ b/src/iso19111/c_api.cpp @@ -50,10 +50,9 @@ // PROJ include order is sensitive // clang-format off -#include "proj_internal.h" #include "proj.h" +#include "proj_internal.h" #include "proj_experimental.h" -#include "projects.h" // clang-format on #include "proj_constants.h" diff --git a/src/iso19111/coordinateoperation.cpp b/src/iso19111/coordinateoperation.cpp index 6b6651da..93314b85 100644 --- a/src/iso19111/coordinateoperation.cpp +++ b/src/iso19111/coordinateoperation.cpp @@ -44,7 +44,7 @@ // PROJ include order is sensitive // clang-format off #include "proj.h" -#include "projects.h" // M_PI +#include "proj_internal.h" // M_PI // clang-format on #include <algorithm> diff --git a/src/iso19111/datum.cpp b/src/iso19111/datum.cpp index 16e86296..320be14b 100644 --- a/src/iso19111/datum.cpp +++ b/src/iso19111/datum.cpp @@ -42,7 +42,7 @@ // PROJ include order is sensitive // clang-format off #include "proj.h" -#include "projects.h" +#include "proj_internal.h" #include "proj_api.h" // clang-format on diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp index 47d31db9..dcc32f32 100644 --- a/src/iso19111/factory.cpp +++ b/src/iso19111/factory.cpp @@ -59,7 +59,7 @@ // PROJ include order is sensitive // clang-format off #include "proj.h" -#include "projects.h" +#include "proj_internal.h" // clang-format on #include <sqlite3.h> diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp index effb3968..15a069c6 100644 --- a/src/iso19111/io.cpp +++ b/src/iso19111/io.cpp @@ -66,7 +66,7 @@ // PROJ include order is sensitive // clang-format off #include "proj.h" -#include "projects.h" +#include "proj_internal.h" #include "proj_api.h" // clang-format on |