mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-11-30 17:10:48 +01:00
Code Issues Releases Activity

SERVER-15331 don't let writeNative be used on non-POD types

Browse Source 
Closes #790

Signed-off-by: Benety Goh <benety@mongodb.com>
This commit is contained in:
Adam Midvidy 2014-09-22 14:05:18 -04:00 committed by Benety Goh
parent 2a37d7e5df
commit 848117f221
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
SConstruct
View File

@ -1755,10 +1755,42 @@ def doConfigure(myenv):
context.Result(ret)
return ret
# not all C++11-enabled gcc versions have type properties
def CheckCXX11IsTriviallyCopyable(context):
test_body = """
#include <type_traits>
int main(int argc, char **argv) {
class Trivial {
int trivial1;
double trivial2;
struct {
float trivial3;
short trivial4;
} trivial_member;
};
class NotTrivial {
int x, y;
NotTrivial(const NotTrivial& o) : x(o.y), y(o.x) {}
};
static_assert(std::is_trivially_copyable<Trivial>::value,
"I should be trivially copyable");
static_assert(!std::is_trivially_copyable<NotTrivial>::value,
"I should not be trivially copyable");
return 0;
}
"""
context.Message('Checking for C++11 is_trivially_copyable support... ')
ret = context.TryCompile(textwrap.dedent(test_body), '.cpp')
context.Result(ret)
return ret
conf = Configure(myenv, help=False, custom_tests = {
'CheckCXX11Atomics': CheckCXX11Atomics,
'CheckGCCAtomicBuiltins': CheckGCCAtomicBuiltins,
'CheckGCCSyncBuiltins': CheckGCCSyncBuiltins,
'CheckCXX11IsTriviallyCopyable': CheckCXX11IsTriviallyCopyable,
})
# Figure out what atomics mode to use by way of the tests defined above.
@ -1788,6 +1820,10 @@ def doConfigure(myenv):
else:
if conf.CheckGCCSyncBuiltins():
conf.env.Append(CPPDEFINES=["MONGO_HAVE_GCC_SYNC_BUILTINS"])
if (cxx11_mode == "on") and conf.CheckCXX11IsTriviallyCopyable():
conf.env.Append(CPPDEFINES=['MONGO_HAVE_STD_IS_TRIVIALLY_COPYABLE'])
myenv = conf.Finish()
conf = Configure(myenv)

8
src/mongo/base/data_view.h
View File

@ -31,6 +31,10 @@
#include "mongo/platform/endian.h"
#if __cplusplus >= 201103L
#include <type_traits>
#endif
namespace mongo {
class ConstDataView {
@ -90,6 +94,10 @@ namespace mongo {
template<typename T>
DataView& writeNative(const T& value, std::size_t offset = 0) {
#if MONGO_HAVE_STD_IS_TRIVIALLY_COPYABLE
static_assert(std::is_trivially_copyable<T>::value,
"Type for DataView::writeNative must be trivially copyable");
#endif
std::memcpy(view(offset), &value, sizeof(value));
return *this;
}