From b5569103fc07526839a5ae04217bf73de2aefaad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu>
Date: Mon, 15 Jun 2020 18:23:53 +0200
Subject: [PATCH] Remove commented code
---
include/core/sensor/sensor_base.h | 3 ---
include/core/state_block/has_state_blocks.h | 5 -----
2 files changed, 8 deletions(-)
diff --git a/include/core/sensor/sensor_base.h b/include/core/sensor/sensor_base.h
index f613f3aa9..b1572a010 100644
--- a/include/core/sensor/sensor_base.h
+++ b/include/core/sensor/sensor_base.h
@@ -175,11 +175,8 @@ class SensorBase : public NodeBase, public HasStateBlocks, public std::enable_sh
// State blocks
using HasStateBlocks::addStateBlock;
StateBlockPtr addStateBlock(const char& _key, const StateBlockPtr& _sb_ptr, const bool _dynamic = false);
-// StateBlockPtr addStateBlock(const char& _key, const StateBlockPtr& _sb_ptr, const bool _dynamic = false) { return this->addStateBlock(std::string(1, _key), _sb_ptr, _dynamic); }
StateBlockPtr getStateBlockDynamic(const char& _key) const;
StateBlockPtr getStateBlockDynamic(const char& _key, const TimeStamp& _ts) const;
-// StateBlockPtr getStateBlockDynamic(const char _key) const { return getStateBlockDynamic(std::string(1,_key)); }
-// StateBlockPtr getStateBlockDynamic(const char _key, const TimeStamp& _ts) const { return getStateBlockDynamic(std::string(1,_key), _ts); }
// Declare a state block as dynamic or static (with _dymanic = false)
void setStateBlockDynamic(const char& _key, bool _dynamic = true);
diff --git a/include/core/state_block/has_state_blocks.h b/include/core/state_block/has_state_blocks.h
index e1ffbeac2..5e1250ff0 100644
--- a/include/core/state_block/has_state_blocks.h
+++ b/include/core/state_block/has_state_blocks.h
@@ -41,16 +41,11 @@ class HasStateBlocks
virtual bool isFixed() const;
virtual StateBlockPtr addStateBlock(const char& _sb_type, const StateBlockPtr& _sb, ProblemPtr _problem);
-// virtual StateBlockPtr addStateBlock(const char _sb_type, const StateBlockPtr& _sb, ProblemPtr _problem) { return addStateBlock(std::string(1,_sb_type), _sb, _problem); }
-// virtual unsigned int removeStateBlock(const std::string& _sb_type);
virtual unsigned int removeStateBlock(const char& _sb_type);
bool hasStateBlock(const char& _sb_type) const { return state_block_map_.count(_sb_type) > 0; }
-// bool hasStateBlock(const char _sb_type) const { return hasStateBlock(std::string(1, _sb_type)); }
bool hasStateBlock(const StateBlockPtr& _sb) const;
StateBlockPtr getStateBlock(const char& _sb_type) const;
-// StateBlockPtr getStateBlock(const char _sb_type) const { return getStateBlock(std::string(1,_sb_type)); }
bool setStateBlock(const char _sb_type, const StateBlockPtr& _sb);
-// bool setStateBlock(const char _sb_type, const StateBlockPtr& _sb) { return setStateBlock(std::string(1, _sb_type), _sb); }
bool stateBlockKey(const StateBlockPtr& _sb, char& _key) const;
std::unordered_map<char, StateBlockPtr>::const_iterator find(const StateBlockPtr& _sb) const;
--
GitLab