TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-19 05:06:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Roger Hughston 2005-05-24 18:16:25 +00:00
parent 62eae82c23
commit b0276d5ddd
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dtool/src/interrogate/interfaceMakerPythonNative.cxx
View File

@ -858,7 +858,7 @@ void InterfaceMakerPythonNative::write_module_support(ostream &out,ostream *out_
bool force_base_functions = true; bool force_base_functions = true;
out << "PyMethodDef python_simple_funcs[] = {\n"; out << "static PyMethodDef python_simple_funcs[] = {\n";
Functions::iterator fi; Functions::iterator fi;
for (fi = _functions.begin(); fi != _functions.end(); ++fi) for (fi = _functions.begin(); fi != _functions.end(); ++fi)
{ {

8
dtool/src/interrogatedb/interrogateType.cxx
View File

@ -225,13 +225,19 @@ remap_indices(const IndexRemapper &remap) {
} }
////////////////////////////////////////////////////////////////////
// Function: GetRunTimeDictionary
////////////////////////////////////////////////////////////////////
EXPCL_DTOOLCONFIG RunTimeTypeDictionary & GetRunTimeDictionary() EXPCL_DTOOLCONFIG RunTimeTypeDictionary & GetRunTimeDictionary()
{ {
static RunTimeTypeDictionary dict; static RunTimeTypeDictionary dict;
return dict; return dict;
}; };
////////////////////////////////////////////////////////////////////
// Function: GetRunTimeTypeList
////////////////////////////////////////////////////////////////////
EXPCL_DTOOLCONFIG RunTimeTypeList & GetRunTimeTypeList() EXPCL_DTOOLCONFIG RunTimeTypeList & GetRunTimeTypeList()
{ {
static RunTimeTypeList list; static RunTimeTypeList list;

4
dtool/src/interrogatedb/interrogateType.h
View File

@ -229,8 +229,8 @@ struct Dtool_PyTypedObject;
typedef std::map< int , Dtool_PyTypedObject *> RunTimeTypeDictionary; typedef std::map< int , Dtool_PyTypedObject *> RunTimeTypeDictionary;
typedef std::set<int > RunTimeTypeList; typedef std::set<int > RunTimeTypeList;
extern "C" EXPCL_DTOOL RunTimeTypeDictionary & GetRunTimeDictionary(); EXPCL_DTOOLCONFIG RunTimeTypeDictionary & GetRunTimeDictionary();
extern "C" EXPCL_DTOOL RunTimeTypeList & GetRunTimeTypeList(); EXPCL_DTOOLCONFIG RunTimeTypeList & GetRunTimeTypeList();
#endif #endif

10
dtool/src/interrogatedb/py_panda.h
View File

@ -64,11 +64,9 @@ using namespace std;
#ifdef _WIN32 #ifdef _WIN32
#define EXPORT_THIS __declspec(dllexport) #define EXPORT_THIS __declspec(dllexport)
#define IMPORT_THIS __declspec(dllimport) #define IMPORT_THIS __declspec(dllimport)
#define IMPORT_FROM_SHARED_LIB __declspec(dllimport)
#else #else
#define EXPORT_THIS #define EXPORT_THIS
#define IMPORT_THIS #define IMPORT_THIS extern
#define IMPORT_FROM_SHARED_LIB
#endif #endif
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
@ -76,8 +74,8 @@ struct Dtool_PyTypedObject;
typedef std::map< int , Dtool_PyTypedObject *> RunTimeTypeDictionary; typedef std::map< int , Dtool_PyTypedObject *> RunTimeTypeDictionary;
typedef std::set<int > RunTimeTypeList; typedef std::set<int > RunTimeTypeList;
DTOOL_C_LINKAGE RunTimeTypeDictionary & GetRunTimeDictionary(); EXPCL_DTOOLCONFIG RunTimeTypeDictionary & GetRunTimeDictionary();
DTOOL_C_LINKAGE RunTimeTypeList & GetRunTimeTypeList(); EXPCL_DTOOLCONFIG RunTimeTypeList & GetRunTimeTypeList();
////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////
@ -540,7 +538,6 @@ DTOOL_C_LINKAGE inline void RegisterRuntimeClass(Dtool_PyTypedObject * otype, in
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#ifndef NO_RUNTIME_TYPES
DTOOL_C_LINKAGE inline Dtool_PyTypedObject * Dtool_RuntimeTypeDtoolType(int type) DTOOL_C_LINKAGE inline Dtool_PyTypedObject * Dtool_RuntimeTypeDtoolType(int type)
{ {
RunTimeTypeDictionary::iterator di = GetRunTimeDictionary().find(type); RunTimeTypeDictionary::iterator di = GetRunTimeDictionary().find(type);
@ -558,7 +555,6 @@ DTOOL_C_LINKAGE inline Dtool_PyTypedObject * Dtool_RuntimeTypeDtoolType(int typ
return NULL; return NULL;
}; };
#endif
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
//// We need a way to runtime merge compile units into a python "Module" .. this is done with the //// We need a way to runtime merge compile units into a python "Module" .. this is done with the
/// fallowing structors and code.. along with the support of interigate_module /// fallowing structors and code.. along with the support of interigate_module