Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix two compile errors, thanks to Travis

Browse Source 
https://travis-ci.org/bulletphysics/bullet3/jobs/33858712
This commit is contained in:
erwin coumans
2014-08-28 18:53:51 -07:00
parent bc5e2b3d50
commit 0dff61fbe0
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
btgui/urdf/urdfdom_headers/urdf_model/include/urdf_model/model.h
View File

@@ -41,7 +41,7 @@
#include <map> #include <map>
//#include <boost/function.hpp> //#include <boost/function.hpp>
#include <urdf/urdfdom_headers/urdf_model/include/urdf_model/link.h> #include <urdf/urdfdom_headers/urdf_model/include/urdf_model/link.h>
#include <stdio.h> //printf
#include <urdf/urdfdom_headers/urdf_exception/include/urdf_exception/exception.h> #include <urdf/urdfdom_headers/urdf_exception/include/urdf_exception/exception.h>
namespace urdf { namespace urdf {
@@ -134,7 +134,7 @@ public:
this->getLink(child_link_name, child_link); this->getLink(child_link_name, child_link);
if (!child_link) if (!child_link)
{ {
printf("Error: child link [%s] of joint [%s] not found\n", child_link_name,joint->first ); printf("Error: child link [%s] of joint [%s] not found\n", child_link_name.c_str(),joint->first.c_str() );
assert(0); assert(0);
// throw ParseError("child link [" + child_link_name + "] of joint [" + joint->first + "] not found"); // throw ParseError("child link [" + child_link_name + "] of joint [" + joint->first + "] not found");
} }

1
src/Bullet3Common/b3FileUtils.h
View File

@@ -3,6 +3,7 @@
#include <stdio.h> #include <stdio.h>
#include "b3Scalar.h" #include "b3Scalar.h"
#include <stddef.h>//ptrdiff_h
struct b3FileUtils struct b3FileUtils
{ {