Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.

Commit 4f03c87

Browse files
committed
Merge pull request #50 from dawagner/make_parametermgr_init_private
Make CParameterMgr::init private
2 parents fe2f8a6 + ff3a60a commit 4f03c87

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

parameter/ParameterMgr.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ class CParameterMgr : private CElement
118118
* @return true if no error occurred, false otherwise.
119119
*/
120120
bool load(std::string& strError);
121-
virtual bool init(std::string& strError);
122121

123122
// Selection Criteria
124123
CSelectionCriterionType* createSelectionCriterionType(bool bIsInclusive);
@@ -359,6 +358,9 @@ class CParameterMgr : private CElement
359358
CParameterMgr(const CParameterMgr&);
360359
CParameterMgr& operator=(const CParameterMgr&);
361360

361+
// Init
362+
virtual bool init(std::string& strError);
363+
362364
// Logging (done by root)
363365
virtual void doLog(bool bIsWarning, const std::string& strLog) const;
364366
virtual void nestLog() const;

parameter/ParameterMgrFullConnector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ CParameterMgrFullConnector::~CParameterMgrFullConnector()
5252
bool CParameterMgrFullConnector::start(string& strError)
5353
{
5454
// Create data structure & Init flow
55-
return _pParameterMgr->load(strError) && _pParameterMgr->init(strError);
55+
return _pParameterMgr->load(strError);
5656
}
5757

5858
void CParameterMgrFullConnector::setLogger(CParameterMgrFullConnector::ILogger* pLogger)

0 commit comments

Comments
 (0)