Skip to content

Commit

Permalink
remove deprecated funs for v0.7.0 (#694)
Browse files Browse the repository at this point in the history 
* removed dep Node::fetch_child

* remove deprecated functions for v0.7.0
  • Loading branch information
@cyrush
cyrush authored Feb 6, 2021
1 parent a8f1c56 commit e6a0c0c
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 127 deletions.
14 changes: 0 additions & 14 deletions src/libs/conduit/conduit_node.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13397,20 +13397,6 @@ Node::fetch_existing(const std::string &path)
}
}


//---------------------------------------------------------------------------//
Node&
Node::fetch_child(const std::string &path)
{
return fetch_existing(path);
}
//---------------------------------------------------------------------------//
const Node&
Node::fetch_child(const std::string &path) const
{
return fetch_existing(path);
}

//---------------------------------------------------------------------------//
Node&
Node::fetch(const std::string &path)
Expand Down
7 changes: 0 additions & 7 deletions src/libs/conduit/conduit_node.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3806,13 +3806,6 @@ class CONDUIT_API Node
Node &fetch_existing(const std::string &path);
const Node &fetch_existing(const std::string &path) const;

/// DEPRECATED: `fetch_child` is deprecated in favor of `fetch_existing`
///
/// the `fetch_child' methods don't modify map structure, if a path
/// doesn't exist they will throw an exception
Node &fetch_child(const std::string &path);
const Node &fetch_child(const std::string &path) const;

// add_child will not try to parse the name as a path. "foo/bar.png" is
// a legal name.
Node &add_child(const std::string &name);
Expand Down
65 changes: 0 additions & 65 deletions src/libs/conduit/conduit_schema.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,44 +515,6 @@ Schema::to_string_default() const
return to_string();
}

//---------------------------------------------------------------------------//
// note: variants with detailed arg (which hasn't been used) are deprecated
std::string
Schema::to_json(bool /* detailed */, // unused
index_t indent,
index_t depth,
const std::string &pad,
const std::string &eoe) const
{
return to_json(indent,depth,pad,eoe);
}

//---------------------------------------------------------------------------//
// note: variants with detailed arg (which hasn't been used) are deprecated
void
Schema::to_json_stream(std::ostream &os,
bool /* detailed */, // unused
index_t indent,
index_t depth,
const std::string &pad,
const std::string &eoe) const
{
to_json_stream(os,indent,depth,pad,eoe);
}

//---------------------------------------------------------------------------//
// note: variants with detailed arg (which hasn't been used) are deprecated
void
Schema::to_json_stream(const std::string &stream_path,
bool /* detailed */, // unused
index_t indent,
index_t depth,
const std::string &pad,
const std::string &eoe) const
{
to_json_stream(stream_path,indent,depth,pad,eoe);
}


//---------------------------------------------------------------------------//
std::string
Expand Down Expand Up @@ -740,20 +702,6 @@ Schema::to_yaml_default() const
//
//-----------------------------------------------------------------------------

//---------------------------------------------------------------------------//
//
// note: variants with detailed arg (which hasn't been used) are deprecated
void
Schema::save(const std::string &ofname,
bool /* detailed*/, // unused
index_t indent,
index_t depth,
const std::string &pad,
const std::string &eoe) const
{
save(ofname,indent,depth,pad,eoe);
}

//---------------------------------------------------------------------------//
void
Schema::save(const std::string &ofname,
Expand Down Expand Up @@ -1032,19 +980,6 @@ Schema::fetch_existing(const std::string &path) const
}
}

//---------------------------------------------------------------------------//
Schema&
Schema::fetch_child(const std::string &path)
{
return fetch_existing(path);
}

//---------------------------------------------------------------------------//
const Schema &
Schema::fetch_child(const std::string &path) const
{
return fetch_existing(path);
}

//---------------------------------------------------------------------------//
index_t
Expand Down
41 changes: 0 additions & 41 deletions src/libs/conduit/conduit_schema.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,30 +220,6 @@ class CONDUIT_API Schema
const std::string &pad=" ",
const std::string &eoe="\n") const;

//-------------------------------------------------------------------------
///DEPRECATED: Schema::to_json variants with detailed (bool) arg are
/// deprecated. The detailed arg was never used. These methods
/// will be removed in a future release.
std::string to_json(bool detailed,
index_t indent=2,
index_t depth=0,
const std::string &pad=" ",
const std::string &eoe="\n") const;

void to_json_stream(std::ostream &os,
bool detailed,
index_t indent=2,
index_t depth=0,
const std::string &pad=" ",
const std::string &eoe="\n") const;

void to_json_stream(const std::string &stream_path,
bool detailed,
index_t indent=2,
index_t depth=0,
const std::string &pad=" ",
const std::string &eoe="\n") const;

// NOTE(JRC): The primary reason this function exists is to enable easier
// compatibility with debugging tools (e.g. totalview, gdb) that have
// difficulty allocating default string parameters.
Expand Down Expand Up @@ -287,16 +263,6 @@ class CONDUIT_API Schema
//
//-----------------------------------------------------------------------------

///DEPRECATED: Schema::save variant with detailed (bool) arg is
/// deprecated. The detailed arg was never used. This method
/// will be removed in a future release.
void save(const std::string &ofname,
bool detailed,
index_t indent=2,
index_t depth=0,
const std::string &pad=" ",
const std::string &eoe="\n") const;

void save(const std::string &ofname,
index_t indent=2,
index_t depth=0,
Expand Down Expand Up @@ -339,13 +305,6 @@ class CONDUIT_API Schema
Schema &fetch_existing(const std::string &path);
const Schema &fetch_existing(const std::string &path) const;

/// DEPRECATED: `fetch_child` is deprecated in favor of `fetch_existing`
///
/// the `fetch_child' methods don't modify map structure, if a path
/// doesn't exist they will throw an exception
Schema &fetch_child(const std::string &path);
const Schema &fetch_child(const std::string &path) const;

// the 'child' methods also don't modify map structure. Additionally,
// they do not search parent/child schemas, and thus allow getting children
// whose names contain slashes.
Expand Down

0 comments on commit e6a0c0c

Please sign in to comment.