external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1 | 127
++++++++++
1 file changed, 127 insertions(+)
New commits:
commit 36a1484f72e4da7211349d20f9b3c78e311df9f6
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Jan 6 19:42:08 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Jan 6 21:52:26 2024 +0100
cid#1546421 COPY_INSTEAD_OF_MOVE
Change-Id: Ifab2f2f5ec8c7f41cd705e0fb07d1273a34b879d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161724
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
b/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
index 2ca04d5ebb6e..742dce907bcc 100644
--- a/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
+++ b/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
@@ -44,6 +44,65 @@ index 585c3da..be02385 100644
, m_content()
, m_attributes()
, m_elements()
+@@ -74,15 +74,15 @@ XmlElement::setContent( int numericContent )
+
+
+ void
+-XmlElement::addAttribute( std::string attributeName,
+- std::string value )
++XmlElement::addAttribute( const std::string& attributeName,
++ const std::string& value )
+ {
+ m_attributes.push_back( Attribute( attributeName, value ) );
+ }
+
+
+ void
+-XmlElement::addAttribute( std::string attributeName,
++XmlElement::addAttribute( const std::string& attributeName,
+ int numericValue )
+ {
+ addAttribute( attributeName, StringTools::toString( numericValue ) );
+@@ -194,7 +194,7 @@ XmlElement::attributesAsString() const
+
+
+ std::string
+-XmlElement::escape( std::string value ) const
++XmlElement::escape( const std::string& value ) const
+ {
+ std::string escaped;
+ for ( unsigned int index =0; index < value.length(); ++index )
+diff --git a/include/cppunit/tools/XmlElement.h
b/include/cppunit/tools/XmlElement.h
+index 3478a35..d033aa2 100644
+--- a/include/cppunit/tools/XmlElement.h
++++ b/include/cppunit/tools/XmlElement.h
+@@ -79,14 +79,14 @@ public:
+ * \param attributeName Name of the attribute. Must not be an empty.
+ * \param value Value of the attribute.
+ */
+- void addAttribute( std::string attributeName,
+- std::string value );
++ void addAttribute( const std::string& attributeName,
++ const std::string& value );
+
+ /*! rief Adds an attribute with the specified numeric value.
+ * \param attributeName Name of the attribute. Must not be empty.
+ * \param numericValue Numeric value of the attribute.
+ */
+- void addAttribute( std::string attributeName,
++ void addAttribute( const std::string& attributeName,
+ int numericValue );
+
+ /*! rief Adds a child element to the element.
+@@ -125,7 +125,7 @@ private:
+ typedef std::pair<std::string,std::string> Attribute;
+
+ std::string attributesAsString() const;
+- std::string escape( std::string value ) const;
++ std::string escape( const std::string& value ) const;
+
+ private:
+ std::string m_name;
diff --git a/include/cppunit/Asserter.h b/include/cppunit/Asserter.h
index ca65593..2010739 100644
--- a/include/cppunit/Asserter.h
commit a8b20ca2fe7054e699cf0ff48889e54cee4dd4fd
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Jan 6 19:27:23 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Jan 6 21:52:18 2024 +0100
cid#1545475 COPY_INSTEAD_OF_MOVE
and
cid#1545626 COPY_INSTEAD_OF_MOVE
cid#1546203 COPY_INSTEAD_OF_MOVE
Change-Id: I98a6c36e77fe633d50fdb1a0f063b2656f852a2a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161718
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
b/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
index 640d04ad5684..2ca04d5ebb6e 100644
--- a/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
+++ b/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
@@ -44,5 +44,73 @@ index 585c3da..be02385 100644
, m_content()
, m_attributes()
, m_elements()
+diff --git a/include/cppunit/Asserter.h b/include/cppunit/Asserter.h
+index ca65593..2010739 100644
+--- a/include/cppunit/Asserter.h
++++ b/include/cppunit/Asserter.h
+@@ -159,11 +159,11 @@
+ * what are the differences between the expected
and actual value.
+ * \param shortDescription Short description for the failure message.
+ */
+- [[noreturn]] static void CPPUNIT_API failNotEqual( std::string expected,
+- std::string actual,
++ [[noreturn]] static void CPPUNIT_API failNotEqual( const std::string&
expected,
++ const std::string& actual,
+ const SourceLine &sourceLine,
+ const AdditionalMessage
&additionalMessage = AdditionalMessage(),
+- std::string shortDescription =
"equality assertion failed" );
++ const std::string& shortDescription =
"equality assertion failed" );
+
+ /*! rief Throws an Exception with the specified message and location.
+ * \param expected Text describing the expected value.
+@@ -231,11 +231,11 @@
+ * \param shortDescription Short description for the failure message.
+ */
+ static void CPPUNIT_API failNotEqualIf( bool shouldFail,
+- std::string expected,
+- std::string actual,
++ const std::string& expected,
++ const std::string& actual,
+ const SourceLine &sourceLine,
+ const AdditionalMessage
&additionalMessage = AdditionalMessage(),
+- std::string shortDescription =
"equality assertion failed" );
++ const std::string& shortDescription
= "equality assertion failed" );
+
+ };
+
+diff --git a/src/cppunit/Asserter.cpp b/src/cppunit/Asserter.cpp
+index 52f8625..fe2097e 100644
+--- a/src/cppunit/Asserter.cpp
++++ b/src/cppunit/Asserter.cpp
+@@ -110,11 +110,11 @@
+
+
+ void
+-Asserter::failNotEqual( std::string expected,
+- std::string actual,
++Asserter::failNotEqual( const std::string& expected,
++ const std::string& actual,
+ const SourceLine &sourceLine,
+ const AdditionalMessage &additionalMessage,
+- std::string shortDescription )
++ const std::string& shortDescription )
+ {
+ fail( makeMessage( makeExpectedEqual(expected),
+ makeActual(actual),
+@@ -182,11 +182,11 @@
+ }
+ void
+ Asserter::failNotEqualIf( bool shouldFail,
+- std::string expected,
+- std::string actual,
++ const std::string& expected,
++ const std::string& actual,
+ const SourceLine &sourceLine,
+ const AdditionalMessage &additionalMessage,
+- std::string shortDescription )
++ const std::string& shortDescription )
+ {
+ if ( shouldFail )
+ failNotEqual( expected, actual, sourceLine, additionalMessage,
shortDescription );
--
2.43.0
