| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef MOJO_SYSTEM_MEMORY_H_ | 5 #ifndef MOJO_EDK_SYSTEM_MEMORY_H_ |
| 6 #define MOJO_SYSTEM_MEMORY_H_ | 6 #define MOJO_EDK_SYSTEM_MEMORY_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 #include <string.h> // For |memcpy()|. | 10 #include <string.h> // For |memcpy()|. |
| 11 | 11 |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 14 #include "mojo/edk/system/system_impl_export.h" |
| 14 #include "mojo/public/c/system/macros.h" | 15 #include "mojo/public/c/system/macros.h" |
| 15 #include "mojo/system/system_impl_export.h" | |
| 16 | 16 |
| 17 namespace mojo { | 17 namespace mojo { |
| 18 namespace system { | 18 namespace system { |
| 19 | 19 |
| 20 namespace internal { | 20 namespace internal { |
| 21 | 21 |
| 22 // Removes |const| from |T| (available as |remove_const<T>::type|): | 22 // Removes |const| from |T| (available as |remove_const<T>::type|): |
| 23 // TODO(vtl): Remove these once we have the C++11 |remove_const|. | 23 // TODO(vtl): Remove these once we have the C++11 |remove_const|. |
| 24 template <typename T> | 24 template <typename T> |
| 25 struct remove_const { | 25 struct remove_const { |
| (...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 UserPointer<Type> user_pointer_; | 367 UserPointer<Type> user_pointer_; |
| 368 size_t count_; | 368 size_t count_; |
| 369 scoped_ptr<Type[]> buffer_; | 369 scoped_ptr<Type[]> buffer_; |
| 370 | 370 |
| 371 DISALLOW_COPY_AND_ASSIGN(UserPointerReaderWriter); | 371 DISALLOW_COPY_AND_ASSIGN(UserPointerReaderWriter); |
| 372 }; | 372 }; |
| 373 | 373 |
| 374 } // namespace system | 374 } // namespace system |
| 375 } // namespace mojo | 375 } // namespace mojo |
| 376 | 376 |
| 377 #endif // MOJO_SYSTEM_MEMORY_H_ | 377 #endif // MOJO_EDK_SYSTEM_MEMORY_H_ |
| OLD | NEW |