Fixed warnings about mixing class and struct

release/4.3a0
Richard Roberts 2012-03-17 23:57:39 +00:00
parent 99c3371474
commit 6a957d059b
6 changed files with 9 additions and 6 deletions

View File

@ -25,7 +25,8 @@
using namespace gtsam; using namespace gtsam;
using namespace std; using namespace std;
struct EliminationTreeTester { class EliminationTreeTester {
public:
// build hardcoded tree // build hardcoded tree
static SymbolicEliminationTree::shared_ptr buildHardcodedTree(const SymbolicFactorGraph& fg) { static SymbolicEliminationTree::shared_ptr buildHardcodedTree(const SymbolicFactorGraph& fg) {

View File

@ -31,7 +31,7 @@
namespace gtsam { namespace gtsam {
struct SharedDiagonal; class SharedDiagonal;
/** return A*x-b /** return A*x-b
* \todo Make this a member function - affects SubgraphPreconditioner */ * \todo Make this a member function - affects SubgraphPreconditioner */

View File

@ -33,7 +33,7 @@ namespace gtsam {
// Forward declarations // Forward declarations
class JacobianFactor; class JacobianFactor;
struct SharedDiagonal; class SharedDiagonal;
class GaussianConditional; class GaussianConditional;
template<class C> class BayesNet; template<class C> class BayesNet;

View File

@ -23,7 +23,7 @@
namespace gtsam { namespace gtsam {
struct SharedDiagonal; // forward declare class SharedDiagonal; // forward declare
/// All noise models live in the noiseModel namespace /// All noise models live in the noiseModel namespace
namespace noiseModel { namespace noiseModel {

View File

@ -25,7 +25,8 @@ namespace gtsam { // note, deliberately not in noiseModel namespace
// A useful convenience class to refer to a shared Diagonal model // A useful convenience class to refer to a shared Diagonal model
// There are (somewhat dangerous) constructors from Vector and pair<size_t,double> // There are (somewhat dangerous) constructors from Vector and pair<size_t,double>
// that call Sigmas and Sigma, respectively. // that call Sigmas and Sigma, respectively.
struct SharedDiagonal: public noiseModel::Diagonal::shared_ptr { class SharedDiagonal: public noiseModel::Diagonal::shared_ptr {
public:
SharedDiagonal() { SharedDiagonal() {
} }
SharedDiagonal(const noiseModel::Diagonal::shared_ptr& p) : SharedDiagonal(const noiseModel::Diagonal::shared_ptr& p) :

View File

@ -27,7 +27,8 @@ namespace gtsam { // note, deliberately not in noiseModel namespace
* A useful convenience class to refer to a shared Gaussian model * A useful convenience class to refer to a shared Gaussian model
* Also needed to make noise models in matlab * Also needed to make noise models in matlab
*/ */
struct SharedGaussian: public SharedNoiseModel { class SharedGaussian: public SharedNoiseModel {
public:
typedef SharedNoiseModel Base; typedef SharedNoiseModel Base;