Skip to content
Snippets Groups Projects
Commit d17eb57b authored by Joseph Mirabel's avatar Joseph Mirabel
Browse files

Cosmetic changes.

parent b063d4b6
No related branches found
No related tags found
No related merge requests found
......@@ -16,9 +16,6 @@
* have received a copy of the GNU Lesser General Public License along
* with dynamic_graph_bridge. If not, see <http://www.gnu.org/licenses/>.
*/
#include <boost/thread/thread.hpp>
#include <boost/thread/condition.hpp>
#include <iostream>
#define ENABLE_RT_LOG
......
......@@ -87,9 +87,9 @@ Value Add::doExecute() {
else if (type == "unsigned")
entity.add<unsigned int>(type, signal, topic);
else if (type == "matrix")
entity.add<dg::Matrix>(type, signal, topic);
entity.add<Matrix>(type, signal, topic);
else if (type == "vector")
entity.add<dg::Vector>(type, signal, topic);
entity.add<Vector>(type, signal, topic);
else if (type == "vector3")
entity.add<specific::Vector3>(type, signal, topic);
else if (type == "matrixHomo")
......
......@@ -32,9 +32,6 @@
# include "dynamic_graph_bridge_msgs/Matrix.h"
# include "dynamic_graph_bridge_msgs/Vector.h"
namespace dg = dynamicgraph;
typedef boost::mutex::scoped_lock scoped_lock;
namespace dynamicgraph
{
namespace internal
......@@ -111,7 +108,7 @@ namespace dynamicgraph
{
// synchronize with method clear:
// If reading from the list cannot be done, then return last value.
scoped_lock lock(rmutex, boost::try_to_lock);
boost::mutex::scoped_lock lock(rmutex, boost::try_to_lock);
if (!lock.owns_lock() || entity->readQueue_ == -1 || time < entity->readQueue_) {
data = last;
} else {
......
......@@ -28,11 +28,6 @@
// POSIX.1-2001
#include <dlfcn.h>
#include <boost/thread/thread.hpp>
#include <boost/thread/condition.hpp>
boost::mutex mut;
using namespace std;
using namespace dynamicgraph::sot;
namespace po = boost::program_options;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment