| Index: webrtc/base/flags.h
|
| diff --git a/webrtc/base/flags.h b/webrtc/base/flags.h
|
| index e500534669295e9a7bc39268a1dd732c53650a6d..4ce857b74a748ac746c923c15dcfd62035822411 100644
|
| --- a/webrtc/base/flags.h
|
| +++ b/webrtc/base/flags.h
|
| @@ -90,17 +90,17 @@ class Flag {
|
| assert(type_ == BOOL);
|
| return &variable_->b;
|
| }
|
| -
|
| +
|
| int* int_variable() const {
|
| assert(type_ == INT);
|
| return &variable_->i;
|
| }
|
| -
|
| +
|
| double* float_variable() const {
|
| assert(type_ == FLOAT);
|
| return &variable_->f;
|
| }
|
| -
|
| +
|
| const char** string_variable() const {
|
| assert(type_ == STRING);
|
| return &variable_->s;
|
| @@ -111,17 +111,17 @@ class Flag {
|
| assert(type_ == BOOL);
|
| return default_.b;
|
| }
|
| -
|
| +
|
| int int_default() const {
|
| assert(type_ == INT);
|
| return default_.i;
|
| }
|
| -
|
| +
|
| double float_default() const {
|
| assert(type_ == FLOAT);
|
| return default_.f;
|
| }
|
| -
|
| +
|
| const char* string_default() const {
|
| assert(type_ == STRING);
|
| return default_.s;
|
| @@ -261,9 +261,9 @@ class WindowsCommandLineArguments {
|
| char **argv_;
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(WindowsCommandLineArguments);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(WindowsCommandLineArguments);
|
| };
|
| -#endif // WEBRTC_WIN
|
| +#endif // WEBRTC_WIN
|
|
|
| } // namespace rtc
|
|
|
|
|