diff --git a/CMakeLists.txt b/CMakeLists.txt index 8be2f3bb5b1c01247fa2f65e436a8674758861c1..21e9dd195b529cd03e3d1274a94048fe6f769a13 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,9 +23,7 @@ set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib) # edit the following line to add all the header files of the library # SET(headers ./include/iri_action_server.h) -FIND_PACKAGE(iriutils REQUIRED) - -INCLUDE_DIRECTORIES(${iriutils_INCLUDE_DIR} ${headers}) +INCLUDE_DIRECTORIES(${headers}) #common commands for building c++ executables and libraries # rosbuild_add_library(${PROJECT_NAME} SHARED ${sources}) diff --git a/include/iri_action_server/iri_action_server.h b/include/iri_action_server/iri_action_server.h index 0278082f7c75d921ff68c99717f0d80fcbc86fcd..ef45e19e9463b03390f8811418c0205305aab62c 100755 --- a/include/iri_action_server/iri_action_server.h +++ b/include/iri_action_server/iri_action_server.h @@ -29,8 +29,6 @@ #include <actionlib/server/simple_action_server.h> #include <actionlib/action_definition.h> -#include "exceptions.h" - /** * \brief IRI ROS Action Server * @@ -475,7 +473,7 @@ void IriActionServer<ActionSpec>::executeCallback(const GoalConstPtr& goal) } } - catch(CException e) + catch(std::exception &e) { std::cout << e.what() << std::endl; as_.setAborted(Result(), "something went wrong!");