summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2018-07-16 14:58:45 +0200
committerKonstantin Käfer <mail@kkaefer.com>2018-07-16 15:34:11 +0200
commit148d1d47667f7cf3458fd87f0412d9f6042a3f4d (patch)
tree9217d4405e19146f11a76febb47299489e595f61
parenta6727921fc1608d341c086cd70341e6df5e79a2b (diff)
downloadqtlocation-mapboxgl-upstream/no-c-files.tar.gz
[core] treat parsedate as C++ file to remove C build rulesupstream/no-c-files
It is already wrapped with #ifdef __cplusplus extern "C", so we can safely compile it as C++ but retain C linkage
-rw-r--r--cmake/core-files.cmake4
-rw-r--r--src/mbgl/util/chrono.cpp2
-rw-r--r--src/parsedate/parsedate.cpp (renamed from src/parsedate/parsedate.c)2
-rw-r--r--src/parsedate/parsedate.hpp (renamed from src/parsedate/parsedate.h)0
4 files changed, 4 insertions, 4 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake
index 7d7e887a76..204bb78bce 100644
--- a/cmake/core-files.cmake
+++ b/cmake/core-files.cmake
@@ -127,8 +127,8 @@ set(MBGL_CORE_FILES
src/mbgl/math/log2.cpp
# parsedate
- src/parsedate/parsedate.c
- src/parsedate/parsedate.h
+ src/parsedate/parsedate.cpp
+ src/parsedate/parsedate.hpp
# programs
src/mbgl/programs/attributes.hpp
diff --git a/src/mbgl/util/chrono.cpp b/src/mbgl/util/chrono.cpp
index a880093b74..c304548cf1 100644
--- a/src/mbgl/util/chrono.cpp
+++ b/src/mbgl/util/chrono.cpp
@@ -1,6 +1,6 @@
#include <mbgl/util/chrono.hpp>
-#include <parsedate/parsedate.h>
+#include <parsedate/parsedate.hpp>
#include <cstdio>
#include <ctime>
diff --git a/src/parsedate/parsedate.c b/src/parsedate/parsedate.cpp
index 7228c4edbc..538c9cefa2 100644
--- a/src/parsedate/parsedate.c
+++ b/src/parsedate/parsedate.cpp
@@ -73,7 +73,7 @@
*/
-#include "parsedate.h"
+#include "parsedate.hpp"
diff --git a/src/parsedate/parsedate.h b/src/parsedate/parsedate.hpp
index 6905e361d4..6905e361d4 100644
--- a/src/parsedate/parsedate.h
+++ b/src/parsedate/parsedate.hpp