| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2011 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_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_H_ | 11 #ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_H_ |
| 12 #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_H_ | 12 #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_H_ |
| 13 | 13 |
| 14 #include <assert.h> | 14 #include <assert.h> |
| 15 | 15 |
| 16 #include "webrtc/typedefs.h" | 16 #include "webrtc/typedefs.h" |
| 17 | 17 |
| 18 #if _WIN32 | 18 #ifdef _WIN32 |
| 19 #include "webrtc/modules/audio_conference_mixer/source/memory_pool_win.h" | 19 #include "webrtc/modules/audio_conference_mixer/source/memory_pool_win.h" |
| 20 #else | 20 #else |
| 21 #include "webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h" | 21 #include "webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h" |
| 22 #endif | 22 #endif |
| 23 | 23 |
| 24 namespace webrtc { | 24 namespace webrtc { |
| 25 | 25 |
| 26 template<class MemoryType> | 26 template<class MemoryType> |
| 27 class MemoryPool | 27 class MemoryPool |
| 28 { | 28 { |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 { | 113 { |
| 114 if(memory == NULL) | 114 if(memory == NULL) |
| 115 { | 115 { |
| 116 return -1; | 116 return -1; |
| 117 } | 117 } |
| 118 return _ptrImpl->PushMemory(memory); | 118 return _ptrImpl->PushMemory(memory); |
| 119 } | 119 } |
| 120 } // namespace webrtc | 120 } // namespace webrtc |
| 121 | 121 |
| 122 #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_H_ | 122 #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_H_ |
| OLD | NEW |