Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jun 9, 2009, 4:29:42 PM (15 years ago)
Author:
rgrieder
Message:

Update to tolua 1.0.93

File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/branches/pch/src/tolua/tolua++.h

    r2710 r3127  
    5858#define tolua_pushfieldcppstring(L,lo,idx,s) tolua_pushfieldstring(L, lo, idx, s.c_str())
    5959
    60 #define TEMPLATE_BIND(p)
     60#ifndef TEMPLATE_BIND
     61 #define TEMPLATE_BIND(p)
     62#endif
     63
    6164#define TOLUA_TEMPLATE_BIND(p)
     65
    6266#define TOLUA_PROTECTED_DESTRUCTOR
    6367#define TOLUA_PROPERTY_TYPE(p)
    … …  
    7983
    8084TOLUA_API const char* tolua_typename (lua_State* L, int lo);
    81 TOLUA_API void tolua_error (lua_State* L, char* msg, tolua_Error* err);
     85TOLUA_API void tolua_error (lua_State* L, const char* msg, tolua_Error* err);
    8286TOLUA_API int tolua_isnoobj (lua_State* L, int lo, tolua_Error* err);
    8387TOLUA_API int tolua_isvalue (lua_State* L, int lo, int def, tolua_Error* err);
     88TOLUA_API int tolua_isvaluenil (lua_State* L, int lo, tolua_Error* err);
    8489TOLUA_API int tolua_isboolean (lua_State* L, int lo, int def, tolua_Error* err);
    8590TOLUA_API int tolua_isnumber (lua_State* L, int lo, int def, tolua_Error* err);
    … …  
    110115TOLUA_API int tolua_default_collect (lua_State* tolua_S);
    111116
    112 TOLUA_API void tolua_usertype (lua_State* L, char* type);
    113 TOLUA_API void tolua_beginmodule (lua_State* L, char* name);
     117TOLUA_API void tolua_usertype (lua_State* L, const char* type);
     118TOLUA_API void tolua_beginmodule (lua_State* L, const char* name);
    114119TOLUA_API void tolua_endmodule (lua_State* L);
    115 TOLUA_API void tolua_module (lua_State* L, char* name, int hasvar);
    116 TOLUA_API void tolua_class (lua_State* L, char* name, char* base);
    117 TOLUA_API void tolua_cclass (lua_State* L, char* lname, char* name, char* base, lua_CFunction col);
    118 TOLUA_API void tolua_function (lua_State* L, char* name, lua_CFunction func);
    119 TOLUA_API void tolua_constant (lua_State* L, char* name, double value);
    120 TOLUA_API void tolua_variable (lua_State* L, char* name, lua_CFunction get, lua_CFunction set);
    121 TOLUA_API void tolua_array (lua_State* L,char* name, lua_CFunction get, lua_CFunction set);
     120TOLUA_API void tolua_module (lua_State* L, const char* name, int hasvar);
     121TOLUA_API void tolua_class (lua_State* L, const char* name, const char* base);
     122TOLUA_API void tolua_cclass (lua_State* L, const char* lname, const char* name, const char* base, lua_CFunction col);
     123TOLUA_API void tolua_function (lua_State* L, const char* name, lua_CFunction func);
     124TOLUA_API void tolua_constant (lua_State* L, const char* name, lua_Number value);
     125TOLUA_API void tolua_variable (lua_State* L, const char* name, lua_CFunction get, lua_CFunction set);
     126TOLUA_API void tolua_array (lua_State* L,const char* name, lua_CFunction get, lua_CFunction set);
    122127
    123128/* TOLUA_API void tolua_set_call_event(lua_State* L, lua_CFunction func, char* type); */
    … …  
    126131TOLUA_API void tolua_pushvalue (lua_State* L, int lo);
    127132TOLUA_API void tolua_pushboolean (lua_State* L, int value);
    128 TOLUA_API void tolua_pushnumber (lua_State* L, double value);
     133TOLUA_API void tolua_pushnumber (lua_State* L, lua_Number value);
    129134TOLUA_API void tolua_pushstring (lua_State* L, const char* value);
    130135TOLUA_API void tolua_pushuserdata (lua_State* L, void* value);
    … …  
    133138TOLUA_API void tolua_pushfieldvalue (lua_State* L, int lo, int index, int v);
    134139TOLUA_API void tolua_pushfieldboolean (lua_State* L, int lo, int index, int v);
    135 TOLUA_API void tolua_pushfieldnumber (lua_State* L, int lo, int index, double v);
     140TOLUA_API void tolua_pushfieldnumber (lua_State* L, int lo, int index, lua_Number v);
    136141TOLUA_API void tolua_pushfieldstring (lua_State* L, int lo, int index, const char* v);
    137142TOLUA_API void tolua_pushfielduserdata (lua_State* L, int lo, int index, void* v);
    … …  
    139144TOLUA_API void tolua_pushfieldusertype_and_takeownership (lua_State* L, int lo, int index, void* v, const char* type);
    140145
    141 TOLUA_API double tolua_tonumber (lua_State* L, int narg, double def);
     146TOLUA_API lua_Number tolua_tonumber (lua_State* L, int narg, lua_Number def);
    142147TOLUA_API const char* tolua_tostring (lua_State* L, int narg, const char* def);
    143148TOLUA_API void* tolua_touserdata (lua_State* L, int narg, void* def);
    … …  
    145150TOLUA_API int tolua_tovalue (lua_State* L, int narg, int def);
    146151TOLUA_API int tolua_toboolean (lua_State* L, int narg, int def);
    147 TOLUA_API double tolua_tofieldnumber (lua_State* L, int lo, int index, double def);
     152TOLUA_API lua_Number tolua_tofieldnumber (lua_State* L, int lo, int index, lua_Number def);
    148153TOLUA_API const char* tolua_tofieldstring (lua_State* L, int lo, int index, const char* def);
    149154TOLUA_API void* tolua_tofielduserdata (lua_State* L, int lo, int index, void* def);
    … …  
    176181TOLUA_API int tolua_fast_isa(lua_State *L, int mt_indexa, int mt_indexb, int super_index);
    177182
     183#ifndef Mtolua_new
     184#define Mtolua_new(EXP) new EXP
     185#endif
     186
     187#ifndef Mtolua_delete
     188#define Mtolua_delete(EXP) delete EXP
     189#endif
     190
     191#ifndef Mtolua_new_dim
     192#define Mtolua_new_dim(EXP, len) new EXP[len]
     193#endif
     194
     195#ifndef Mtolua_delete_dim
     196#define Mtolua_delete_dim(EXP) delete [] EXP
     197#endif
     198
     199#ifndef tolua_outside
     200#define tolua_outside
     201#endif
     202
     203#ifndef tolua_owned
     204#define tolua_owned
     205#endif
     206
    178207#ifdef __cplusplus
    179208}
Note: See TracChangeset for help on using the changeset viewer.