Mercurial > code
changeset 424:0dd7d9dd554a
Js: rename Pointer<T> to RawPointer<T>
author | David Demelier <markand@malikania.fr> |
---|---|
date | Mon, 12 Oct 2015 22:00:03 +0200 |
parents | 70f5cb449a22 |
children | bb550fbd85e9 |
files | C++/modules/Js/Js.h C++/tests/Js/main.cpp |
diffstat | 2 files changed, 19 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/C++/modules/Js/Js.h Mon Oct 12 21:57:38 2015 +0200 +++ b/C++/modules/Js/Js.h Mon Oct 12 22:00:03 2015 +0200 @@ -104,12 +104,12 @@ }; /** - * @class Pointer + * @class RawPointer * @brief Push a non-managed pointer to Duktape, the pointer will never be deleted. - * @note For a managed pointer with prototype, see TypeInfoPointer + * @note For a managed pointer with prototype, see Pointer */ template <typename T> -class Pointer { +class RawPointer { public: /** * The pointer to push. @@ -1510,7 +1510,7 @@ * Provides: get, is, optional, push, require. */ template <typename T> -class TypeInfo<Pointer<T>> { +class TypeInfo<RawPointer<T>> { public: /** * Get a pointer, return nullptr if not a pointer. @@ -1544,7 +1544,7 @@ * @param defaultValue the defaultValue * @return the pointer or defaultValue */ - static inline T *optional(Context &ctx, int index, Pointer<T> defaultValue) + static inline T *optional(Context &ctx, int index, RawPointer<T> defaultValue) { if (!duk_is_pointer(ctx, index)) { return defaultValue.object; @@ -1559,7 +1559,7 @@ * @param ctx the context * @param value the value */ - static inline void push(Context &ctx, const Pointer<T> &value) + static inline void push(Context &ctx, const RawPointer<T> &value) { duk_push_pointer(ctx, value.object); }
--- a/C++/tests/Js/main.cpp Mon Oct 12 21:57:38 2015 +0200 +++ b/C++/tests/Js/main.cpp Mon Oct 12 22:00:03 2015 +0200 @@ -137,13 +137,13 @@ ASSERT_EQ(3, array[2]); } -TEST(PushAndGet, pointer) +TEST(PushAndGet, RawPointer) { Context context; ASSERT_EQ(0, context.top()); - context.push(Pointer<int>{new int(1)}); - ASSERT_EQ(1, *context.get<Pointer<int>>(-1)); + context.push(RawPointer<int>{new int(1)}); + ASSERT_EQ(1, *context.get<RawPointer<int>>(-1)); ASSERT_EQ(1, context.top()); } @@ -256,7 +256,7 @@ ASSERT_EQ(0, context.top()); } -TEST(Require, pointer) +TEST(Require, RawPointer) { Context context; @@ -264,7 +264,7 @@ try { context.push(Function{[] (Context &ctx) -> int { - ctx.require<Pointer<int>>(0); + ctx.require<RawPointer<int>>(0); return 0; }}); @@ -371,13 +371,13 @@ ASSERT_EQ(1, context.top()); } -TEST(Is, pointer) +TEST(Is, RawPointer) { Context context; ASSERT_EQ(0, context.top()); - context.push(Pointer<int>{new int(1)}); - ASSERT_TRUE(context.is<Pointer<int>>(-1)); + context.push(RawPointer<int>{new int(1)}); + ASSERT_TRUE(context.is<RawPointer<int>>(-1)); ASSERT_EQ(1, context.top()); } @@ -435,12 +435,12 @@ ASSERT_EQ(0, context.top()); } -TEST(Optional, pointer) +TEST(Optional, RawPointer) { Context context; ASSERT_EQ(0, context.top()); - ASSERT_EQ(nullptr, context.optional<Pointer<int>>(0, Pointer<int>{nullptr})); + ASSERT_EQ(nullptr, context.optional<RawPointer<int>>(0, RawPointer<int>{nullptr})); ASSERT_EQ(0, context.top()); } @@ -642,7 +642,7 @@ } /* -------------------------------------------------------- - * TypeInfo with shared and pointer + * TypeInfo with shared and RawPointer * -------------------------------------------------------- */ class Player { @@ -716,7 +716,7 @@ } } -TEST(Pointer, simple) +TEST(RawPointer, simple) { Context context; Player *p{new Player}; @@ -731,7 +731,7 @@ ASSERT_TRUE(p->m_updated); } -TEST(Pointer, self) +TEST(RawPointer, self) { Context ctx; Player *p{new Player};