Merge branch 'master' of git.c3d2.de:sic++
This commit is contained in:
commit
e1831be30d
|
@ -133,8 +133,6 @@ class SicccPersister
|
||||||
std::vector<Sicccobject> read_sicccdir();
|
std::vector<Sicccobject> read_sicccdir();
|
||||||
Sicccobject read_json(const std::string&);
|
Sicccobject read_json(const std::string&);
|
||||||
Sicccobject read_json() { return read_json(json_file_name); }
|
Sicccobject read_json() { return read_json(json_file_name); }
|
||||||
void set_persist_path(std::string&);
|
|
||||||
void set_json_filename(std::string&);
|
|
||||||
|
|
||||||
friend std::ostream& operator << (std::ostream& out, const SicccPersister &p)
|
friend std::ostream& operator << (std::ostream& out, const SicccPersister &p)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue