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

Fix compile warnings (incl. "Attempt to define invalid type" spam), define _Dtool_CheckErrorOccurred in release builds for binary compat

Browse Source
This commit is contained in:
rdb 2016-02-27 16:45:22 +01:00
parent 9f0cd81803
commit f933eb4e96
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dtool/src/interrogate/interrogateBuilder.cxx
View File

@ -1870,9 +1870,7 @@ get_make_property(CPPMakeProperty *make_property, CPPStructType *struct_type, CP
iproperty._scoped_name = descope(make_property->get_local_name(&parser)); iproperty._scoped_name = descope(make_property->get_local_name(&parser));
if (return_type != NULL) { if (return_type != NULL) {
iproperty._type = get_type(return_type, false); iproperty._type = get_type(TypeManager::unwrap_reference(return_type), false);
// if (iproperty._type == 0) { parser.warning("cannot determine property
// type", make_property->_ident->_loc); }
} else { } else {
iproperty._type = 0; iproperty._type = 0;
} }

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

@ -183,7 +183,7 @@ void *DTOOL_Call_GetPointerThis(PyObject *self) {
* In the NDEBUG case, this is simply a #define to _PyErr_OCCURRED() (which is * In the NDEBUG case, this is simply a #define to _PyErr_OCCURRED() (which is
* an undocumented inline version of PyErr_Occurred()). * an undocumented inline version of PyErr_Occurred()).
*/ */
bool Dtool_CheckErrorOccurred() { bool _Dtool_CheckErrorOccurred() {
if (_PyErr_OCCURRED()) { if (_PyErr_OCCURRED()) {
return true; return true;
} }

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

@ -313,12 +313,13 @@ template<class T> INLINE bool DTOOL_Call_ExtractThisPointer(PyObject *self, T *&
} }
// Functions related to error reporting. // Functions related to error reporting.
EXPCL_INTERROGATEDB bool _Dtool_CheckErrorOccurred();
#ifdef NDEBUG #ifdef NDEBUG
// _PyErr_OCCURRED is an undocumented inline version of PyErr_Occurred. // _PyErr_OCCURRED is an undocumented inline version of PyErr_Occurred.
#define Dtool_CheckErrorOccurred() (_PyErr_OCCURRED() != NULL) #define Dtool_CheckErrorOccurred() (_PyErr_OCCURRED() != NULL)
#else #else
EXPCL_INTERROGATEDB bool Dtool_CheckErrorOccurred(); #define Dtool_CheckErrorOccurred() _Dtool_CheckErrorOccurred()
#endif #endif
EXPCL_INTERROGATEDB PyObject *Dtool_Raise_AssertionError(); EXPCL_INTERROGATEDB PyObject *Dtool_Raise_AssertionError();

2
panda/src/gobj/texturePeeker.I
View File

@ -54,5 +54,5 @@ get_z_size() const {
*/ */
INLINE bool TexturePeeker:: INLINE bool TexturePeeker::
has_pixel(size_t x, size_t y) const { has_pixel(size_t x, size_t y) const {
return x >= 0 && y >= 0 && x < _x_size && y < _y_size; return x < _x_size && y < _y_size;
} }