TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

build on irix

Browse Source
This commit is contained in:
David Rose 2005-07-13 17:07:25 +00:00
parent d5418c8ff4
commit 1f94eb12b4
6 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -366,6 +366,7 @@ std::string make_safe_name(const std::string & name)
{ {
return InterrogateBuilder::clean_identifier(name); return InterrogateBuilder::clean_identifier(name);
/*
static const char safe_chars2[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_"; static const char safe_chars2[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
std::string result = name; std::string result = name;
@ -377,6 +378,7 @@ std::string make_safe_name(const std::string & name)
} }
return result; return result;
*/
} }
bool isInplaceFunction(const std::string &cppName) bool isInplaceFunction(const std::string &cppName)
@ -1228,7 +1230,8 @@ void InterfaceMakerPythonNative::write_module_class(ostream &out, Object *obj)
<< "};\n\n"; << "};\n\n";
int num_derivations = obj->_itype.number_of_derivations(); int num_derivations = obj->_itype.number_of_derivations();
for (int di = 0; di < num_derivations; di++) int di;
for (di = 0; di < num_derivations; di++)
{ {
TypeIndex d_type_Index = obj->_itype.get_derivation(di); TypeIndex d_type_Index = obj->_itype.get_derivation(di);
if(!interrogate_type_is_unpublished(d_type_Index)) if(!interrogate_type_is_unpublished(d_type_Index))
@ -1247,7 +1250,7 @@ void InterfaceMakerPythonNative::write_module_class(ostream &out, Object *obj)
} }
std::vector< std::string > bases; std::vector< std::string > bases;
for (int di = 0; di < num_derivations; di++) for (di = 0; di < num_derivations; di++)
{ {
TypeIndex d_type_Index = obj->_itype.get_derivation(di); TypeIndex d_type_Index = obj->_itype.get_derivation(di);
if(!interrogate_type_is_unpublished(d_type_Index)) if(!interrogate_type_is_unpublished(d_type_Index))

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

@ -103,7 +103,7 @@ public:
bool _is_legal_py_class; bool _is_legal_py_class;
}; };
void InterfaceMakerPythonNative::GetValideChildClasses( std::map< std::string ,CastDetails > &answer, CPPStructType * inclass, const std::string &up_cast_seed = "", bool downcastposible = true); void GetValideChildClasses( std::map< std::string ,CastDetails > &answer, CPPStructType * inclass, const std::string &up_cast_seed = "", bool downcastposible = true);
bool DoesInheritFromIsClass( const CPPStructType * inclass, const std::string &name); bool DoesInheritFromIsClass( const CPPStructType * inclass, const std::string &name);
bool IsPandaTypedObject(CPPStructType * inclass) { return DoesInheritFromIsClass(inclass,"TypedObject"); }; bool IsPandaTypedObject(CPPStructType * inclass) { return DoesInheritFromIsClass(inclass,"TypedObject"); };
void WriteReturnInstance(ostream &out, int indent_level, std::string &return_expr, std::string &ows_memory_flag,const std::string &class_name, CPPType *ctype, bool inplace); void WriteReturnInstance(ostream &out, int indent_level, std::string &return_expr, std::string &ows_memory_flag,const std::string &class_name, CPPType *ctype, bool inplace);

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

@ -1601,6 +1601,7 @@ bool TypeManager::IsLocal(CPPType *in_type)
return false; return false;
/*
if (base_type->get_subtype() == CPPDeclaration::ST_struct) if (base_type->get_subtype() == CPPDeclaration::ST_struct)
{ {
@ -1658,4 +1659,5 @@ bool TypeManager::IsLocal(CPPType *in_type)
return true; return true;
return false; return false;
*/
}; };

4
dtool/src/interrogatedb/dtool_super_base.cxx
View File

@ -18,6 +18,8 @@
#include "py_panda.h" #include "py_panda.h"
#ifdef HAVE_PYTHON
class EmptyClass class EmptyClass
{ {
}; };
@ -93,3 +95,5 @@ int Dtool_Init_DTOOL_SUPPER_BASE(PyObject *self, PyObject *args, PyObject *kwds
PyErr_SetString(PyExc_TypeError, "Error Can Not Init SUPPER BASE"); PyErr_SetString(PyExc_TypeError, "Error Can Not Init SUPPER BASE");
return -1; return -1;
} }
#endif // HAVE_PYTHON

4
dtool/src/interrogatedb/py_panda.cxx
View File

@ -18,6 +18,8 @@
#include "py_panda.h" #include "py_panda.h"
#ifdef HAVE_PYTHON
PyMemberDef standard_type_members[] = { PyMemberDef standard_type_members[] = {
{"this", T_INT, offsetof(Dtool_PyInstDef,_ptr_to_object),READONLY,"C++ This if any"}, {"this", T_INT, offsetof(Dtool_PyInstDef,_ptr_to_object),READONLY,"C++ This if any"},
{"this_ownership", T_INT, offsetof(Dtool_PyInstDef, _memory_rules), READONLY,"C++ 'this' ownership rules"}, {"this_ownership", T_INT, offsetof(Dtool_PyInstDef, _memory_rules), READONLY,"C++ 'this' ownership rules"},
@ -477,3 +479,5 @@ int DTOOL_PyObject_Compare(PyObject *v1, PyObject *v2)
return 1; return 1;
return 0; return 0;
} }
#endif // HAVE_PYTHON

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

@ -40,6 +40,8 @@
#endif #endif
#ifdef HAVE_PYTHON
#ifdef HAVE_LONG_LONG #ifdef HAVE_LONG_LONG
#undef HAVE_LONG_LONG #undef HAVE_LONG_LONG
#endif #endif
@ -460,5 +462,8 @@ EXPCL_DTOOLCONFIG int DTOOL_PyObject_Compare(PyObject *v1, PyObject *v2);
EXPCL_DTOOLCONFIG extern struct Dtool_PyTypedObject Dtool_DTOOL_SUPPER_BASE; EXPCL_DTOOLCONFIG extern struct Dtool_PyTypedObject Dtool_DTOOL_SUPPER_BASE;
#endif // HAVE_PYTHON
#endif // PY_PANDA_H_ #endif // PY_PANDA_H_