tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[windows][qt] Remove std:: namespace of some functions

Browse Source 
Not available on Windows.
This commit is contained in:
Thiago Marcos P. Santos
2017-12-14 14:48:20 +02:00
parent af183f3952
commit f880baaeb7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/qt/src/sqlite3.cpp
View File

@@ -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() {

2
src/mbgl/style/expression/let.cpp
View File

@@ -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);