Rename UNIT_TEST to WEBRTC_UNIT_TEST
Current name conflicts with upstream project code. Bug: webrtc:12247 Change-Id: Ibd78273a75262772fc18fca688c29b9ba9525ce5 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/196653 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Andrey Logvin <landrey@webrtc.org> Cr-Commit-Position: refs/heads/master@{#32813}
This commit is contained in:
committed by
Commit Bot
parent
7e6290d1d2
commit
b95d90b78a
@ -11,9 +11,9 @@
|
||||
#ifndef API_RTC_ERROR_H_
|
||||
#define API_RTC_ERROR_H_
|
||||
|
||||
#ifdef UNIT_TEST
|
||||
#ifdef WEBRTC_UNIT_TEST
|
||||
#include <ostream>
|
||||
#endif // UNIT_TEST
|
||||
#endif // WEBRTC_UNIT_TEST
|
||||
#include <string>
|
||||
#include <utility> // For std::move.
|
||||
|
||||
@ -161,7 +161,7 @@ class RTC_EXPORT RTCError {
|
||||
RTC_EXPORT const char* ToString(RTCErrorType error);
|
||||
RTC_EXPORT const char* ToString(RTCErrorDetailType error);
|
||||
|
||||
#ifdef UNIT_TEST
|
||||
#ifdef WEBRTC_UNIT_TEST
|
||||
inline std::ostream& operator<<( // no-presubmit-check TODO(webrtc:8982)
|
||||
std::ostream& stream, // no-presubmit-check TODO(webrtc:8982)
|
||||
RTCErrorType error) {
|
||||
@ -173,7 +173,7 @@ inline std::ostream& operator<<( // no-presubmit-check TODO(webrtc:8982)
|
||||
RTCErrorDetailType error) {
|
||||
return stream << ToString(error);
|
||||
}
|
||||
#endif // UNIT_TEST
|
||||
#endif // WEBRTC_UNIT_TEST
|
||||
|
||||
// Helper macro that can be used by implementations to create an error with a
|
||||
// message and log it. |message| should be a string literal or movable
|
||||
|
||||
@ -11,9 +11,9 @@
|
||||
#ifndef API_UNITS_DATA_RATE_H_
|
||||
#define API_UNITS_DATA_RATE_H_
|
||||
|
||||
#ifdef UNIT_TEST
|
||||
#ifdef WEBRTC_UNIT_TEST
|
||||
#include <ostream> // no-presubmit-check TODO(webrtc:8982)
|
||||
#endif // UNIT_TEST
|
||||
#endif // WEBRTC_UNIT_TEST
|
||||
|
||||
#include <limits>
|
||||
#include <string>
|
||||
@ -142,13 +142,13 @@ inline std::string ToLogString(DataRate value) {
|
||||
return ToString(value);
|
||||
}
|
||||
|
||||
#ifdef UNIT_TEST
|
||||
#ifdef WEBRTC_UNIT_TEST
|
||||
inline std::ostream& operator<<( // no-presubmit-check TODO(webrtc:8982)
|
||||
std::ostream& stream, // no-presubmit-check TODO(webrtc:8982)
|
||||
DataRate value) {
|
||||
return stream << ToString(value);
|
||||
}
|
||||
#endif // UNIT_TEST
|
||||
#endif // WEBRTC_UNIT_TEST
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
|
||||
@ -11,9 +11,9 @@
|
||||
#ifndef API_UNITS_DATA_SIZE_H_
|
||||
#define API_UNITS_DATA_SIZE_H_
|
||||
|
||||
#ifdef UNIT_TEST
|
||||
#ifdef WEBRTC_UNIT_TEST
|
||||
#include <ostream> // no-presubmit-check TODO(webrtc:8982)
|
||||
#endif // UNIT_TEST
|
||||
#endif // WEBRTC_UNIT_TEST
|
||||
|
||||
#include <string>
|
||||
#include <type_traits>
|
||||
@ -53,13 +53,13 @@ inline std::string ToLogString(DataSize value) {
|
||||
return ToString(value);
|
||||
}
|
||||
|
||||
#ifdef UNIT_TEST
|
||||
#ifdef WEBRTC_UNIT_TEST
|
||||
inline std::ostream& operator<<( // no-presubmit-check TODO(webrtc:8982)
|
||||
std::ostream& stream, // no-presubmit-check TODO(webrtc:8982)
|
||||
DataSize value) {
|
||||
return stream << ToString(value);
|
||||
}
|
||||
#endif // UNIT_TEST
|
||||
#endif // WEBRTC_UNIT_TEST
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
|
||||
@ -10,9 +10,9 @@
|
||||
#ifndef API_UNITS_FREQUENCY_H_
|
||||
#define API_UNITS_FREQUENCY_H_
|
||||
|
||||
#ifdef UNIT_TEST
|
||||
#ifdef WEBRTC_UNIT_TEST
|
||||
#include <ostream> // no-presubmit-check TODO(webrtc:8982)
|
||||
#endif // UNIT_TEST
|
||||
#endif // WEBRTC_UNIT_TEST
|
||||
|
||||
#include <cstdlib>
|
||||
#include <limits>
|
||||
@ -89,13 +89,13 @@ inline std::string ToLogString(Frequency value) {
|
||||
return ToString(value);
|
||||
}
|
||||
|
||||
#ifdef UNIT_TEST
|
||||
#ifdef WEBRTC_UNIT_TEST
|
||||
inline std::ostream& operator<<( // no-presubmit-check TODO(webrtc:8982)
|
||||
std::ostream& stream, // no-presubmit-check TODO(webrtc:8982)
|
||||
Frequency value) {
|
||||
return stream << ToString(value);
|
||||
}
|
||||
#endif // UNIT_TEST
|
||||
#endif // WEBRTC_UNIT_TEST
|
||||
|
||||
} // namespace webrtc
|
||||
#endif // API_UNITS_FREQUENCY_H_
|
||||
|
||||
@ -11,9 +11,9 @@
|
||||
#ifndef API_UNITS_TIME_DELTA_H_
|
||||
#define API_UNITS_TIME_DELTA_H_
|
||||
|
||||
#ifdef UNIT_TEST
|
||||
#ifdef WEBRTC_UNIT_TEST
|
||||
#include <ostream> // no-presubmit-check TODO(webrtc:8982)
|
||||
#endif // UNIT_TEST
|
||||
#endif // WEBRTC_UNIT_TEST
|
||||
|
||||
#include <cstdlib>
|
||||
#include <string>
|
||||
@ -92,13 +92,13 @@ inline std::string ToLogString(TimeDelta value) {
|
||||
return ToString(value);
|
||||
}
|
||||
|
||||
#ifdef UNIT_TEST
|
||||
#ifdef WEBRTC_UNIT_TEST
|
||||
inline std::ostream& operator<<( // no-presubmit-check TODO(webrtc:8982)
|
||||
std::ostream& stream, // no-presubmit-check TODO(webrtc:8982)
|
||||
TimeDelta value) {
|
||||
return stream << ToString(value);
|
||||
}
|
||||
#endif // UNIT_TEST
|
||||
#endif // WEBRTC_UNIT_TEST
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
|
||||
@ -11,9 +11,9 @@
|
||||
#ifndef API_UNITS_TIMESTAMP_H_
|
||||
#define API_UNITS_TIMESTAMP_H_
|
||||
|
||||
#ifdef UNIT_TEST
|
||||
#ifdef WEBRTC_UNIT_TEST
|
||||
#include <ostream> // no-presubmit-check TODO(webrtc:8982)
|
||||
#endif // UNIT_TEST
|
||||
#endif // WEBRTC_UNIT_TEST
|
||||
|
||||
#include <string>
|
||||
#include <type_traits>
|
||||
@ -125,13 +125,13 @@ inline std::string ToLogString(Timestamp value) {
|
||||
return ToString(value);
|
||||
}
|
||||
|
||||
#ifdef UNIT_TEST
|
||||
#ifdef WEBRTC_UNIT_TEST
|
||||
inline std::ostream& operator<<( // no-presubmit-check TODO(webrtc:8982)
|
||||
std::ostream& stream, // no-presubmit-check TODO(webrtc:8982)
|
||||
Timestamp value) {
|
||||
return stream << ToString(value);
|
||||
}
|
||||
#endif // UNIT_TEST
|
||||
#endif // WEBRTC_UNIT_TEST
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
|
||||
Reference in New Issue
Block a user