| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #ifndef WEBRTC_BASE_COMMON_H_ // NOLINT | 11 #ifndef WEBRTC_BASE_COMMON_H_ // NOLINT |
| 12 #define WEBRTC_BASE_COMMON_H_ | 12 #define WEBRTC_BASE_COMMON_H_ |
| 13 | 13 |
| 14 #include "webrtc/base/basictypes.h" | |
| 15 #include "webrtc/base/constructormagic.h" | 14 #include "webrtc/base/constructormagic.h" |
| 16 | 15 |
| 17 #if defined(_MSC_VER) | 16 #if defined(_MSC_VER) |
| 18 // warning C4355: 'this' : used in base member initializer list | 17 // warning C4355: 'this' : used in base member initializer list |
| 19 #pragma warning(disable:4355) | 18 #pragma warning(disable:4355) |
| 20 #endif | 19 #endif |
| 21 | 20 |
| 22 ////////////////////////////////////////////////////////////////////// | 21 ////////////////////////////////////////////////////////////////////// |
| 23 // General Utilities | 22 // General Utilities |
| 24 ////////////////////////////////////////////////////////////////////// | 23 ////////////////////////////////////////////////////////////////////// |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 // libjingle are merged. | 192 // libjingle are merged. |
| 194 #if !defined(WARN_UNUSED_RESULT) | 193 #if !defined(WARN_UNUSED_RESULT) |
| 195 #if defined(__GNUC__) || defined(__clang__) | 194 #if defined(__GNUC__) || defined(__clang__) |
| 196 #define WARN_UNUSED_RESULT __attribute__ ((__warn_unused_result__)) | 195 #define WARN_UNUSED_RESULT __attribute__ ((__warn_unused_result__)) |
| 197 #else | 196 #else |
| 198 #define WARN_UNUSED_RESULT | 197 #define WARN_UNUSED_RESULT |
| 199 #endif | 198 #endif |
| 200 #endif // WARN_UNUSED_RESULT | 199 #endif // WARN_UNUSED_RESULT |
| 201 | 200 |
| 202 #endif // WEBRTC_BASE_COMMON_H_ // NOLINT | 201 #endif // WEBRTC_BASE_COMMON_H_ // NOLINT |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2564673002:
Remove extra uses of basictypes.h. (Closed)
