summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAnna Henningsen <anna@addaleax.net>2016-09-10 17:50:02 +0200
committerAnna Henningsen <anna@addaleax.net>2016-09-29 09:46:42 +0200
commit48ed65440ca33fe6063d92379b3a9b10b65e98e9 (patch)
treeb0fbfa17238c7d00839b92f3712e39c468c77c0a /test
parenteb927fac38a50252e11ebe0da1764e85294f95f0 (diff)
downloadandroid-node-v8-48ed65440ca33fe6063d92379b3a9b10b65e98e9.tar.gz
android-node-v8-48ed65440ca33fe6063d92379b3a9b10b65e98e9.tar.bz2
android-node-v8-48ed65440ca33fe6063d92379b3a9b10b65e98e9.zip
src: pass desired return type to allocators
Pass the desired return type directly to the allocation functions, so that the resulting `static_cast` from `void*` becomes unneccessary and the return type can be use as a reasonable default value for the `size` parameter. PR-URL: https://github.com/nodejs/node/pull/8482 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Ilkka Myller <ilkka.myller@nodefield.com>
Diffstat (limited to 'test')
-rw-r--r--test/cctest/util.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/test/cctest/util.cc b/test/cctest/util.cc
index 79f1524660..7bbf53af13 100644
--- a/test/cctest/util.cc
+++ b/test/cctest/util.cc
@@ -92,14 +92,16 @@ TEST(UtilTest, ToLower) {
TEST(UtilTest, Malloc) {
using node::Malloc;
+ EXPECT_NE(nullptr, Malloc<char>(0));
+ EXPECT_NE(nullptr, Malloc<char>(1));
EXPECT_NE(nullptr, Malloc(0));
EXPECT_NE(nullptr, Malloc(1));
}
TEST(UtilTest, Calloc) {
using node::Calloc;
- EXPECT_NE(nullptr, Calloc(0, 0));
- EXPECT_NE(nullptr, Calloc(1, 0));
- EXPECT_NE(nullptr, Calloc(0, 1));
- EXPECT_NE(nullptr, Calloc(1, 1));
-} \ No newline at end of file
+ EXPECT_NE(nullptr, Calloc<char>(0));
+ EXPECT_NE(nullptr, Calloc<char>(1));
+ EXPECT_NE(nullptr, Calloc(0));
+ EXPECT_NE(nullptr, Calloc(1));
+}