fix system-clucene/-boost build with gcc 4.4
Change-Id: I95d23e6728571b3f3a6421a05fec814f7c5d059c
This commit is contained in:
@@ -35,6 +35,12 @@ $(eval $(call gb_Library_add_defs,helplinker,\
|
||||
-DHELPLINKER_DLLIMPLEMENTATION \
|
||||
))
|
||||
|
||||
ifeq ($(HAVE_CXX0X),TRUE)
|
||||
$(eval $(call gb_Library_add_defs,helplinker,\
|
||||
-DHAVE_CXX0X \
|
||||
))
|
||||
endif
|
||||
|
||||
$(eval $(call gb_Library_use_libraries,helplinker,\
|
||||
sal \
|
||||
))
|
||||
|
@@ -30,6 +30,9 @@
|
||||
#define HELPCOMPILER_HXX
|
||||
|
||||
#include <string>
|
||||
#ifndef HAVE_CXX0X
|
||||
#define BOOST_NO_0X_HDR_TYPEINDEX
|
||||
#endif
|
||||
#include <boost/unordered_map.hpp>
|
||||
#include <vector>
|
||||
#include <list>
|
||||
|
@@ -33,6 +33,9 @@
|
||||
#include <functional>
|
||||
#include <typeinfo>
|
||||
|
||||
#ifndef HAVE_CXX0X
|
||||
#define BOOST_NO_0X_HDR_TYPEINDEX
|
||||
#endif
|
||||
#include "boost/unordered_set.hpp"
|
||||
#include "osl/diagnose.h"
|
||||
#include "osl/interlck.h"
|
||||
|
@@ -91,4 +91,10 @@ $(eval $(call gb_Library_add_exception_objects,ucpchelp1,\
|
||||
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:
|
||||
|
@@ -31,6 +31,9 @@
|
||||
|
||||
#include <set>
|
||||
#include <vector>
|
||||
#ifndef HAVE_CXX0X
|
||||
#define BOOST_NO_0X_HDR_TYPEINDEX
|
||||
#endif
|
||||
#include <boost/unordered_map.hpp>
|
||||
#include <boost/unordered_set.hpp>
|
||||
#include <osl/mutex.hxx>
|
||||
|
@@ -36,6 +36,9 @@
|
||||
|
||||
#include "com/sun/star/ucb/XSimpleFileAccess2.hpp"
|
||||
|
||||
#ifndef HAVE_CXX0X
|
||||
#define BOOST_NO_0X_HDR_TYPEINDEX
|
||||
#endif
|
||||
#include <boost/unordered_map.hpp>
|
||||
#include <rtl/string.hxx>
|
||||
|
||||
|
Reference in New Issue
Block a user