aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorAndy Friesen <andy@imvu.com>2013-12-05 10:08:13 -0800
committerBruce Mitchener <bruce.mitchener@gmail.com>2014-02-04 16:19:11 +0700
commitdd8b8e71bfc4aff36909eab7cc23c03907f02ef1 (patch)
treef387589951f02dc59b3f6987becc5c908f1094ec /system
parent4fa2f8933821050fd10fd973f2f619422a807c94 (diff)
Rename smart_ptr_trait::operator_new to construct_null per feedback from Chad.
Diffstat (limited to 'system')
-rw-r--r--system/include/emscripten/bind.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/include/emscripten/bind.h b/system/include/emscripten/bind.h
index 2562a301..681d79d0 100644
--- a/system/include/emscripten/bind.h
+++ b/system/include/emscripten/bind.h
@@ -690,7 +690,7 @@ namespace emscripten {
return 0; // no sharing
}
- static PointerType* operator_new() {
+ static PointerType* construct_null() {
return new PointerType;
}
};
@@ -724,7 +724,7 @@ namespace emscripten {
val_deleter(val::take_ownership(v)));
}
- static PointerType* operator_new() {
+ static PointerType* construct_null() {
return new PointerType;
}
@@ -888,7 +888,7 @@ namespace emscripten {
typeid(PointerType).name(),
PointerTrait::get_sharing_policy(),
reinterpret_cast<GenericFunction>(&PointerTrait::get),
- reinterpret_cast<GenericFunction>(&PointerTrait::operator_new),
+ reinterpret_cast<GenericFunction>(&PointerTrait::construct_null),
reinterpret_cast<GenericFunction>(&PointerTrait::share),
reinterpret_cast<GenericFunction>(&raw_destructor<PointerType>));
return *this;