From 8171211f971dbeea7377e9d3a5c6237966042147 Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Fri, 5 Jan 2018 11:27:54 -0800 Subject: [PATCH] Fix shadowed variable in ContentInfo Bug: webrtc:8714 Change-Id: I107b7d5908cf6efe7f114522959da4503450d7fc Reviewed-on: https://webrtc-review.googlesource.com/37724 Commit-Queue: Steve Anton Commit-Queue: Taylor Brandstetter Reviewed-by: Taylor Brandstetter Cr-Commit-Position: refs/heads/master@{#21506} --- pc/sessiondescription.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pc/sessiondescription.h b/pc/sessiondescription.h index fdbfcc692e..b2cdee9482 100644 --- a/pc/sessiondescription.h +++ b/pc/sessiondescription.h @@ -313,15 +313,17 @@ struct ContentInfo { const MediaContentDescription* media_description() const { return description; } - void set_media_description(MediaContentDescription* description) { - this->description = description; + void set_media_description(MediaContentDescription* desc) { + description = desc; } - // TODO(bugs.webrtc.org/8520): Rename this to mid. + // TODO(bugs.webrtc.org/8620): Rename this to mid. std::string name; MediaProtocolType type; bool rejected = false; bool bundle_only = false; + // TODO(bugs.webrtc.org/8620): Switch to the getter and setter, and make this + // private. MediaContentDescription* description = nullptr; };