FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This has to work on windows now^^

Browse Source
This commit is contained in:
Thomas Geymayer
2014-06-04 13:41:48 +02:00
parent e3d53e854a
commit 4931ce0364
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/nasal/cppbind/Ghost.hxx
+10 -10
View File
@@ -1197,10 +1197,10 @@ namespace nasal
/** /**
* Callback for retrieving a ghost member. * Callback for retrieving a ghost member.
*/ */
static const char* getMember( naContext c, static const char* getMemberImpl( naContext c,
raw_type& obj, raw_type& obj,
naRef key, naRef key,
naRef* out ) naRef* out )
{ {
const std::string key_str = nasal::from_nasal<std::string>(c, key); const std::string key_str = nasal::from_nasal<std::string>(c, key);
// TODO merge instance parents with static class parents // TODO merge instance parents with static class parents
@@ -1240,16 +1240,16 @@ namespace nasal
naRef* out ) naRef* out )
{ {
strong_ref const& ptr = getPtr<strong_ref, is_weak>(ghost); strong_ref const& ptr = getPtr<strong_ref, is_weak>(ghost);
return getMember(c, *get_pointer(ptr), key, out); return getMemberImpl(c, *get_pointer(ptr), key, out);
} }
/** /**
* Callback for writing to a ghost member. * Callback for writing to a ghost member.
*/ */
static void setMember( naContext c, static void setMemberImpl( naContext c,
raw_type& obj, raw_type& obj,
naRef field, naRef field,
naRef val ) naRef val )
{ {
const std::string key = nasal::from_nasal<std::string>(c, field); const std::string key = nasal::from_nasal<std::string>(c, field);
const MemberMap& members = getSingletonPtr()->_members; const MemberMap& members = getSingletonPtr()->_members;
@@ -1278,7 +1278,7 @@ namespace nasal
naRef val ) naRef val )
{ {
strong_ref const& ptr = getPtr<strong_ref, is_weak>(ghost); strong_ref const& ptr = getPtr<strong_ref, is_weak>(ghost);
return setMember(c, *get_pointer(ptr), field, val); return setMemberImpl(c, *get_pointer(ptr), field, val);
} }
}; };