Ticket #5417: ros.patch

File ros.patch, 7.3 KB (added by hauptman, 2 years ago)

Corrected patch (error in slam_gmapping)

  • simulator_gazebo/gazebo/Makefile.gazebo.tarball

    old new  
    3131                -D CMAKE_INSTALL_PREFIX="$(INSTALL_DIR)" \ 
    3232                -D boost_include_dirs="$(BOOST_INCLUDE_DIRS)" \ 
    3333                -D boost_library_dirs="$(BOOST_LIBRARY_DIRS)" \ 
    34                 -D boost_libraries="$(BOOST_LIBRARIES)" \ 
     34                -D boost_libraries="$(BOOST_LIBRARIES) -lpthread" \ 
    3535                -D CMAKE_BUILD_TYPE="release" \ 
    3636                -D CMAKE_PREFIX_PATH="$(PROTOBUF_PREFIX_PATH)" \ 
    3737                -D INCLUDE_PLAYER="off" \ 
  • geometry/tf/include/tf/message_filter.h

    old new  
    410410 
    411411      ++successful_transform_count_; 
    412412 
    413       signalMessage(evt); 
     413      this->signalMessage(evt); 
    414414    } 
    415415    else 
    416416    { 
  • physics_ode/parallel_quickstep/include/parallel_quickstep/parallel_math.h

    old new  
    359359 
    360360// float4 functions 
    361361//////////////////////////////////////////////////////////////////////////////// 
    362  
    363362// additional constructors 
    364363inline dxHost dxDevice float4 make_float4(float s) 
    365364{ 
     
    418417  return d; 
    419418} 
    420419 
     420inline dxHost dxDevice vec3<float>::Type make_vec3(float a, float b, float c) { 
     421  return make_float3(a,b,c); 
     422} 
     423 
     424inline dxHost dxDevice vec4<float>::Type make_vec4(const float& a, const float& b, const float& c) { 
     425  return make_float4(a,b,c,(float)0.0); 
     426} 
     427 
     428inline dxHost dxDevice vec4<double>::Type make_vec4(const double& a, const double& b, const double& c) { 
     429  return make_double4(a,b,c,(double)0.0); 
     430} 
     431 
     432inline dxHost dxDevice vec4<float>::Type make_vec4(float a, float b, float c, float d) { 
     433  return make_float4(a,b,c,d); 
     434} 
     435 
     436inline dxHost dxDevice vec4<double>::Type make_vec4(double a, double b, double c, double d) { 
     437  return make_double4(a,b,c,d); 
     438} 
     439inline dxHost dxDevice vec3<double>::Type make_vec3(double a, double b, double c) { 
     440  return make_double3(a,b,c); 
     441} 
     442 
     443inline dxHost dxDevice vec4<float>::Type make_vec4( float3 a ) { return make_float4(a); } 
     444inline dxHost dxDevice vec4<double>::Type make_vec4( double3 a ) { return make_double4(a); } 
     445 
     446inline dxHost dxDevice vec4<float>::Type make_vec4( float a ) { return make_float4(a); } 
     447inline dxHost dxDevice vec4<double>::Type make_vec4( double a ) { return make_double4(a); } 
     448 
     449inline dxHost dxDevice vec3<float>::Type make_vec3( float4 a ) { return make_float3(a); } 
     450inline dxHost dxDevice vec3<double>::Type make_vec3( double4 a ) { return make_double3(a); } 
     451 
     452inline dxHost dxDevice vec3<float>::Type make_vec3( float a ) { return make_float3(a); } 
     453inline dxHost dxDevice vec3<double>::Type make_vec3( double a ) { return make_double3(a); } 
     454 
     455 
     456 
     457 
    421458 
    422459// negate 
    423460inline dxHost dxDevice float4 operator-(float4 &a) 
     
    540577  return make_float4(floor(v.x), floor(v.y), floor(v.z), floor(v.w)); 
    541578} 
    542579 
    543 inline dxHost dxDevice vec3<float>::Type make_vec3(float a, float b, float c) { 
    544   return make_float3(a,b,c); 
    545 } 
    546  
    547 inline dxHost dxDevice vec4<float>::Type make_vec4(const float& a, const float& b, const float& c) { 
    548   return make_float4(a,b,c,(float)0.0); 
    549 } 
    550  
    551 inline dxHost dxDevice vec4<double>::Type make_vec4(const double& a, const double& b, const double& c) { 
    552   return make_double4(a,b,c,(double)0.0); 
    553 } 
    554  
    555 inline dxHost dxDevice vec4<float>::Type make_vec4(float a, float b, float c, float d) { 
    556   return make_float4(a,b,c,d); 
    557 } 
    558  
    559 inline dxHost dxDevice vec4<double>::Type make_vec4(double a, double b, double c, double d) { 
    560   return make_double4(a,b,c,d); 
    561 } 
    562 inline dxHost dxDevice vec3<double>::Type make_vec3(double a, double b, double c) { 
    563   return make_double3(a,b,c); 
    564 } 
    565  
    566 inline dxHost dxDevice vec4<float>::Type make_vec4( float3 a ) { return make_float4(a); } 
    567 inline dxHost dxDevice vec4<double>::Type make_vec4( double3 a ) { return make_double4(a); } 
    568  
    569 inline dxHost dxDevice vec4<float>::Type make_vec4( float a ) { return make_float4(a); } 
    570 inline dxHost dxDevice vec4<double>::Type make_vec4( double a ) { return make_double4(a); } 
    571  
    572 inline dxHost dxDevice vec3<float>::Type make_vec3( float4 a ) { return make_float3(a); } 
    573 inline dxHost dxDevice vec3<double>::Type make_vec3( double4 a ) { return make_double3(a); } 
    574  
    575 inline dxHost dxDevice vec3<float>::Type make_vec3( float a ) { return make_float3(a); } 
    576 inline dxHost dxDevice vec3<double>::Type make_vec3( double a ) { return make_double3(a); } 
    577  
    578  
    579580#endif 
  • slam_gmapping/gmapping/gmapping-r39.patch

    old new  
    9999 #include <utils/point.h> 
    100100  
    101101 #define MAX_LINE_LENGHT (1000000) 
     102@@ -144,7 +144,7 @@ 
     103        vector<unsigned int> indexes; 
     104        virtual void read(istream& is){ 
     105                is >> dim; 
     106-               for (unsigned int i=0; i< dim; i++){ 
     107+               for (unsigned int j=0; j< dim; j++){ 
     108                        unsigned int i; 
     109                        is >> i; 
     110                        indexes.push_back(i); 
    102111@@ -368,7 +369,7 @@ 
    103112  
    104113  
  • visualization/rviz/src/rviz/CMakeLists.txt

    8a9,10
    > set(CMAKE_EXE_LINKER_FLAGS "-lfltk")
    > 
    old new  
    5050  visualizer_app.h 
    5151  wait_for_master_dialog.h 
    5252  widget_geometry_change_detector.h 
     53  OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED 
    5354  ) 
    5455 
    5556rosbuild_add_library(${PROJECT_NAME} 
  • visualization/rviz/src/rviz/default_plugin/CMakeLists.txt

    old new  
    55  image_display.h 
    66  interactive_markers/integer_action.h 
    77  interactive_markers/interactive_marker.h 
     8  OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED 
    89) 
    910 
    1011set(SOURCE_FILES 
  • visualization/rviz/src/image_view/CMakeLists.txt

    old new  
    11 
    22qt4_wrap_cpp(MOC_FILES 
    33  image_view.h 
     4  OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED 
    45) 
    56 
    67rosbuild_add_executable(image_view 
  • visualization/rviz/src/test/CMakeLists.txt

    old new  
    4040 
    4141qt4_wrap_cpp(PROPERTY_TEST_MOC_FILES 
    4242  ros_spinner.h 
     43  OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED 
    4344  ) 
    4445rosbuild_add_executable(property_test property_test.cpp ros_spinner.cpp ${PROPERTY_TEST_MOC_FILES}) 
    4546target_link_libraries(property_test ${PROJECT_NAME} ${QT_LIBRARIES}) 
     
    5859 
    5960qt4_wrap_cpp(MOC_FILES 
    6061  connect_test.h 
     62  OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED 
    6163  ) 
    6264rosbuild_add_executable(connect_test connect_test.cpp ${MOC_FILES}) 
    6365target_link_libraries(connect_test ${QT_LIBRARIES}) 
     
    6769 
    6870qt4_wrap_cpp(RENDER_POINTS_TEST_MOC_FILES 
    6971  render_points_test.h 
     72  OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED 
    7073  ) 
    7174rosbuild_add_executable(render_points_test render_points_test.cpp ../rviz/ogre_helpers/orbit_camera.cpp ${RENDER_POINTS_TEST_MOC_FILES}) 
    7275target_link_libraries(render_points_test ${PROJECT_NAME} ${QT_LIBRARIES})