Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/cpp/marshal/PointerType.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
template<class T>
inline T* cpp::marshal::PointerType<T>::FromDynamic(const Dynamic& inRHS)
{
return FromBoxed(inRHS.StaticCast<Boxed<T>>());
return FromBoxed(inRHS.StaticCast<Boxed<TPtr>>());
}

template<class T>
Expand Down
4 changes: 4 additions & 0 deletions test/native/tests/marshalling/Build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
<file name="${this_dir}/native/Managed.cpp">
<depend name="${this_dir}/native/Managed.hpp"/>
</file>

<file name="${this_dir}/native/Opaque.cpp">
<depend name="${this_dir}/native/Opaque.hpp"/>
</file>
</files>

<files id="haxe">
Expand Down
8 changes: 8 additions & 0 deletions test/native/tests/marshalling/native/Opaque.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#include <Opaque.hpp>

struct Opaque {};

Opaque* opaque_create()
{
return new Opaque();
}
5 changes: 5 additions & 0 deletions test/native/tests/marshalling/native/Opaque.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#pragma once

struct Opaque;

Opaque* opaque_create();
25 changes: 25 additions & 0 deletions test/native/tests/marshalling/pointers/TestPointerFields.hx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,25 @@ private extern class Holder {
var pPtr : Point;
}

@:semantics(value)
@:include("Opaque.hpp")
@:cpp.PointerType
extern class Opaque {}

@:include("Opaque.hpp")
extern class OpaqueApi {
@:native("opaque_create")
static function create():Opaque;
}

private class OpaqueHolder {
public var opaque:Opaque;

public function new(opaque) {
this.opaque = opaque;
}
}

class TestPointerFields extends Test {

function test_field_access() {
Expand Down Expand Up @@ -73,6 +92,12 @@ class TestPointerFields extends Test {
Assert.equals(200f64, h.pPtr.y);
}

function test_holding_opaque_pointer() {
final h = new OpaqueHolder(OpaqueApi.create());

Assert.notNull(h.opaque);
}

function create_holder() : Holder {
return untyped __cpp__('::holder(::hx::maths::point(), ::hx::maths::point())');
}
Expand Down
Loading