diff options
-rw-r--r-- | linux/main.cpp | 2 | ||||
-rw-r--r-- | macosx/main.mm | 2 | ||||
-rw-r--r-- | platform/default/image.cpp | 2 | ||||
-rw-r--r-- | platform/default/sqlite_cache.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/util/stopwatch.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/linux/main.cpp b/linux/main.cpp index 81bb684650..4bc45041d1 100644 --- a/linux/main.cpp +++ b/linux/main.cpp @@ -139,7 +139,7 @@ int main(int argc, char *argv[]) { map.setStyleURL(newStyle.url); view->setWindowTitle(newStyle.name); - mbgl::Log::Info(mbgl::Event::Setup, std::string("Changed style to: ") + newStyle.name); + mbgl::Log::Info(mbgl::Event::Setup, "Changed style to: %s", newStyle.name); }); // Load style diff --git a/macosx/main.mm b/macosx/main.mm index 7d5226d246..fceec13116 100644 --- a/macosx/main.mm +++ b/macosx/main.mm @@ -180,7 +180,7 @@ int main(int argc, char* argv[]) { map.setStyleURL(newStyle.url); view.setWindowTitle(newStyle.name); - mbgl::Log::Info(mbgl::Event::Setup, std::string("Changed style to: ") + newStyle.name); + mbgl::Log::Info(mbgl::Event::Setup, "Changed style to: %s", newStyle.name); }); diff --git a/platform/default/image.cpp b/platform/default/image.cpp index d7dcfc38b5..1562a06b74 100644 --- a/platform/default/image.cpp +++ b/platform/default/image.cpp @@ -86,7 +86,7 @@ Image::Image(std::string const& data) } catch (ImageReaderException const& ex) { - Log::Error(Event::Image, ex.what()); + Log::Error(Event::Image, "%s", ex.what()); img.reset(); width = 0; height = 0; diff --git a/platform/default/sqlite_cache.cpp b/platform/default/sqlite_cache.cpp index 5dc1521680..aecbeb6a97 100644 --- a/platform/default/sqlite_cache.cpp +++ b/platform/default/sqlite_cache.cpp @@ -134,7 +134,7 @@ void SQLiteCache::Impl::get(const Resource &resource, Callback callback) { Log::Error(Event::Database, ex.code, ex.what()); callback(nullptr); } catch (std::runtime_error& ex) { - Log::Error(Event::Database, ex.what()); + Log::Error(Event::Database, "%s", ex.what()); callback(nullptr); } } @@ -204,7 +204,7 @@ void SQLiteCache::Impl::put(const Resource& resource, std::shared_ptr<const Resp } catch (mapbox::sqlite::Exception& ex) { Log::Error(Event::Database, ex.code, ex.what()); } catch (std::runtime_error& ex) { - Log::Error(Event::Database, ex.what()); + Log::Error(Event::Database, "%s", ex.what()); } } diff --git a/src/mbgl/util/stopwatch.cpp b/src/mbgl/util/stopwatch.cpp index c4b4fbb330..77779338ae 100644 --- a/src/mbgl/util/stopwatch.cpp +++ b/src/mbgl/util/stopwatch.cpp @@ -23,7 +23,7 @@ stopwatch::stopwatch(const std::string &name_, EventSeverity severity_, Event ev void stopwatch::report(const std::string &name_) { Duration duration = Clock::now() - start; - Log::Record(severity, event, name_ + ": " + util::toString(std::chrono::duration_cast<std::chrono::milliseconds>(duration).count()) + "ms"); + Log::Record(severity, event, "%s: %fms", name_.c_str(), std::chrono::duration<float, std::chrono::milliseconds::period>(duration).count()); start += duration; } |