diff options
| author | Jonas Olsson <jonasolsson@webrtc.org> | 2018-04-18 10:11:07 +0200 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2018-04-20 09:09:30 +0000 |
| commit | d7ee72041f882c023c73e27a7436c626c4e43604 (patch) | |
| tree | 3c70973f7581269e9042640190aa7d131bb523ad /pc | |
| parent | 4397e4ae9c55b62105c1ce8594c03ddb61024909 (diff) | |
| download | webrtc-d7ee72041f882c023c73e27a7436c626c4e43604.tar.gz | |
Reland "Remove our stream << overloads from non-test build targets."
This is a reland of c841d18d257ba8e4ed7d77d105e3c46006bb1e7e
Original change's description:
> Remove our stream << overloads from non-test build targets.
>
> Most are removed entirely, but RtcErrorType, RtpTransceiverDirection, IPAddress and
> SocketAddress are kept behind gtest's #ifdef UNIT_TEST.
>
> Bug: webrtc:8982
> Change-Id: I36db19891e7d25aeacb08b9a08aa2b4004765e70
> Reviewed-on: https://webrtc-review.googlesource.com/64143
> Commit-Queue: Jonas Olsson <jonasolsson@webrtc.org>
> Reviewed-by: Benjamin Wright <benwright@webrtc.org>
> Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> Reviewed-by: Åsa Persson <asapersson@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#22916}
TBR=deadbeef@webrtc.org,kwiberg@webrtc.org,asapersson@webrtc.org,jonasolsson@webrtc.org,benwright@webrtc.org
Bug: webrtc:8982
Change-Id: Ibe08c6270e5e693eb661a6ce9e8f074b34ef8123
Reviewed-on: https://webrtc-review.googlesource.com/71161
Commit-Queue: Jonas Olsson <jonasolsson@webrtc.org>
Reviewed-by: Jonas Olsson <jonasolsson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22949}
Diffstat (limited to 'pc')
| -rw-r--r-- | pc/rtpmediautils.h | 8 | ||||
| -rw-r--r-- | pc/rtptransceiver.cc | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pc/rtpmediautils.h b/pc/rtpmediautils.h index 6de6f8f0af..5f02d89907 100644 --- a/pc/rtpmediautils.h +++ b/pc/rtpmediautils.h @@ -44,6 +44,14 @@ RtpTransceiverDirection RtpTransceiverDirectionWithRecvSet( // Returns an unspecified string representation of the given direction. const char* RtpTransceiverDirectionToString(RtpTransceiverDirection direction); +#ifdef UNIT_TEST +inline std::ostream& operator<<( // no-presubmit-check TODO(webrtc:8982) + std::ostream& os, // no-presubmit-check TODO(webrtc:8982) + RtpTransceiverDirection direction) { + return os << RtpTransceiverDirectionToString(direction); +} +#endif // UNIT_TEST + } // namespace webrtc #endif // PC_RTPMEDIAUTILS_H_ diff --git a/pc/rtptransceiver.cc b/pc/rtptransceiver.cc index 41ee487642..37770b524d 100644 --- a/pc/rtptransceiver.cc +++ b/pc/rtptransceiver.cc @@ -16,10 +16,6 @@ namespace webrtc { -std::ostream& operator<<(std::ostream& os, RtpTransceiverDirection direction) { - return os << RtpTransceiverDirectionToString(direction); -} - RtpTransceiver::RtpTransceiver(cricket::MediaType media_type) : unified_plan_(false), media_type_(media_type) { RTC_DCHECK(media_type == cricket::MEDIA_TYPE_AUDIO || |