summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
Diffstat (limited to 'platform')
-rw-r--r--platform/android/log_android.cpp7
-rw-r--r--platform/darwin/log_nslog.mm6
-rw-r--r--platform/default/log_stderr.cpp4
3 files changed, 6 insertions, 11 deletions
diff --git a/platform/android/log_android.cpp b/platform/android/log_android.cpp
index 9de8232bac..e5c8cfd812 100644
--- a/platform/android/log_android.cpp
+++ b/platform/android/log_android.cpp
@@ -1,8 +1,5 @@
#include <mbgl/platform/log.hpp>
-#define __STDC_FORMAT_MACROS // NDK bug workaround: https://code.google.com/p/android/issues/detail?id=72349
-#include <cinttypes>
-
#include <android/log.h>
namespace mbgl {
@@ -30,8 +27,8 @@ int severityToPriority(EventSeverity severity) {
} // namespace
-void Log::platformRecord(EventSeverity severity, Event event, int64_t code, const std::string &msg) {
- __android_log_print(severityToPriority(severity), EventClass(event).c_str(), "(%" PRId64 ") %s", code, msg.c_str());
+void Log::platformRecord(EventSeverity severity, const std::string &msg) {
+ __android_log_print(severityToPriority(severity), "mbgl", "%s", msg.c_str());
}
}
diff --git a/platform/darwin/log_nslog.mm b/platform/darwin/log_nslog.mm
index 5d53ed812f..a2e31968ab 100644
--- a/platform/darwin/log_nslog.mm
+++ b/platform/darwin/log_nslog.mm
@@ -4,12 +4,10 @@
namespace mbgl {
-void Log::platformRecord(EventSeverity severity, Event event, int64_t code,
- const std::string &msg) {
+void Log::platformRecord(EventSeverity severity, const std::string &msg) {
NSString *message =
[[NSString alloc] initWithBytes:msg.data() length:msg.size() encoding:NSUTF8StringEncoding];
- NSLog(@"[%s] %s: (%lld) %@", EventSeverityClass(severity).c_str(), EventClass(event).c_str(),
- code, message);
+ NSLog(@"[%s] %@", EventSeverityClass(severity).c_str(), message);
}
}
diff --git a/platform/default/log_stderr.cpp b/platform/default/log_stderr.cpp
index 3305176d96..f7ef341845 100644
--- a/platform/default/log_stderr.cpp
+++ b/platform/default/log_stderr.cpp
@@ -4,8 +4,8 @@
namespace mbgl {
-void Log::platformRecord(EventSeverity severity, Event event, int64_t code, const std::string &msg) {
- std::cerr << "[" << severity << "] " << event << ": (" << code << ") " << msg << std::endl;
+void Log::platformRecord(EventSeverity severity, const std::string &msg) {
+ std::cerr << "[" << severity << "] " << msg << std::endl;
}
}