fixed class constructor inheritance

This commit is contained in:
Chris Punches
2017-04-18 19:16:10 -04:00
parent 6c95f641ed
commit 41c59ea985
10 changed files with 54 additions and 61 deletions

View File

@@ -39,18 +39,23 @@ JLoader::JLoader( std::string filename )
}
}
Json::Value JLoader::get_root()
{
return this->json_root;
}
Unit::Unit( std::string filename ): JLoader( filename )
{
};
Plan::Plan( std::string filename ): JLoader( filename )
{
};
Conf::Conf( std::string filename ): JLoader( filename )
{
};

View File

@@ -22,32 +22,33 @@ class JLoader
Json::Value get_root();
};
class Unit: public Jloader
class Unit: public JLoader
{
private:
Json::Value json_root;
public:
using JLoader::JLoader;
Unit( std::string filename ): JLoader( filename );
Json::Value get_root(): JLoader::get_root();
Unit( std::string filename );
};
class Plan: public JLoader
{
private:
Json::Value json_root;
public:
using JLoader::JLoader;
Plan( std::string filename );
};
/*class Plan: Jloader
class Conf: public JLoader
{
Plan()
{
};
private:
Json::Value json_root;
public:
using JLoader::JLoader;
Conf( std::string filename );
};
class Conf: Jloader
{
Conf()
{
};
};*/
#endif //FTESTS_LOADERS_H