diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2018-07-16 14:58:45 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2018-07-16 18:25:09 +0200 |
| commit | 77894f0586244049f62682945ed358ca738aa8e0 (patch) | |
| tree | 864fe3353efefe398195bf051e12c14041d5bc28 | |
| parent | 561e55eb6c67f96ea05b471930bbd365dc44629d (diff) | |
| download | qtlocation-mapboxgl-77894f0586244049f62682945ed358ca738aa8e0.tar.gz | |
[core] treat parsedate as C++ file to remove C build rules
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.cmake | 4 | ||||
| -rw-r--r-- | src/mbgl/util/chrono.cpp | 2 | ||||
| -rw-r--r-- | src/parsedate/parsedate.cpp (renamed from src/parsedate/parsedate.c) | 4 | ||||
| -rw-r--r-- | src/parsedate/parsedate.hpp (renamed from src/parsedate/parsedate.h) | 0 |
4 files changed, 5 insertions, 5 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..ff945589bb 100644 --- a/src/parsedate/parsedate.c +++ b/src/parsedate/parsedate.cpp @@ -73,7 +73,7 @@ */ -#include "parsedate.h" +#include "parsedate.hpp" @@ -671,7 +671,7 @@ static int parsedate(const char *date, time_t *output) time_t parse_date(const char *p) { - time_t parsed; + time_t parsed = -1; int rc = parsedate(p, &parsed); switch(rc) { 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 |