Changeset 69:b9bd564ea70c in rrlib_xml

Timestamp:

06.02.2021 21:29:59 (2 years ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Phase:

public

Message:

Fixes compiler warnings that appear with additional non-default warning options enabled

Files:

• tDocument.cpp (modified) (1 diff)
• tNode.cpp (modified) (1 diff)
• tNode.h (modified) (14 diffs)

tDocument.cpp

@@ -199 +199 @@
     xmlXPathFreeObject(ptr);
   }; // clean up the XPath object
-  std::unique_ptr<xmlXPathObject, decltype(cleanup_path_object)> xpath_object(xmlXPathEvalExpression((xmlChar*)name.c_str(), xpath_context.get()), cleanup_path_object); // create and initialize an XPath object as query result with auto cleanup
+  std::unique_ptr<xmlXPathObject, decltype(cleanup_path_object)> xpath_object(xmlXPathEvalExpression(reinterpret_cast<xmlChar*>(const_cast<char*>(name.c_str())), xpath_context.get()), cleanup_path_object); // create and initialize an XPath object as query result with auto cleanup
 
   if (xpath_object == nullptr)

tNode.cpp

@@ -79 +79 @@
 // tNode IsInSubtreeOf
 //----------------------------------------------------------------------
-const bool tNode::IsInSubtreeOf(const tNode &node) const
+bool tNode::IsInSubtreeOf(const tNode &node) const
 {
   const tNode *current_node = this;

tNode.h

@@ -139 +139 @@
     }
 
-    inline const bool operator == (const iterator &other) const
+    inline bool operator == (const iterator &other) const
     {
       return element == other.element;
     }
-    inline const bool operator != (const iterator &other) const
+    inline bool operator != (const iterator &other) const
     {
       return !(*this == other);
@@ -190 +190 @@
     }
 
-    inline const bool operator == (const const_iterator &other) const
+    inline bool operator == (const const_iterator &other) const
     {
       return element == other.element;
     }
-    inline const bool operator != (const const_iterator &other) const
+    inline bool operator != (const const_iterator &other) const
     {
       return !(*this == other);
@@ -247 +247 @@
    * \returns Whether \a this is contained within the subtree of \a node
    */
-  const bool IsInSubtreeOf(const tNode &node) const;
+  bool IsInSubtreeOf(const tNode &node) const;
 
   /*! Get the name of this node
@@ -321 +321 @@
    * \returns Whether \a this has children or not
    */
-  inline const bool HasChildren() const
+  inline bool HasChildren() const
   {
     return this->ChildrenBegin() != this->ChildrenEnd();
@@ -332 +332 @@
    *  \returns The number of XML nodes reachable as children of this node
    */
-  inline const size_t GetNumberOfChildren() const
+  inline size_t GetNumberOfChildren() const
   {
     return std::distance(this->ChildrenBegin(), this->ChildrenEnd());
@@ -441 +441 @@
    * \returns Whether a sibling is reachable or not
    */
-  inline const bool HasNextSibling() const
+  inline bool HasNextSibling() const
   {
     return this->NextSiblingsBegin() != this->NextSiblingsEnd();
@@ -527 +527 @@
    * \returns Whether this node has the given attribute or not
    */
-  inline const bool HasAttribute(const std::string &name) const
+  inline bool HasAttribute(const std::string &name) const
   {
     return xmlHasProp(const_cast<tNode *>(this), reinterpret_cast<const xmlChar *>(name.c_str())) != 0;
@@ -567 +567 @@
    * \returns The attribute as int
    */
-  inline const int GetIntAttribute(const std::string &name, int base = 10) const
+  inline int GetIntAttribute(const std::string &name, int base = 10) const
   {
     return this->GetLongIntAttribute(name, base);
@@ -584 +584 @@
    * \returns The attribute as long int
    */
-  inline const long int GetLongIntAttribute(const std::string &name, int base = 10) const
+  inline long int GetLongIntAttribute(const std::string &name, int base = 10) const
   {
     return tNode::ConvertStringToNumber(this->GetStringAttribute(name), std::strtol, base);
@@ -602 +602 @@
    * \returns The attribute as long long int
    */
-  inline const long long int GetLongLongIntAttribute(const std::string &name, int base = 10) const
+  inline long long int GetLongLongIntAttribute(const std::string &name, int base = 10) const
   {
     return tNode::ConvertStringToNumber(this->GetStringAttribute(name), std::strtoll, base);
@@ -618 +618 @@
    * \returns The attribute as float
    */
-  inline const float GetFloatAttribute(const std::string &name) const
+  inline float GetFloatAttribute(const std::string &name) const
   {
     return tNode::ConvertStringToNumber(this->GetStringAttribute(name), std::strtof);
@@ -634 +634 @@
    * \returns The attribute as double
    */
-  inline const double GetDoubleAttribute(const std::string &name) const
+  inline double GetDoubleAttribute(const std::string &name) const
   {
     return tNode::ConvertStringToNumber(this->GetStringAttribute(name), std::strtod);
@@ -650 +650 @@
    * \returns The attribute as long double
    */
-  inline const long double GetLongDoubleAttribute(const std::string &name) const
+  inline long double GetLongDoubleAttribute(const std::string &name) const
   {
     return tNode::ConvertStringToNumber(this->GetStringAttribute(name), std::strtold);
@@ -716 +716 @@
    * \returns Whether the attribute's value was "true" or "false"
    */
-  inline const bool GetBoolAttribute(const std::string &name) const
+  inline bool GetBoolAttribute(const std::string &name) const
   {
     static const std::vector<std::string> bool_names = { "false", "true" };