| Index: webrtc/base/deprecation.h
|
| diff --git a/webrtc/base/deprecation.h b/webrtc/base/deprecation.h
|
| index ce950f9b525cd05b8a5c6c756a4581cd0251905a..d6c5124c39fa06580bc5b9e43292043d4a2a2b36 100644
|
| --- a/webrtc/base/deprecation.h
|
| +++ b/webrtc/base/deprecation.h
|
| @@ -11,35 +11,9 @@
|
| #ifndef WEBRTC_BASE_DEPRECATION_H_
|
| #define WEBRTC_BASE_DEPRECATION_H_
|
|
|
| -// Annotate the declarations of deprecated functions with this to cause a
|
| -// compiler warning when they're used. Like so:
|
| -//
|
| -// RTC_DEPRECATED std::pony PonyPlz(const std::pony_spec& ps);
|
| -//
|
| -// NOTE 1: The annotation goes on the declaration in the .h file, not the
|
| -// definition in the .cc file!
|
| -//
|
| -// NOTE 2: In order to keep unit testing the deprecated function without
|
| -// getting warnings, do something like this:
|
| -//
|
| -// std::pony DEPRECATED_PonyPlz(const std::pony_spec& ps);
|
| -// RTC_DEPRECATED inline std::pony PonyPlz(const std::pony_spec& ps) {
|
| -// return DEPRECATED_PonyPlz(ps);
|
| -// }
|
| -//
|
| -// In other words, rename the existing function, and provide an inline wrapper
|
| -// using the original name that calls it. That way, callers who are willing to
|
| -// call it using the DEPRECATED_-prefixed name don't get the warning.
|
| -//
|
| -// TODO(kwiberg): Remove this when we can use [[deprecated]] from C++14.
|
| -#if defined(_MSC_VER)
|
| -// Note: Deprecation warnings seem to fail to trigger on Windows
|
| -// (https://bugs.chromium.org/p/webrtc/issues/detail?id=5368).
|
| -#define RTC_DEPRECATED __declspec(deprecated)
|
| -#elif defined(__GNUC__)
|
| -#define RTC_DEPRECATED __attribute__ ((__deprecated__))
|
| -#else
|
| -#define RTC_DEPRECATED
|
| -#endif
|
| +
|
| +// This header is deprecated and is just left here temporarily during
|
| +// refactoring. See https://bugs.webrtc.org/7634 for more details.
|
| +#include "webrtc/rtc_base/deprecation.h"
|
|
|
| #endif // WEBRTC_BASE_DEPRECATION_H_
|
|
|