From 64854b440c80d40825245ef3949555d7f43869be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergi=20Hern=C3=A0ndez=20Juan?= <shernand@iri.upc.edu>
Date: Thu, 5 Dec 2013 16:24:56 +0000
Subject: [PATCH] Removed the dependencies on the iriutils library from the
iri_action_server
---
CMakeLists.txt | 4 +---
include/iri_action_server/iri_action_server.h | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8be2f3b..21e9dd1 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 0278082..ef45e19 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!");
--
GitLab