[Libreoffice-commits] .: Branch 'libreoffice-3-3' - bridges/source

David Tardon dtardon at kemper.freedesktop.org
Thu Feb 3 08:07:08 PST 2011


 bridges/source/cpp_uno/gcc3_linux_intel/except.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a5d54a8a2d254b49c5fffaa6b3d0c094b756e691
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 27 20:26:07 2011 +0000

    move cxxabi.h after stl headers to workaround gcc 4.6.0 and damn stlport
    
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index 8074489..d6f3ec1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -32,9 +32,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <dlfcn.h>
-#include <cxxabi.h>
 #include <hash_map>
 
+#include <cxxabi.h>
+
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
@@ -47,7 +48,6 @@
 
 #include "share.hxx"
 
-
 using namespace ::std;
 using namespace ::osl;
 using namespace ::rtl;


More information about the Libreoffice-commits mailing list