On Sat, 2010-12-25 at 13:43 +0100, Miklos Vajna wrote:
On Fri, Dec 24, 2010 at 01:41:56PM +0000, Caolán McNamara <caolanm@redhat.com> wrote:
Try now again, there was one cppunit header included outside those
guard. I've moved it inside the guards now. Does that now work ?
No, I get the same output. However, using the attached patch everything
is OK.
If you change "std::" in that little section to "ext_std::" i.e. the
attached, does that work ?
If it does, go ahead and commit and push this, if it doesn't then go
ahead an push your own fix instead.
C.
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index 9fa5ec0..687f75b 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -66,9 +66,9 @@ struct assertion_traits<String>
return x == y;
}
- static std::string toString(const String& x)
+ static ext_std::string toString(const String& x)
{
- std::string text = ByteString(x, RTL_TEXTENCODING_UTF8).GetBuffer();
+ ext_std::string text = ByteString(x, RTL_TEXTENCODING_UTF8).GetBuffer();
OStringStream ost;
ost << text;
return ost.str();
Context
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.