From b3f055e9fa57f5692dd0bdba564aa42cf8aeb536 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 13:58:04 +0000
Subject: [PATCH] Removed the reference to the CException class from iriutils.
---
.../iri_base_driver/iri_base_driver_node.h | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/include/iri_base_driver/iri_base_driver_node.h b/include/iri_base_driver/iri_base_driver_node.h
index e8e1043..cdbee84 100644
--- a/include/iri_base_driver/iri_base_driver_node.h
+++ b/include/iri_base_driver/iri_base_driver_node.h
@@ -24,10 +24,6 @@
#include <diagnostic_updater/diagnostic_updater.h>
#include "iri_base_driver.h"
-// iri-utils thread server
-#include "threadserver.h"
-#include "exceptions.h"
-
namespace iri_base_driver
{
@@ -356,17 +352,10 @@ template <class Driver>
IriBaseNodeDriver<Driver>::~IriBaseNodeDriver()
{
ROS_DEBUG("IriBaseNodeDriver::Destrcutor");
- try
- {
- //try access to driver to assert it is
- //unlock before its destruction
- this->driver_.try_enter();
- this->driver_.unlock();
- }
- catch(CException e)
- {
- std::cout << e.what() << std::endl;
- }
+ //try access to driver to assert it is
+ //unlock before its destruction
+ this->driver_.try_enter();
+ this->driver_.unlock();
this->driver_.close();
pthread_cancel(this->thread);
--
GitLab