diff options
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_linux_intel')
4 files changed, 16 insertions, 11 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx index 84c05578bf5b..3f91c558f1d0 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx @@ -359,7 +359,8 @@ extern "C" typedef void (*PrivateSnippetExecutor)(); int const codeSnippetSize = 16; -#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) +#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) || \ + defined(DRAGONFLY) namespace { PrivateSnippetExecutor returnsInRegister(typelib_TypeDescriptionReference * pReturnTypeRef) @@ -407,7 +408,8 @@ unsigned char * codeSnippet( break; case typelib_TypeClass_STRUCT: case typelib_TypeClass_EXCEPTION: -#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) +#if defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) || \ + defined(DRAGONFLY) exec = returnsInRegister(pReturnTypeRef); if (!exec) { diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx index 8013a8248bab..c6529ed4f627 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx @@ -32,8 +32,9 @@ #include <stdio.h> #include <string.h> #include <dlfcn.h> +#include <boost/unordered_map.hpp> + #include <cxxabi.h> -#include <hash_map> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> @@ -47,7 +48,6 @@ #include "share.hxx" - using namespace ::std; using namespace ::osl; using namespace ::rtl; @@ -103,7 +103,7 @@ static OUString toUNOname( char const * p ) SAL_THROW( () ) //================================================================================================== class RTTI { - typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk index 6e2b7529247f..beedf9dafa2a 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk +++ b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk @@ -39,9 +39,10 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- .IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXIgcc3" || \ - "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCOPENBSDIgcc3" || \ - "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3" || \ - "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCNETBSDIgcc3" + "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCOPENBSDIgcc3" || \ + "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3" || \ + "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCNETBSDIgcc3" || \ + "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCDRAGONFLYIgcc3" .IF "$(cppu_no_leak)" == "" CFLAGS += -DLEAK_STATIC_DATA diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx index de3e28ea8269..21febefad110 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_bridges.hxx" -#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) +#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY) #include <stdlib.h> #else #include <malloc.h> @@ -153,7 +153,8 @@ void callVirtualMethod( break; default: { -#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) +#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) || \ + defined(DRAGONFLY) sal_Int32 const nRetSize = pReturnTypeDescr->nSize; if (bSimpleReturn && nRetSize <= 8 && nRetSize > 0) { @@ -355,7 +356,8 @@ namespace x86 { if (bridges::cpp_uno::shared::isSimpleType( pTD )) return true; -#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) +#if defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) || \ + defined(MACOSX) || defined(DRAGONFLY) // Only structs of exactly 1, 2, 4, or 8 bytes are returned through // registers, see <http://developer.apple.com/documentation/DeveloperTools/ // Conceptual/LowLevelABI/Articles/IA32.html>: |