diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-12-14 14:48:20 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2018-01-08 14:44:19 +0200 |
| commit | d035ca5a831042602a55b1a9dcf3e66c1f675cb6 (patch) | |
| tree | 323cee3ffa9a9ba44c2ad47b030b2ae73092835f | |
| parent | 56967ea921dc44a90b13b6fd53926eaefe9e8d14 (diff) | |
| download | qtlocation-mapboxgl-d035ca5a831042602a55b1a9dcf3e66c1f675cb6.tar.gz | |
[windows][qt] Remove std:: namespace of some functions
Not available on Windows.
| -rw-r--r-- | platform/qt/src/sqlite3.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/style/expression/let.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/platform/qt/src/sqlite3.cpp b/platform/qt/src/sqlite3.cpp index 2f3db12f33..80efd6a326 100644 --- a/platform/qt/src/sqlite3.cpp +++ b/platform/qt/src/sqlite3.cpp @@ -354,7 +354,7 @@ template <> mbgl::Timestamp Statement::get(int offset) { QVariant value = impl->query.value(offset); checkQueryError(impl->query); return std::chrono::time_point_cast<std::chrono::seconds>( - std::chrono::system_clock::from_time_t(value.value<std::time_t>())); + std::chrono::system_clock::from_time_t(value.value<::time_t>())); } template <> optional<int64_t> Statement::get(int offset) { @@ -398,7 +398,7 @@ template <> optional<mbgl::Timestamp> Statement::get(int offset) { if (value.isNull()) return {}; return { std::chrono::time_point_cast<mbgl::Seconds>( - std::chrono::system_clock::from_time_t(value.value<std::time_t>())) }; + std::chrono::system_clock::from_time_t(value.value<::time_t>())) }; } void Statement::reset() { diff --git a/src/mbgl/style/expression/let.cpp b/src/mbgl/style/expression/let.cpp index 561e8515d4..5c08248eef 100644 --- a/src/mbgl/style/expression/let.cpp +++ b/src/mbgl/style/expression/let.cpp @@ -38,7 +38,7 @@ ParseResult Let::parse(const Convertible& value, ParsingContext& ctx) { } bool isValidName = std::all_of(name->begin(), name->end(), [](unsigned char c) { - return std::isalnum(c) || c == '_'; + return ::isalnum(c) || c == '_'; }); if (!isValidName) { ctx.error("Variable names must contain only alphanumeric characters or '_'.", 1); |