aboutsummaryrefslogtreecommitdiff
path: root/tests
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 /tests
parent4fa2f8933821050fd10fd973f2f619422a807c94 (diff)
Rename smart_ptr_trait::operator_new to construct_null per feedback from Chad.
Diffstat (limited to 'tests')
-rw-r--r--tests/embind/embind_test.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/embind/embind_test.cpp b/tests/embind/embind_test.cpp
index 401b2734..4cf12615 100644
--- a/tests/embind/embind_test.cpp
+++ b/tests/embind/embind_test.cpp
@@ -1299,8 +1299,8 @@ namespace emscripten {
return CustomSmartPtr<T>(ptr);
}
- static pointer_type* operator_new() {
- return new pointer_type();
+ static pointer_type* construct_null() {
+ return new pointer_type;
}
};
}