Fix compilation on linux (with gcc4.7).
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 15 Feb 2013 11:23:07 +0000 (11:23 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 15 Feb 2013 11:23:07 +0000 (11:23 +0000)
Without const, I had the following error:

/home/i7deb64/blender-2.5-svn/__work__/freestyle/source/blender/freestyle/intern/python/BPy_ViewMap.cpp: In function ‘PyObject* ViewMap_scene_bbox_get(BPy_ViewMap*, void*)’:
/home/i7deb64/blender-2.5-svn/__work__/freestyle/source/blender/freestyle/intern/python/BPy_ViewMap.cpp:120:54: error: invalid initialization of non-const reference of type ‘BBox<VecMat::Vec3<double> >&’ from an rvalue of type ‘BBox<VecMat::Vec3<double> >’
In file included from /home/i7deb64/blender-2.5-svn/__work__/freestyle/source/blender/freestyle/intern/python/BPy_ViewMap.cpp:3:0:
/home/i7deb64/blender-2.5-svn/__work__/freestyle/source/blender/freestyle/intern/python/BPy_Convert.h:81:12: error: in passing argument 1 of ‘PyObject* BPy_BBox_from_BBox(BBox<VecMat::Vec3<double> >&)’
/home/i7deb64/blender-2.5-svn/__work__/freestyle/source/blender/freestyle/intern/python/BPy_ViewMap.cpp:121:1: warning: control reaches end of non-void function [-Wreturn-type]
make[2]: *** [source/blender/freestyle/CMakeFiles/bf_freestyle.dir/intern/python/BPy_ViewMap.cpp.o] Erreur 1

source/blender/freestyle/intern/python/BPy_Convert.cpp
source/blender/freestyle/intern/python/BPy_Convert.h

index 59cee23409ffd128763d6e42e18b362114a401f5..00f2aa7e0c6365bf2d4f1bcd2e8f12d6d008eaa4 100644 (file)
@@ -281,7 +281,7 @@ PyObject * BPy_TVertex_from_TVertex( TVertex& tv ) {
        return py_tv;
 }
 
-PyObject * BPy_BBox_from_BBox( BBox< Vec3r > &bb ) {
+PyObject * BPy_BBox_from_BBox(const BBox< Vec3r > &bb) {
        PyObject *py_bb = BBox_Type.tp_new( &BBox_Type, 0, 0 );
        ((BPy_BBox *) py_bb)->bb = new BBox< Vec3r >( bb );
 
index 7089b4683f1ff70e7e5666d2c550a85bea1692bb..6082d70695e67b6acfc2fa97bbbf4b001d1c918b 100644 (file)
@@ -78,7 +78,7 @@ PyObject * Any_BPy_Interface1D_from_Interface1D( Interface1D& if1D );
 PyObject * Any_BPy_FEdge_from_FEdge( FEdge& fe );
 PyObject * Any_BPy_ViewVertex_from_ViewVertex( ViewVertex& vv );
 
-PyObject * BPy_BBox_from_BBox( BBox< Vec3r > &bb );
+PyObject * BPy_BBox_from_BBox(const BBox< Vec3r > &bb);
 PyObject * BPy_CurvePoint_from_CurvePoint( CurvePoint& cp );
 PyObject * BPy_directedViewEdge_from_directedViewEdge( ViewVertex::directedViewEdge& dve );
 PyObject * BPy_FEdge_from_FEdge( FEdge& fe );