| Index: mojo/edk/system/memory.cc
|
| diff --git a/third_party/mojo/src/mojo/edk/system/memory.cc b/mojo/edk/system/memory.cc
|
| similarity index 98%
|
| copy from third_party/mojo/src/mojo/edk/system/memory.cc
|
| copy to mojo/edk/system/memory.cc
|
| index 0e3d9a9cb70a55cacc81ba7315dc6929e958e89f..2e8e7143fec4f83154bcfb7b9f930db9e5cb51c6 100644
|
| --- a/third_party/mojo/src/mojo/edk/system/memory.cc
|
| +++ b/mojo/edk/system/memory.cc
|
| @@ -10,7 +10,7 @@
|
| #include "build/build_config.h"
|
|
|
| namespace mojo {
|
| -namespace system {
|
| +namespace edk {
|
| namespace internal {
|
|
|
| template <size_t alignment>
|
| @@ -85,5 +85,5 @@ CheckUserPointerWithSize<8>(const void*, size_t);
|
| #endif
|
|
|
| } // namespace internal
|
| -} // namespace system
|
| +} // namespace edk
|
| } // namespace mojo
|
|
|