Skip to content

Commit

Permalink
latest from coda-oss
Browse files Browse the repository at this point in the history
  • Loading branch information
Dan Smith authored and Dan Smith committed Aug 8, 2022
1 parent 8cfbf7e commit 8082e8d
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 10 deletions.
Empty file modified externals/coda-oss/build/config.sub
100644 → 100755
Empty file.
Empty file modified externals/coda-oss/build/scripts/jenkins.py
100644 → 100755
Empty file.
Empty file modified externals/coda-oss/build/scripts/makeEnums.py
100644 → 100755
Empty file.
Empty file modified externals/coda-oss/build/waf
100644 → 100755
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ namespace lite
* Use the Document to access the Element nodes contained within.
* The DocumentParser will build a tree that you can use.
*/
struct Document final
struct Document // SOAPDocument derives :-(
{
//! Constructor
Document(Element* rootNode = nullptr, bool own = true) :
Expand All @@ -74,7 +74,7 @@ struct Document final
* Destroy the xml tree. This deletes the nodes if they exist
* Careful, this may delete your copy if you are not careful
*/
~Document() noexcept(false)
virtual ~Document() noexcept(false)
{
destroy();
}
Expand Down
18 changes: 13 additions & 5 deletions externals/coda-oss/modules/c++/xml.lite/include/xml/lite/Element.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ namespace lite
* This class stores all of the element information about an XML
* document.
*/
struct Element final
struct Element // SOAPElement derives :-(
{
Element() = default;

Expand Down Expand Up @@ -88,7 +88,7 @@ struct Element final
#endif // SWIG

//! Destructor
~Element() noexcept(false)
virtual ~Element() noexcept(false)
{
destroyChildren();
}
Expand Down Expand Up @@ -394,6 +394,12 @@ struct Element final
mName.getAssociatedUri(result);
}

void setPrefix(const std::string& prefix)
{
mName.setPrefix(prefix);
}


/*!
* Adds a child element to this element
* \param node the child element to add
Expand Down Expand Up @@ -447,6 +453,11 @@ struct Element final
mParent = parent;
}

protected:
//! The children of this element
std::vector<Element*> mChildren;
xml::lite::QName mName;

private:
void changePrefix(Element* element,
const std::string& prefix,
Expand All @@ -459,9 +470,6 @@ struct Element final
void depthPrint(io::OutputStream& stream, int depth, const std::string& formatter, bool isConsoleOutput = false) const;

Element* mParent = nullptr;
//! The children of this element
std::vector<Element*> mChildren;
xml::lite::QName mName;
//! The attributes for this element
xml::lite::Attributes mAttributes;
coda_oss::u8string mCharacterData;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ namespace lite
* bloat of the spec. It was inspired by python's xml.dom.minidom
* module.
*/
struct MinidomParser final
struct MinidomParser // SOAPParser inherits :-(
{
/*!
* Constructor. Set our SAX ContentHandler.
*/
explicit MinidomParser(bool storeEncoding = true);

//! Destructor.
~MinidomParser() = default;
virtual ~MinidomParser() = default;

MinidomParser(const MinidomParser&) = delete;
MinidomParser& operator=(const MinidomParser&) = delete;
Expand All @@ -77,7 +77,7 @@ struct MinidomParser final
* \param is This is the input stream to feed the parser
* \param size This is the size of the stream to feed the parser
*/
void parse(io::InputStream& is, int size = io::InputStream::IS_END);
virtual void parse(io::InputStream& is, int size = io::InputStream::IS_END);
void parse(io::InputStream& is, const void*pInitialEncoding, const void* pFallbackEncoding,
int size = io::InputStream::IS_END);

Expand Down
Empty file modified externals/coda-oss/modules/python/logging/tests/test_logging.py
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified externals/coda-oss/waf
100644 → 100755
Empty file.

0 comments on commit 8082e8d

Please sign in to comment.