Bug 1614243 - Make mfbt/DbgMacro.h use standard variadic macro syntax, not gcc/clang extension syntax. r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D63283

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Jeff Walden 2020-02-19 10:44:31 +00:00
Родитель 199a362906
Коммит ad64e8c503
1 изменённых файлов: 6 добавлений и 6 удалений

Просмотреть файл

@ -172,8 +172,8 @@ std::ostream& operator<<(std::ostream& aOut, const T (&aArray)[N]) {
// // MOZ_DBG as an rvalue reference and so wants to
// // invoke B's move constructor to initialize b2
#ifndef MOZILLA_OFFICIAL
# define MOZ_DBG(expression_...) \
mozilla::detail::MozDbg(__FILE__, __LINE__, #expression_, expression_)
# define MOZ_DBG(...) \
mozilla::detail::MozDbg(__FILE__, __LINE__, #__VA_ARGS__, __VA_ARGS__)
#endif
// Helper macro for MOZ_DEFINE_DBG.
@ -194,13 +194,13 @@ std::ostream& operator<<(std::ostream& aOut, const T (&aArray)[N]) {
//
// generates an operator<< that outputs strings like
// "Point { x = 1.0, y = 2.0 }".
#define MOZ_DEFINE_DBG(type_, members_...) \
#define MOZ_DEFINE_DBG(type_, ...) \
friend std::ostream& operator<<(std::ostream& aOut, const type_& aValue) { \
return aOut << #type_ \
<< (MOZ_ARG_COUNT(members_) == 0 ? "" : " { ") \
<< (MOZ_ARG_COUNT(__VA_ARGS__) == 0 ? "" : " { ") \
MOZ_FOR_EACH_SEPARATED(MOZ_DBG_FIELD, (<< ", "), (), \
(members_)) \
<< (MOZ_ARG_COUNT(members_) == 0 ? "" : " }"); \
(__VA_ARGS__)) \
<< (MOZ_ARG_COUNT(__VA_ARGS__) == 0 ? "" : " }"); \
}
#endif // mozilla_DbgMacro_h