Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(260)

Unified Diff: mojo/edk/system/memory.cc

Issue 1346383004: EDK: Remove MOJO_SYSTEM_IMPL_EXPORT, system_impl_export.h, etc. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/edk/system/memory.h ('k') | mojo/edk/system/message_in_transit.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/memory.cc
diff --git a/mojo/edk/system/memory.cc b/mojo/edk/system/memory.cc
index 0e3d9a9cb70a55cacc81ba7315dc6929e958e89f..33b885e773e1b75bfd81424c77b1d1001c479609 100644
--- a/mojo/edk/system/memory.cc
+++ b/mojo/edk/system/memory.cc
@@ -28,32 +28,27 @@ bool IsAligned<8>(const void* pointer) {
#endif
template <size_t size, size_t alignment>
-void MOJO_SYSTEM_IMPL_EXPORT CheckUserPointer(const void* pointer) {
+void CheckUserPointer(const void* pointer) {
CHECK(pointer && IsAligned<alignment>(pointer));
}
// Explicitly instantiate the sizes we need. Add instantiations as needed.
-template void MOJO_SYSTEM_IMPL_EXPORT CheckUserPointer<1, 1>(const void*);
-template void MOJO_SYSTEM_IMPL_EXPORT CheckUserPointer<4, 4>(const void*);
-template void MOJO_SYSTEM_IMPL_EXPORT CheckUserPointer<8, 4>(const void*);
-template void MOJO_SYSTEM_IMPL_EXPORT CheckUserPointer<8, 8>(const void*);
+template void CheckUserPointer<1, 1>(const void*);
+template void CheckUserPointer<4, 4>(const void*);
+template void CheckUserPointer<8, 4>(const void*);
+template void CheckUserPointer<8, 8>(const void*);
template <size_t size, size_t alignment>
-void MOJO_SYSTEM_IMPL_EXPORT
-CheckUserPointerWithCount(const void* pointer, size_t count) {
+void CheckUserPointerWithCount(const void* pointer, size_t count) {
CHECK_LE(count, std::numeric_limits<size_t>::max() / size);
CHECK(count == 0 || (pointer && IsAligned<alignment>(pointer)));
}
// Explicitly instantiate the sizes we need. Add instantiations as needed.
-template void MOJO_SYSTEM_IMPL_EXPORT
-CheckUserPointerWithCount<1, 1>(const void*, size_t);
-template void MOJO_SYSTEM_IMPL_EXPORT
-CheckUserPointerWithCount<4, 4>(const void*, size_t);
-template void MOJO_SYSTEM_IMPL_EXPORT
-CheckUserPointerWithCount<8, 4>(const void*, size_t);
-template void MOJO_SYSTEM_IMPL_EXPORT
-CheckUserPointerWithCount<8, 8>(const void*, size_t);
+template void CheckUserPointerWithCount<1, 1>(const void*, size_t);
+template void CheckUserPointerWithCount<4, 4>(const void*, size_t);
+template void CheckUserPointerWithCount<8, 4>(const void*, size_t);
+template void CheckUserPointerWithCount<8, 8>(const void*, size_t);
template <size_t alignment>
void CheckUserPointerWithSize(const void* pointer, size_t size) {
@@ -64,25 +59,9 @@ void CheckUserPointerWithSize(const void* pointer, size_t size) {
}
// Explicitly instantiate the sizes we need. Add instantiations as needed.
-template void MOJO_SYSTEM_IMPL_EXPORT
-CheckUserPointerWithSize<1>(const void*, size_t);
-template void MOJO_SYSTEM_IMPL_EXPORT
-CheckUserPointerWithSize<4>(const void*, size_t);
-// Whereas the other |Check...()| functions are usually used with integral typs
-// or arrays of integral types, this one is used with Options structs for which
-// alignment has been explicitly been specified (using |MOJO_ALIGNAS()|), which
-// MSVS *does* respect.
-#if defined(COMPILER_MSVC) && defined(ARCH_CPU_32_BITS)
-template <>
-void MOJO_SYSTEM_IMPL_EXPORT
-CheckUserPointerWithSize<8>(const void* pointer, size_t size) {
- CHECK(size == 0 ||
- (!!pointer && reinterpret_cast<uintptr_t>(pointer) % 8 == 0));
-}
-#else
-template void MOJO_SYSTEM_IMPL_EXPORT
-CheckUserPointerWithSize<8>(const void*, size_t);
-#endif
+template void CheckUserPointerWithSize<1>(const void*, size_t);
+template void CheckUserPointerWithSize<4>(const void*, size_t);
+template void CheckUserPointerWithSize<8>(const void*, size_t);
} // namespace internal
} // namespace system
« no previous file with comments | « mojo/edk/system/memory.h ('k') | mojo/edk/system/message_in_transit.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698