12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

inserted spaces after commas

release/4.3a0
Mike Bosse 2014-10-28 14:15:34 +01:00
parent 80187362b8
commit 82f6ed5ca8
7 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtsam/base/ChartValue.h
View File

@ -42,20 +42,20 @@
namespace gtsam { namespace gtsam {
// ChartValue is derived from GenericValue<T> and CHART so that CHART can be zero sized (as in DefaultChart<T>) // ChartValue is derived from GenericValue<T> and Chart so that Chart can be zero sized (as in DefaultChart<T>)
// if the CHART is a member variable then it won't ever be zero sized. // if the Chart is a member variable then it won't ever be zero sized.
template<class T, class CHART=DefaultChart<T> > template<class T, class Chart_=DefaultChart<T> >
class ChartValue : public GenericValue<T>, public CHART { class ChartValue : public GenericValue<T>, public Chart {
BOOST_CONCEPT_ASSERT((ChartConcept<CHART>)); BOOST_CONCEPT_ASSERT((ChartConcept<Chart_>));
public: public:
typedef T type; typedef T type;
typedef CHART Chart; typedef Chart_ Chart;
public: public:
ChartValue() : GenericValue<T>(T()) {} ChartValue() : GenericValue<T>(T()) {}
ChartValue(const T& value) : GenericValue<T>(value) {} ChartValue(const T& value) : GenericValue<T>(value) {}
template<typename C> template<typename C>
ChartValue(const T& value, C chart_initializer) : GenericValue<T>(value), CHART(chart_initializer) {} ChartValue(const T& value, C chart_initializer) : GenericValue<T>(value), Chart(chart_initializer) {}
virtual ~ChartValue() {} virtual ~ChartValue() {}
@ -96,7 +96,7 @@ class ChartValue : public GenericValue<T>, public CHART {
// Create a Value pointer copy of the result // Create a Value pointer copy of the result
void* resultAsValuePlace = boost::singleton_pool<PoolTag, sizeof(ChartValue)>::malloc(); void* resultAsValuePlace = boost::singleton_pool<PoolTag, sizeof(ChartValue)>::malloc();
Value* resultAsValue = new(resultAsValuePlace) ChartValue(retractResult, static_cast<const CHART&>(*this)); Value* resultAsValue = new(resultAsValuePlace) ChartValue(retractResult, static_cast<const Chart&>(*this));
// Return the pointer to the Value base class // Return the pointer to the Value base class
return resultAsValue; return resultAsValue;