Bug 1354222: fix log level casting warnings. r?erahm
MozReview-Commit-ID: A6hnPD3NkYr
--- a/media/mtransport/logging.h
+++ b/media/mtransport/logging.h
@@ -7,23 +7,24 @@
// Original author: ekr@rtfm.com
#ifndef logging_h__
#define logging_h__
#include <sstream>
#include "mozilla/Logging.h"
+#ifdef MOZILLA_INTERNAL_API
+
#define ML_ERROR mozilla::LogLevel::Error
#define ML_WARNING mozilla::LogLevel::Warning
#define ML_NOTICE mozilla::LogLevel::Info
#define ML_INFO mozilla::LogLevel::Debug
#define ML_DEBUG mozilla::LogLevel::Verbose
-#ifdef MOZILLA_INTERNAL_API
#define MOZ_MTLOG_MODULE(n) \
static mozilla::LogModule* getLogModule() { \
static mozilla::LazyLogModule log(n); \
return static_cast<mozilla::LogModule*>(log); \
}
#define MOZ_MTLOG(level, b) \
do { \
@@ -34,26 +35,32 @@
} \
} while(0)
#else
// When building mtransport outside of XUL, for example in stand-alone gtests,
// PR_Logging needs to be used instead of mozilla logging.
#include "prlog.h"
+#define ML_ERROR PR_LOG_ERROR
+#define ML_WARNING PR_LOG_WARNING
+#define ML_NOTICE PR_LOG_INFO
+#define ML_INFO PR_LOG_DEBUG
+#define ML_DEBUG PR_LOG_VERBOSE
+
#define MOZ_MTLOG_MODULE(n) \
static PRLogModuleInfo* getLogModule() { \
static PRLogModuleInfo* log; \
if (!log) \
log = PR_NewLogModule(n); \
return log; \
}
#define MOZ_MTLOG(level, b) \
do { \
- if (PR_LOG_TEST(getLogModule(), (PRLogModuleLevel)level)) { \
+ if (PR_LOG_TEST(getLogModule(), level)) { \
std::stringstream str; \
str << b; \
- PR_LOG(getLogModule(), (PRLogModuleLevel)level, ("%s", str.str().c_str())); \
+ PR_LOG(getLogModule(), level, ("%s", str.str().c_str())); \
} \
} while(0)
#endif // MOZILLA_INTERNAL_API
#endif // logging_h__