From 02cd36aed8ff0b0c0efdd06e669f9d9a34608bcf Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Mon, 16 Oct 2017 18:21:33 +0200
Subject: [PATCH] Fix bug (null pointers)
---
include/hpp/manipulation/graph/statistics.hh | 4 ++--
include/hpp/manipulation/roadmap-node.hh | 4 ++--
src/graph/statistics.cc | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/hpp/manipulation/graph/statistics.hh b/include/hpp/manipulation/graph/statistics.hh
index 27ff91b..6c3a8ba 100644
--- a/include/hpp/manipulation/graph/statistics.hh
+++ b/include/hpp/manipulation/graph/statistics.hh
@@ -84,7 +84,7 @@ namespace hpp {
std::ostream& print (std::ostream& os) const;
private:
- StateWkPtr_t state_;
+ StatePtr_t state_;
typedef std::list <RoadmapNodePtr_t> RoadmapNodes_t;
RoadmapNodes_t roadmapNodes_;
@@ -195,7 +195,7 @@ namespace hpp {
private:
/// The constraint graph
- graph::GraphWkPtr_t graph_;
+ graph::GraphPtr_t graph_;
};
typedef StateHistogram NodeHistogram HPP_MANIPULATION_DEPRECATED;
typedef boost::shared_ptr <StateHistogram> NodeHistogramPtr_t;
diff --git a/include/hpp/manipulation/roadmap-node.hh b/include/hpp/manipulation/roadmap-node.hh
index e4de416..439677d 100644
--- a/include/hpp/manipulation/roadmap-node.hh
+++ b/include/hpp/manipulation/roadmap-node.hh
@@ -99,14 +99,14 @@ namespace hpp {
SymbolicComponentPtr_t symbolicComponent () const
{
- return symbolicCC_.lock();
+ return symbolicCC_;
}
private:
CachingSystem cacheSystem_;
graph::StateWkPtr_t state_;
- SymbolicComponentWkPtr_t symbolicCC_;
+ SymbolicComponentPtr_t symbolicCC_;
};
} // namespace manipulation
} // namespace hpp
diff --git a/src/graph/statistics.cc b/src/graph/statistics.cc
index fec9efa..0012c15 100644
--- a/src/graph/statistics.cc
+++ b/src/graph/statistics.cc
@@ -119,7 +119,7 @@ namespace hpp {
const StatePtr_t& NodeBin::state () const
{
- return state_.lock();
+ return state_;
}
std::ostream& NodeBin::print (std::ostream& os) const
@@ -213,7 +213,7 @@ namespace hpp {
const graph::GraphPtr_t& StateHistogram::constraintGraph () const
{
- return graph_.lock();
+ return graph_;
}
HistogramPtr_t StateHistogram::clone () const
--
GitLab