diff options
| author | Jonathan Reams <jbreams@mongodb.com> | 2015-06-03 13:54:59 -0400 |
|---|---|---|
| committer | Jonathan Reams <jbreams@mongodb.com> | 2016-01-11 11:30:51 -0500 |
| commit | 018828df1ec4bd9df5ede5dfbb27e441dbf5cf9e (patch) | |
| tree | 2da2b008bae3bc71858ee47b84c030b70fba1cbd | |
| parent | 4f7b4de66892c74adc0817776ec059b13678de64 (diff) | |
| download | mongo-018828df1ec4bd9df5ede5dfbb27e441dbf5cf9e.tar.gz | |
SERVER-17747 Fix compile on FreeBSD 11
(cherry picked from commit 014d0c666ec15e819ad2bedf32a850ae29ede26e)
| -rw-r--r-- | src/mongo/db/storage/mmap_v1/btree/btree_ondisk.h | 4 | ||||
| -rw-r--r-- | src/mongo/db/storage/mmap_v1/data_file.cpp | 6 | ||||
| -rw-r--r-- | src/mongo/util/intrusive_counter.h | 2 | ||||
| -rw-r--r-- | src/third_party/v8/src/platform-freebsd.cc | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/mongo/db/storage/mmap_v1/btree/btree_ondisk.h b/src/mongo/db/storage/mmap_v1/btree/btree_ondisk.h index 51af69adae3..f2bc90a5adc 100644 --- a/src/mongo/db/storage/mmap_v1/btree/btree_ondisk.h +++ b/src/mongo/db/storage/mmap_v1/btree/btree_ondisk.h @@ -181,7 +181,7 @@ struct BtreeBucketV0 { }; // BtreeBucketV0 is part of the on-disk format, so it should never be changed -BOOST_STATIC_ASSERT(sizeof(BtreeBucketV0) - sizeof(reinterpret_cast<BtreeBucketV0*>(NULL)->data) == +BOOST_STATIC_ASSERT(sizeof(BtreeBucketV0) - sizeof(static_cast<BtreeBucketV0*>(NULL)->data) == BtreeBucketV0::HeaderSize); /** @@ -322,7 +322,7 @@ struct BtreeBucketV1 { }; // BtreeBucketV1 is part of the on-disk format, so it should never be changed -BOOST_STATIC_ASSERT(sizeof(BtreeBucketV1) - sizeof(reinterpret_cast<BtreeBucketV1*>(NULL)->data) == +BOOST_STATIC_ASSERT(sizeof(BtreeBucketV1) - sizeof(static_cast<BtreeBucketV1*>(NULL)->data) == BtreeBucketV1::HeaderSize); enum Flags { Packed = 1 }; diff --git a/src/mongo/db/storage/mmap_v1/data_file.cpp b/src/mongo/db/storage/mmap_v1/data_file.cpp index 8b445349408..0c88f5184cd 100644 --- a/src/mongo/db/storage/mmap_v1/data_file.cpp +++ b/src/mongo/db/storage/mmap_v1/data_file.cpp @@ -62,12 +62,10 @@ void data_file_check(void* _mb) { BOOST_STATIC_ASSERT(DataFileHeader::HeaderSize == 8192); -BOOST_STATIC_ASSERT(sizeof(reinterpret_cast<DataFileHeader*>(NULL)->data) == 4); -BOOST_STATIC_ASSERT(sizeof(DataFileHeader) - - sizeof(reinterpret_cast<DataFileHeader*>(NULL)->data) == +BOOST_STATIC_ASSERT(sizeof(static_cast<DataFileHeader*>(NULL)->data) == 4); +BOOST_STATIC_ASSERT(sizeof(DataFileHeader) - sizeof(static_cast<DataFileHeader*>(NULL)->data) == DataFileHeader::HeaderSize); - int DataFile::maxSize() { if (sizeof(int*) == 4) { return 512 * 1024 * 1024; diff --git a/src/mongo/util/intrusive_counter.h b/src/mongo/util/intrusive_counter.h index 4284d328f67..bf25009ef75 100644 --- a/src/mongo/util/intrusive_counter.h +++ b/src/mongo/util/intrusive_counter.h @@ -30,6 +30,8 @@ #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> +#include <stdlib.h> + #include "mongo/platform/atomic_word.h" #include "mongo/base/string_data.h" #include "mongo/util/allocator.h" diff --git a/src/third_party/v8/src/platform-freebsd.cc b/src/third_party/v8/src/platform-freebsd.cc index 511759c485e..54c75839096 100644 --- a/src/third_party/v8/src/platform-freebsd.cc +++ b/src/third_party/v8/src/platform-freebsd.cc @@ -343,7 +343,7 @@ VirtualMemory::VirtualMemory(size_t size, size_t alignment) void* reservation = mmap(OS::GetRandomMmapAddr(), request_size, PROT_NONE, - MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, + MAP_PRIVATE | MAP_ANON, kMmapFd, kMmapFdOffset); if (reservation == MAP_FAILED) return; @@ -415,7 +415,7 @@ void* VirtualMemory::ReserveRegion(size_t size) { void* result = mmap(OS::GetRandomMmapAddr(), size, PROT_NONE, - MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, + MAP_PRIVATE | MAP_ANON, kMmapFd, kMmapFdOffset); @@ -445,7 +445,7 @@ bool VirtualMemory::UncommitRegion(void* base, size_t size) { return mmap(base, size, PROT_NONE, - MAP_PRIVATE | MAP_ANON | MAP_NORESERVE | MAP_FIXED, + MAP_PRIVATE | MAP_ANON | MAP_FIXED, kMmapFd, kMmapFdOffset) != MAP_FAILED; } |