On Fri, Dec 24, 2010 at 01:41:56PM +0000, Caolán McNamara <caol...@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. So looks like classes used by external C++ libraries need those guards as well. OK to push or you have a more elegant idea? :)
From af96261cd472e9bb0a496d76ff29e12d6e28a7cd Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmik...@frugalware.org>
Date: Sat, 25 Dec 2010 13:40:04 +0100
Subject: [PATCH] guard CppUnit::assertion_traits struct
---
starmath/qa/cppunit/test_nodetotextvisitors.cxx | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index 9fa5ec0..07f6c89 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -57,6 +57,7 @@
#include <visitors.hxx>
#include <cursor.hxx>
+#include "preextstl.h"
namespace CppUnit {
template<>
struct assertion_traits<String>
@@ -75,6 +76,7 @@ struct assertion_traits<String>
}
};
}
+#include "postextstl.h"
SO2_DECL_REF(SmDocShell)
SO2_IMPL_REF(SmDocShell)
--
1.7.3.4
pgpgAPhdUyydd.pgp
Description: PGP signature
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
