Commit 77f90635 authored by loring's avatar loring

MapNode cleanup hiding overload virtual warning


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23764 18c085ea-50e0-402c-830e-de6fd14e8384
parent 00b57872
......@@ -65,8 +65,6 @@
class STATE_API MapNode : public Variant
{
//using Variant::ToXML;
//using Variant::ToJSON; ///TODO: handle ambiguous ToXML & ToJSON
public:
enum {
MapNodeType = Variant::ID__LAST,
......@@ -118,9 +116,11 @@ class STATE_API MapNode : public Variant
int GetNumEntries() const {return (int)entries.size();}
void Reset();
using Variant::ToXML;
virtual std::string ToXML(bool encodeString = true) const;
virtual XMLNode ToXMLNode(bool encodeString = true) const;
using Variant::ToJSON;
virtual std::string ToJSON(bool encodeString = true) const;
virtual JSONNode ToJSONNode(bool encodeString = true, bool id = true) const;
......
......@@ -2795,6 +2795,12 @@ Variant::ToXMLNode(bool encodeString) const
return node;
}
JSONNode
Variant::ToJSONNode(bool encodeString) const
{
return this->ToJSONNode(encodeString, true);
}
JSONNode
Variant::ToJSONNode(bool encodeString, bool id) const
{
......
......@@ -215,10 +215,11 @@ class STATE_API Variant
void Reset() {Cleanup();} // set to empty
virtual std::string ToXML(const std::string &indent="",bool encodeString = true) const;
virtual std::string ToJSON(const std::string &indent="",bool encodeString = true) const;
virtual XMLNode ToXMLNode(bool encodeString = true) const;
virtual JSONNode ToJSONNode(bool encodeString = true, bool id = true) const;
virtual std::string ToXML(const std::string &indent, bool encodeString) const;
virtual std::string ToJSON(const std::string &indent, bool encodeString) const;
virtual XMLNode ToXMLNode(bool encodeString) const;
virtual JSONNode ToJSONNode(bool encodeString) const;
virtual JSONNode ToJSONNode(bool encodeString, bool id) const;
protected:
void Write(Connection &conn) const;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment