Merge pull request #697 from jgressma/fixes-for-bcc

zeux · web-flow · commit 3070fb632084 · 2026-03-16T10:39:18.000-07:00
Fixes for Embacadero's XE5 compiler
diff --git a/src/pugixml.cpp b/src/pugixml.cpp
@@ -5582,12 +5582,12 @@ namespace pugi
 #endif
 
 #ifdef __BORLANDC__
-	PUGI_IMPL_FN bool operator&&(const xml_attribute& lhs, bool rhs)
+	PUGI_IMPL_FN bool PUGIXML_FUNCTION operator&&(const xml_attribute& lhs, bool rhs)
 	{
 		return (bool)lhs && rhs;
 	}
 
-	PUGI_IMPL_FN bool operator||(const xml_attribute& lhs, bool rhs)
+	PUGI_IMPL_FN bool PUGIXML_FUNCTION operator||(const xml_attribute& lhs, bool rhs)
 	{
 		return (bool)lhs || rhs;
 	}
@@ -6902,12 +6902,12 @@ namespace pugi
 	}
 
 #ifdef __BORLANDC__
-	PUGI_IMPL_FN bool operator&&(const xml_node& lhs, bool rhs)
+	PUGI_IMPL_FN bool PUGIXML_FUNCTION operator&&(const xml_node& lhs, bool rhs)
 	{
 		return (bool)lhs && rhs;
 	}
 
-	PUGI_IMPL_FN bool operator||(const xml_node& lhs, bool rhs)
+	PUGI_IMPL_FN bool PUGIXML_FUNCTION operator||(const xml_node& lhs, bool rhs)
 	{
 		return (bool)lhs || rhs;
 	}
@@ -7215,12 +7215,12 @@ namespace pugi
 	}
 
 #ifdef __BORLANDC__
-	PUGI_IMPL_FN bool operator&&(const xml_text& lhs, bool rhs)
+	PUGI_IMPL_FN bool PUGIXML_FUNCTION operator&&(const xml_text& lhs, bool rhs)
 	{
 		return (bool)lhs && rhs;
 	}
 
-	PUGI_IMPL_FN bool operator||(const xml_text& lhs, bool rhs)
+	PUGI_IMPL_FN bool PUGIXML_FUNCTION operator||(const xml_text& lhs, bool rhs)
 	{
 		return (bool)lhs || rhs;
 	}
@@ -7257,7 +7257,11 @@ namespace pugi
 	PUGI_IMPL_FN xml_node* xml_node_iterator::operator->() const
 	{
 		assert(_wrap._root);
+#if defined(__BORLANDC__) && __BORLANDC__ <= 0x0670 // XE5
+		return const_cast<xml_node*>(&_wrap);
+#else
 		return &_wrap;
+#endif
 	}
 
 	PUGI_IMPL_FN xml_node_iterator& xml_node_iterator::operator++()
@@ -7318,7 +7322,11 @@ namespace pugi
 	PUGI_IMPL_FN xml_attribute* xml_attribute_iterator::operator->() const
 	{
 		assert(_wrap._attr);
+#if defined(__BORLANDC__) && __BORLANDC__ <= 0x0670 // XE5
+		return const_cast<xml_attribute*>(&_wrap);
+#else
 		return &_wrap;
+#endif
 	}
 
 	PUGI_IMPL_FN xml_attribute_iterator& xml_attribute_iterator::operator++()
@@ -7379,7 +7387,11 @@ namespace pugi
 	PUGI_IMPL_FN xml_node* xml_named_node_iterator::operator->() const
 	{
 		assert(_wrap._root);
+#if defined(__BORLANDC__) && __BORLANDC__ <= 0x0670 // XE5
+		return const_cast<xml_node*>(&_wrap);
+#else
 		return &_wrap;
+#endif
 	}
 
 	PUGI_IMPL_FN xml_named_node_iterator& xml_named_node_iterator::operator++()

Original file line number	Diff line number	Diff line change
`@@ -5582,12 +5582,12 @@ namespace pugi`
`5582`	`5582`	`#endif`
`5583`	`5583`
`5584`	`5584`	`#ifdef __BORLANDC__`
`5585`		`- PUGI_IMPL_FN bool operator&&(const xml_attribute& lhs, bool rhs)`
	`5585`	`+ PUGI_IMPL_FN bool PUGIXML_FUNCTION operator&&(const xml_attribute& lhs, bool rhs)`
`5586`	`5586`	`{`
`5587`	`5587`	`return (bool)lhs && rhs;`
`5588`	`5588`	`}`
`5589`	`5589`
`5590`		`- PUGI_IMPL_FN bool operator\|\|(const xml_attribute& lhs, bool rhs)`
	`5590`	`+ PUGI_IMPL_FN bool PUGIXML_FUNCTION operator\|\|(const xml_attribute& lhs, bool rhs)`
`5591`	`5591`	`{`
`5592`	`5592`	`return (bool)lhs \|\| rhs;`
`5593`	`5593`	`}`
`@@ -6902,12 +6902,12 @@ namespace pugi`
`6902`	`6902`	`}`
`6903`	`6903`
`6904`	`6904`	`#ifdef __BORLANDC__`
`6905`		`- PUGI_IMPL_FN bool operator&&(const xml_node& lhs, bool rhs)`
	`6905`	`+ PUGI_IMPL_FN bool PUGIXML_FUNCTION operator&&(const xml_node& lhs, bool rhs)`
`6906`	`6906`	`{`
`6907`	`6907`	`return (bool)lhs && rhs;`
`6908`	`6908`	`}`
`6909`	`6909`
`6910`		`- PUGI_IMPL_FN bool operator\|\|(const xml_node& lhs, bool rhs)`
	`6910`	`+ PUGI_IMPL_FN bool PUGIXML_FUNCTION operator\|\|(const xml_node& lhs, bool rhs)`
`6911`	`6911`	`{`
`6912`	`6912`	`return (bool)lhs \|\| rhs;`
`6913`	`6913`	`}`
`@@ -7215,12 +7215,12 @@ namespace pugi`
`7215`	`7215`	`}`
`7216`	`7216`
`7217`	`7217`	`#ifdef __BORLANDC__`
`7218`		`- PUGI_IMPL_FN bool operator&&(const xml_text& lhs, bool rhs)`
	`7218`	`+ PUGI_IMPL_FN bool PUGIXML_FUNCTION operator&&(const xml_text& lhs, bool rhs)`
`7219`	`7219`	`{`
`7220`	`7220`	`return (bool)lhs && rhs;`
`7221`	`7221`	`}`
`7222`	`7222`
`7223`		`- PUGI_IMPL_FN bool operator\|\|(const xml_text& lhs, bool rhs)`
	`7223`	`+ PUGI_IMPL_FN bool PUGIXML_FUNCTION operator\|\|(const xml_text& lhs, bool rhs)`
`7224`	`7224`	`{`
`7225`	`7225`	`return (bool)lhs \|\| rhs;`
`7226`	`7226`	`}`
`@@ -7257,7 +7257,11 @@ namespace pugi`
`7257`	`7257`	`PUGI_IMPL_FN xml_node* xml_node_iterator::operator->() const`
`7258`	`7258`	`{`
`7259`	`7259`	`assert(_wrap._root);`
	`7260`	`+#if defined(__BORLANDC__) && __BORLANDC__ <= 0x0670 // XE5`
	`7261`	`+ return const_cast<xml_node*>(&_wrap);`
	`7262`	`+#else`
`7260`	`7263`	`return &_wrap;`
	`7264`	`+#endif`
`7261`	`7265`	`}`
`7262`	`7266`
`7263`	`7267`	`PUGI_IMPL_FN xml_node_iterator& xml_node_iterator::operator++()`
`@@ -7318,7 +7322,11 @@ namespace pugi`
`7318`	`7322`	`PUGI_IMPL_FN xml_attribute* xml_attribute_iterator::operator->() const`
`7319`	`7323`	`{`
`7320`	`7324`	`assert(_wrap._attr);`
	`7325`	`+#if defined(__BORLANDC__) && __BORLANDC__ <= 0x0670 // XE5`
	`7326`	`+ return const_cast<xml_attribute*>(&_wrap);`
	`7327`	`+#else`
`7321`	`7328`	`return &_wrap;`
	`7329`	`+#endif`
`7322`	`7330`	`}`
`7323`	`7331`
`7324`	`7332`	`PUGI_IMPL_FN xml_attribute_iterator& xml_attribute_iterator::operator++()`
`@@ -7379,7 +7387,11 @@ namespace pugi`
`7379`	`7387`	`PUGI_IMPL_FN xml_node* xml_named_node_iterator::operator->() const`
`7380`	`7388`	`{`
`7381`	`7389`	`assert(_wrap._root);`
	`7390`	`+#if defined(__BORLANDC__) && __BORLANDC__ <= 0x0670 // XE5`
	`7391`	`+ return const_cast<xml_node*>(&_wrap);`
	`7392`	`+#else`
`7382`	`7393`	`return &_wrap;`
	`7394`	`+#endif`
`7383`	`7395`	`}`
`7384`	`7396`
`7385`	`7397`	`PUGI_IMPL_FN xml_named_node_iterator& xml_named_node_iterator::operator++()`