mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix system-clucene/-boost build with gcc 4.4

Browse Source 
Change-Id: I95d23e6728571b3f3a6421a05fec814f7c5d059c
This commit is contained in:
Rene Engelhard
2012-09-19 20:44:03 +02:00
parent e989d16748
commit ed5c2c95b7
6 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
helpcompiler/Library_helplinker.mk
View File

@@ -35,6 +35,12 @@ $(eval $(call gb_Library_add_defs,helplinker,\
-DHELPLINKER_DLLIMPLEMENTATION \ -DHELPLINKER_DLLIMPLEMENTATION \
)) ))
ifeq ($(HAVE_CXX0X),TRUE)
$(eval $(call gb_Library_add_defs,helplinker,\
-DHAVE_CXX0X \
))
endif
$(eval $(call gb_Library_use_libraries,helplinker,\ $(eval $(call gb_Library_use_libraries,helplinker,\
sal \ sal \
)) ))

3
helpcompiler/inc/HelpCompiler.hxx
View File

@@ -30,6 +30,9 @@
#define HELPCOMPILER_HXX #define HELPCOMPILER_HXX
#include <string> #include <string>
#ifndef HAVE_CXX0X
#define BOOST_NO_0X_HDR_TYPEINDEX
#endif
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
#include <vector> #include <vector>
#include <list> #include <list>

3
sal/inc/osl/diagnose.hxx
View File

@@ -33,6 +33,9 @@
#include <functional> #include <functional>
#include <typeinfo> #include <typeinfo>
#ifndef HAVE_CXX0X
#define BOOST_NO_0X_HDR_TYPEINDEX
#endif
#include "boost/unordered_set.hpp" #include "boost/unordered_set.hpp"
#include "osl/diagnose.h" #include "osl/diagnose.h"
#include "osl/interlck.h" #include "osl/interlck.h"

6
xmlhelp/Library_ucpchelp1.mk
View File

@@ -91,4 +91,10 @@ $(eval $(call gb_Library_add_exception_objects,ucpchelp1,\
xmlhelp/source/cxxhelp/util/Decompressor \ xmlhelp/source/cxxhelp/util/Decompressor \
)) ))
ifeq ($(HAVE_CXX0X),TRUE)
$(eval $(call gb_Library_add_defs,ucpchelp1,\
-DHAVE_CXX0X \
))
endif
# vim: set shiftwidth=4 tabstop=4 noexpandtab: # vim: set shiftwidth=4 tabstop=4 noexpandtab:

3
xmlhelp/source/cxxhelp/provider/databases.hxx
View File

@@ -31,6 +31,9 @@
#include <set> #include <set>
#include <vector> #include <vector>
#ifndef HAVE_CXX0X
#define BOOST_NO_0X_HDR_TYPEINDEX
#endif
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
#include <boost/unordered_set.hpp> #include <boost/unordered_set.hpp>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>

3
xmlhelp/source/cxxhelp/provider/db.hxx
View File

@@ -36,6 +36,9 @@
#include "com/sun/star/ucb/XSimpleFileAccess2.hpp" #include "com/sun/star/ucb/XSimpleFileAccess2.hpp"
#ifndef HAVE_CXX0X
#define BOOST_NO_0X_HDR_TYPEINDEX
#endif
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
#include <rtl/string.hxx> #include <rtl/string.hxx>