[Libreoffice-commits] core.git: bridges/inc bridges/source

2023-02-01 Thread Noel Grandin (via logerrit) 
 bridges/inc/msvc/except.hxx   |3 ++-
 bridges/source/cpp_uno/msvc_shared/except.cxx |4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 7c035ff67993707cfd09c575a97028dab9683557
Author: Noel Grandin 
AuthorDate: Wed Feb 1 15:54:20 2023 +0200
Commit: Noel Grandin 
CommitDate: Wed Feb 1 17:09:12 2023 +

osl::Mutex->std::mutex in ExceptionInfos

Change-Id: Ic947b58b9aba121c605b6795c7cd9aa0b16b180e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146455
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/bridges/inc/msvc/except.hxx b/bridges/inc/msvc/except.hxx
index 798fc44f147c..f1403a43af88 100644
--- a/bridges/inc/msvc/except.hxx
+++ b/bridges/inc/msvc/except.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 
+#include 
 #include 
 
 typedef struct _uno_Any uno_Any;
@@ -101,7 +102,7 @@ public:
 
 class ExceptionInfos final
 {
-osl::Mutex m_aMutex;
+std::mutex m_aMutex;
 t_string2PtrMap m_allRaiseInfos;
 
 public:
diff --git a/bridges/source/cpp_uno/msvc_shared/except.cxx 
b/bridges/source/cpp_uno/msvc_shared/except.cxx
index 283baa75173c..f76533fa160e 100644
--- a/bridges/source/cpp_uno/msvc_shared/except.cxx
+++ b/bridges/source/cpp_uno/msvc_shared/except.cxx
@@ -131,7 +131,7 @@ ExceptionInfos::~ExceptionInfos() noexcept
 {
 SAL_INFO("bridges", "> freeing exception infos... <");
 
-osl::MutexGuard aGuard(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
 for (auto& rEntry : m_allRaiseInfos)
 delete static_cast(rEntry.second);
 }
@@ -154,7 +154,7 @@ RaiseInfo* 
ExceptionInfos::getRaiseInfo(typelib_TypeDescription* pTD) noexcept
 RaiseInfo* pRaiseInfo;
 
 OUString const& rTypeName = OUString::unacquired(>pTypeName);
-osl::MutexGuard aGuard(s_pInfos->m_aMutex);
+std::unique_lock aGuard(s_pInfos->m_aMutex);
 t_string2PtrMap::const_iterator const 
iFind(s_pInfos->m_allRaiseInfos.find(rTypeName));
 if (iFind != s_pInfos->m_allRaiseInfos.end())
 pRaiseInfo = static_cast(iFind->second);

[Libreoffice-commits] core.git: bridges/inc bridges/source

2021-07-18 Thread Noel Grandin (via logerrit) 
 bridges/inc/vtablefactory.hxx   |4 ++--
 bridges/source/cpp_uno/shared/vtablefactory.cxx |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4ab57949a2cbaacba33375ea33dc896205eac6c9
Author: Noel Grandin 
AuthorDate: Sun Jul 18 14:25:02 2021 +0200
Commit: Noel Grandin 
CommitDate: Sun Jul 18 20:46:47 2021 +0200

osl::Mutex->std::mutex in VtableFactory

Change-Id: Ie973ef2923c1c725ee74ebd1eacf671a5bfb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119139
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/bridges/inc/vtablefactory.hxx b/bridges/inc/vtablefactory.hxx
index c169f7c0bfd0..9afcb837099d 100644
--- a/bridges/inc/vtablefactory.hxx
+++ b/bridges/inc/vtablefactory.hxx
@@ -19,13 +19,13 @@
 
 #pragma once
 
-#include 
 #include 
 #include 
 #include 
 #include 
 
 #include 
+#include 
 #include 
 
 /*See: http://people.redhat.com/drepper/selinux-mem.html*/
@@ -210,7 +210,7 @@ private:
 
 typedef std::unordered_map< OUString, Vtables > Map;
 
-osl::Mutex m_mutex;
+std::mutex m_mutex;
 Map m_map;
 
 rtl_arena_type * m_arena;
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx 
b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 9d4c5d31dd3f..a74d75ed1f28 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -214,7 +214,7 @@ VtableFactory::VtableFactory(): m_arena(
 
 VtableFactory::~VtableFactory() {
 {
-osl::MutexGuard guard(m_mutex);
+std::lock_guard guard(m_mutex);
 for (const auto& rEntry : m_map) {
 for (sal_Int32 j = 0; j < rEntry.second.count; ++j) {
 freeBlock(rEntry.second.blocks[j]);
@@ -228,7 +228,7 @@ const VtableFactory::Vtables& VtableFactory::getVtables(
 typelib_InterfaceTypeDescription * type)
 {
 OUString name(type->aBase.pTypeName);
-osl::MutexGuard guard(m_mutex);
+std::lock_guard guard(m_mutex);
 Map::iterator i(m_map.find(name));
 if (i == m_map.end()) {
 GuardedBlocks blocks(*this);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/inc bridges/source connectivity/source extensions/source include/cppuhelper shell/source

2021-05-19 Thread Stephan Bergmann (via logerrit) 
 bridges/inc/msvc/amd64.hxx |4 +-
 bridges/inc/msvc/except.hxx|   18 
+-
 bridges/source/cpp_uno/msvc_shared/except.cxx  |   18 
+-
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx|   13 
+++
 bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx   |2 -
 connectivity/source/drivers/ado/ACallableStatement.cxx |4 +-
 connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx |4 +-
 connectivity/source/drivers/ado/APreparedStatement.cxx |4 +-
 connectivity/source/drivers/ado/AResultSet.cxx |4 +-
 connectivity/source/drivers/ado/AStatement.cxx |8 ++--
 connectivity/source/inc/ado/ACallableStatement.hxx |4 +-
 connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx |4 +-
 connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx |2 -
 connectivity/source/inc/ado/APreparedStatement.hxx |4 +-
 connectivity/source/inc/ado/AResultSet.hxx |4 +-
 connectivity/source/inc/ado/AStatement.hxx |8 ++--
 extensions/source/ole/windata.hxx  |6 +--
 include/cppuhelper/compbase1.hxx   |   18 
+-
 include/cppuhelper/compbase10.hxx  |   18 
+-
 include/cppuhelper/compbase11.hxx  |   18 
+-
 include/cppuhelper/implbase11.hxx  |   18 
+-
 shell/source/win32/zipfile/zipexcptn.cxx   |8 ++--
 shell/source/win32/zipfile/zipexcptn.hxx   |8 ++--
 23 files changed, 100 insertions(+), 99 deletions(-)

New commits:
commit 4bea7449711f1832c1db0e9b5447fb2c3415c068
Author: Stephan Bergmann 
AuthorDate: Tue May 18 14:39:37 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed May 19 08:53:34 2021 +0200

loplugin:noexcept (clang-cl)

Change-Id: Ife669f959358992b547b408ab5d1f6bf1c1d14bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115744
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/bridges/inc/msvc/amd64.hxx b/bridges/inc/msvc/amd64.hxx
index fb095446b097..eea88ea96f2f 100644
--- a/bridges/inc/msvc/amd64.hxx
+++ b/bridges/inc/msvc/amd64.hxx
@@ -33,7 +33,7 @@ struct ExceptionType final
 ExceptionTypeInfo exc_type_info;
 
 explicit ExceptionType(unsigned char* pCode, sal_uInt64 pCodeBase,
-   typelib_TypeDescription* pTD) throw();
+   typelib_TypeDescription* pTD) noexcept;
 
 ExceptionType(const ExceptionType&) = delete;
 ExceptionType& operator=(const ExceptionType&) = delete;
@@ -51,7 +51,7 @@ struct RaiseInfo final
 unsigned char* _code;
 sal_uInt64 _codeBase;
 
-explicit RaiseInfo(typelib_TypeDescription* pTD) throw();
+explicit RaiseInfo(typelib_TypeDescription* pTD) noexcept;
 };
 
 #pragma pack(pop)
diff --git a/bridges/inc/msvc/except.hxx b/bridges/inc/msvc/except.hxx
index aba0ce46248e..798fc44f147c 100644
--- a/bridges/inc/msvc/except.hxx
+++ b/bridges/inc/msvc/except.hxx
@@ -61,12 +61,12 @@ class ExceptionTypeInfo final
 char m_d_name[1];
 
 public:
-explicit ExceptionTypeInfo(void* data, const char* d_name) throw()
+explicit ExceptionTypeInfo(void* data, const char* d_name) noexcept
 : m_data(data)
 {
 ::strcpy(m_d_name, d_name); // #100211# - checked
 }
-virtual ~ExceptionTypeInfo() throw();
+virtual ~ExceptionTypeInfo() noexcept;
 };
 
 class ExceptionTypeInfoWrapper final
@@ -75,7 +75,7 @@ class ExceptionTypeInfoWrapper final
 ExceptionTypeInfo info;
 
 public:
-explicit ExceptionTypeInfoWrapper(void* m_data, const char* m_d_name) 
throw()
+explicit ExceptionTypeInfoWrapper(void* m_data, const char* m_d_name) 
noexcept
 : info(m_data, m_d_name)
 {
 type_info_size = sizeof(ExceptionTypeInfo) + strlen(m_d_name);
@@ -90,13 +90,13 @@ class RTTInfos final
 osl::Mutex m_aMutex;
 t_string2PtrMap m_allRTTI;
 
-RTTInfos() throw();
-ExceptionTypeInfoWrapper* getInfo(OUString const& rUNOname) throw();
+RTTInfos() noexcept;
+ExceptionTypeInfoWrapper* getInfo(OUString const& rUNOname) noexcept;
 
 public:
 ~RTTInfos();
 
-static type_info* get(OUString const& rUNOname, int* len = nullptr) 
throw();
+static type_info* get(OUString const& rUNOname, int* len = nullptr) 
noexcept;
 };
 
 class ExceptionInfos final
@@ -105,12 +105,12 @@ class ExceptionInfos final
 t_string2PtrMap m_allRaiseInfos;
 
 public:
-static RaiseInfo* getRaiseInfo(typelib_TypeDescription* pTD) throw();
+static RaiseInfo* getRaiseInfo(typelib_TypeDescription* pTD) noexcept;
 
 static DWORD

[Libreoffice-commits] core.git: bridges/inc bridges/source

2020-09-04 Thread George Bateman (via logerrit) 
 bridges/inc/bridge.hxx|5 +
 bridges/inc/cppinterfaceproxy.hxx |5 +
 bridges/inc/except.hxx|5 +
 bridges/inc/types.hxx |5 +
 bridges/inc/unointerfaceproxy.hxx |5 +
 bridges/inc/vtablefactory.hxx |5 +
 bridges/inc/vtables.hxx   |5 +
 bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx |4 +---
 bridges/source/cpp_uno/gcc3_ios/share.hxx |4 +---
 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx |5 +
 bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.hxx |5 +
 bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx |4 +---
 bridges/source/cpp_uno/gcc3_linux_arm/share.hxx   |5 +
 bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx  |4 +---
 bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx  |4 +---
 bridges/source/cpp_uno/gcc3_linux_intel/call.hxx  |5 +
 bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx |5 +
 bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx  |4 +---
 bridges/source/cpp_uno/gcc3_linux_mips/share.hxx  |4 +---
 bridges/source/cpp_uno/gcc3_linux_mips64/call.hxx |5 +
 bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx|4 +---
 bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx   |4 +---
 bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx |4 +---
 bridges/source/cpp_uno/gcc3_linux_s390/share.hxx  |4 +---
 bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx |4 +---
 bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx |4 +---
 bridges/source/cpp_uno/gcc3_linux_sparc64/share.hxx   |4 +---
 bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx  |5 +
 bridges/source/cpp_uno/gcc3_linux_x86-64/call.hxx |5 +
 bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx|5 +
 bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.hxx |5 +
 bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx |5 +
 bridges/source/cpp_uno/gcc3_macosx_x86-64/call.hxx|5 +
 bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx   |5 +
 bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx   |4 +---
 bridges/source/cpp_uno/gcc3_solaris_intel/callvirtualmethod.hxx   |5 +
 bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx   |4 +---
 bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx   |4 +---
 bridges/source/cpp_uno/msvc_win32_intel/msci.hxx  |4 +---
 bridges/source/cpp_uno/msvc_win32_x86-64/call.hxx |5 +
 bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx |4 +---
 bridges/source/jni_uno/jni_base.h |5 +
 bridges/source/jni_uno/jni_bridge.h   |5 +
 bridges/source/jni_uno/jni_helper.h   |5 +
 bridges/source/jni_uno/jni_info.h |5 +
 bridges/source/jni_uno/jniunoenvironmentdata.hxx  |5 +
 46 files changed, 46 insertions(+), 165 deletions(-)

New commits:
commit 505795db3fa8cd5bb9868ff99f9a8cdf268f4c0b
Author: George Bateman 
AuthorDate: Tue Aug 4 21:15:24 2020 +
Commit: Julien Nabet 
CommitDate: Fri Sep 4 09:00:08 2020 +0200

tdf#124176 Use #pragma once in bridges

This commit was carried out by a Python script, source of which
is at https://bugs.documentfoundation.org/show_bug.cgi?id=124176#c97.

Change-Id: Icadf43a74e4ba99e587a1e6287adf8d65f819ca1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100144
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/bridges/inc/bridge.hxx b/bridges/inc/bridge.hxx
index 5229c1d4ad5f..0a6da78859ca 100644
--- a/bridges/inc/bridge.hxx
+++ b/bridges/inc/bridge.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BRIDGES_INC_BRIDGE_HXX
-#define INCLUDED_BRIDGES_INC_BRIDGE_HXX
+#pragma once
 
 #include 
 
@@ -114,6 +113,4 @@ private:
 
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/inc/cppinterfaceproxy.hxx 
b/bridges/inc/cppinterfaceproxy.hxx
index 145886436313..73175d842df1 100644
--- a/bridges/inc/cppinterfaceproxy.hxx
+++ b/bridges/inc/cppinterfaceproxy.hxx
@@ -17,8 +17,7 @@
  *   the License at

[Libreoffice-commits] core.git: bridges/inc bridges/source comphelper/source connectivity/source embeddedobj/source embedserv/source extensions/source filter/source hwpfilter/source include/editeng in

2019-10-17 Thread Mike Kaganski (via logerrit) 
 bridges/inc/cppinterfaceproxy.hxx |2 
 bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx   |1 
 comphelper/source/misc/docpasswordhelper.cxx  |6 --
 comphelper/source/misc/syntaxhighlight.cxx|4 -
 connectivity/source/drivers/dbase/DIndex.cxx  |1 
 connectivity/source/drivers/dbase/DTable.cxx  |5 -
 connectivity/source/drivers/dbase/dindexnode.cxx  |6 --
 connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx   |7 --
 connectivity/source/drivers/odbc/OConnection.cxx  |6 --
 connectivity/source/inc/dbase/DIndex.hxx  |2 
 connectivity/source/inc/dbase/DTable.hxx  |2 
 embeddedobj/source/msole/xdialogcreator.cxx   |4 -
 embedserv/source/embed/docholder.cxx  |9 
+--
 extensions/source/ole/windata.hxx |2 
 filter/source/msfilter/mscodec.cxx|   12 

 filter/source/msfilter/svdfppt.cxx|3 -
 hwpfilter/source/hbox.cxx |1 
 hwpfilter/source/hbox.h   |   11 
+--
 hwpfilter/source/hinfo.cxx|3 -
 hwpfilter/source/hinfo.h  |   24 
+++-
 hwpfilter/source/hwpread.cxx  |3 -
 include/editeng/numitem.hxx   |   12 
+---
 include/filter/msfilter/mscodec.hxx   |   14 
++--
 include/filter/msfilter/svdfppt.hxx   |6 +-
 include/tools/globname.hxx|4 -
 jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx  |2 
 jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx  |2 
 lotuswordpro/source/filter/lwpgrfobj.cxx  |2 
 lotuswordpro/source/filter/lwpgrfobj.hxx  |4 -
 lotuswordpro/source/filter/lwpsdwdrawheader.hxx   |   16 
+
 lotuswordpro/source/filter/xfilter/xfcolor.cxx|4 -
 oox/source/crypto/CryptTools.cxx  |6 --
 oox/source/export/vmlexport.cxx   |3 -
 opencl/source/openclwrapper.cxx   |3 -
 sal/osl/w32/file.cxx  |4 -
 sal/osl/w32/file_dirvol.cxx   |3 -
 sal/osl/w32/pipe.cxx  |9 
+--
 sal/osl/w32/procimpl.cxx  |4 -
 sal/osl/w32/profile.cxx   |4 -
 sc/source/filter/excel/xeroot.cxx |3 -
 sc/source/filter/inc/qprostyle.hxx|   10 
+--
 sc/source/filter/qpro/qprostyle.cxx   |8 --
 sd/source/ui/remotecontrol/BluetoothServer.cxx|6 --
 sd/source/ui/remotecontrol/DiscoveryService.cxx   |6 --
 sdext/source/pdfimport/pdfparse/pdfentries.cxx|   15 
+
 sfx2/source/appl/shutdowniconw32.cxx  |   12 
+---
 shell/source/win32/shlxthandler/ooofilt/propspec.cxx  |1 
 shell/source/win32/shlxthandler/ooofilt/propspec.hxx  |2 
 shell/source/win32/spsupp/COMOpenDocuments.cxx|3 -
 shell/source/win32/spsupp/spsuppHelper.cxx|3 -
 sot/source/sdstor/stgelem.cxx |4 -
 sot/source/sdstor/stgelem.hxx |8 +-
 sot/source/sdstor/stgole.cxx  |2 
 sot/source/sdstor/stgole.hxx  |4 -
 store/source/storcach.cxx |1 
 store/source/storcach.hxx |2 
 store/source/stordata.hxx |   10 
+--
 svl/source/crypto/cryptosign.cxx  |   11 
+--
 svx/source/dialog/imapwnd.cxx |1 
 svx/source/dialog/imapwnd.hxx |2 
 sw/inc/tblafmt.hxx|2 
 sw/source/core/doc/tblafmt.cxx|

[Libreoffice-commits] core.git: bridges/inc bridges/source

2019-09-05 Thread Noel Grandin (via logerrit) 
 bridges/inc/vtablefactory.hxx   |7 ---
 bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx |8 
 bridges/source/cpp_uno/shared/vtablefactory.cxx |   10 +++---
 3 files changed, 11 insertions(+), 14 deletions(-)

New commits:
commit ec56174b0c83411b762b0992565e58c1ec4fc3f3
Author: Noel Grandin 
AuthorDate: Thu Sep 5 14:52:13 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 5 17:00:14 2019 +0200

loplugin:useuniqueptr in VtableFactory

Change-Id: I122b6749f148abb48f646bfcd32ef86e2f5fa553
Reviewed-on: https://gerrit.libreoffice.org/78651
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/bridges/inc/vtablefactory.hxx b/bridges/inc/vtablefactory.hxx
index 6978e3c670b5..369ea0b903bf 100644
--- a/bridges/inc/vtablefactory.hxx
+++ b/bridges/inc/vtablefactory.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 
+#include 
 #include 
 
 /*See: http://people.redhat.com/drepper/selinux-mem.html*/
@@ -92,10 +93,10 @@ public:
 mapBlockToVtable).  Also, the block contains any generated code
 snippets, after the vtable itself.
  */
-Block * blocks;
+std::unique_ptr blocks;
+
 Vtables()
 : count(0)
-, blocks(nullptr)
 {
 }
 };
@@ -107,7 +108,7 @@ public:
 /** Given an interface type description, return its corresponding vtable
 structure.
  */
-Vtables getVtables(typelib_InterfaceTypeDescription * type);
+const Vtables& getVtables(typelib_InterfaceTypeDescription * type);
 
 // This function is not defined in the generic part, but instead has to be
 // defined individually for each CPP--UNO bridge:
diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx 
b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
index 39afb083b9bd..bb5f268179a7 100644
--- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
@@ -100,18 +100,18 @@ com::sun::star::uno::XInterface * 
CppInterfaceProxy::create(
 {
 typelib_typedescription_complete(
 reinterpret_cast< typelib_TypeDescription ** >());
-bridges::cpp_uno::shared::VtableFactory::Vtables aVtables(
+const bridges::cpp_uno::shared::VtableFactory::Vtables& rVtables(
 getVtableFactory()->getVtables(pTypeDescr));
 std::unique_ptr< char[] > pMemory(
 new char[
 sizeof (CppInterfaceProxy)
-+ (aVtables.count - 1) * sizeof (void **)]);
++ (rVtables.count - 1) * sizeof (void **)]);
 new(pMemory.get()) CppInterfaceProxy(pBridge, pUnoI, pTypeDescr, rOId);
 CppInterfaceProxy * pProxy = reinterpret_cast< CppInterfaceProxy * >(
 pMemory.release());
-for (sal_Int32 i = 0; i < aVtables.count; ++i) {
+for (sal_Int32 i = 0; i < rVtables.count; ++i) {
 pProxy->vtables[i] = VtableFactory::mapBlockToVtable(
-aVtables.blocks[i].start);
+rVtables.blocks[i].start);
 }
 return castProxyToInterface(pProxy);
 }
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx 
b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index c71ae52ae14e..70187cbd2fe7 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -186,13 +186,12 @@ VtableFactory::~VtableFactory() {
 for (sal_Int32 j = 0; j < rEntry.second.count; ++j) {
 freeBlock(rEntry.second.blocks[j]);
 }
-delete[] rEntry.second.blocks;
 }
 }
 rtl_arena_destroy(m_arena);
 }
 
-VtableFactory::Vtables VtableFactory::getVtables(
+const VtableFactory::Vtables& VtableFactory::getVtables(
 typelib_InterfaceTypeDescription * type)
 {
 OUString name(type->aBase.pTypeName);
@@ -204,14 +203,11 @@ VtableFactory::Vtables VtableFactory::getVtables(
 Vtables vtables;
 assert(blocks.size() <= SAL_MAX_INT32);
 vtables.count = static_cast< sal_Int32 >(blocks.size());
-std::unique_ptr< Block[] > guardedBlocks(
-new Block[vtables.count]);
-vtables.blocks = guardedBlocks.get();
+vtables.blocks.reset(new Block[vtables.count]);
 for (sal_Int32 j = 0; j < vtables.count; ++j) {
 vtables.blocks[j] = blocks[j];
 }
-i = m_map.emplace(name, vtables).first;
-guardedBlocks.release();
+i = m_map.emplace(name, std::move(vtables)).first;
 blocks.unguard();
 }
 return i->second;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/inc bridges/source configure.ac desktop/Module_desktop.mk distro-configs/LibreOfficeHaiku.conf idlc/source include/osl include/sal sal/Library_sal.mk sal/osl sa

2018-03-05 Thread Kacper Kasper 
 bridges/inc/vtablefactory.hxx   |3 +-
 bridges/source/cpp_uno/shared/vtablefactory.cxx |2 -
 configure.ac|7 +++-
 desktop/Module_desktop.mk   |2 +
 distro-configs/LibreOfficeHaiku.conf|2 -
 idlc/source/idlccompile.cxx |2 -
 include/osl/endian.h|2 -
 include/sal/alloca.h|2 -
 include/sal/config.h|3 +-
 sal/Library_sal.mk  |5 ++-
 sal/osl/unx/file_error_transl.cxx   |2 +
 sal/osl/unx/system.cxx  |2 -
 sal/osl/unx/system.hxx  |   35 +++-
 sal/qa/osl/file/osl_File_Const.h|6 ++--
 solenv/bin/concat-deps.c|   13 
 solenv/gbuild/platform/HAIKU_INTEL_GCC.mk   |2 -
 solenv/gbuild/platform/HAIKU_X86_64_GCC.mk  |2 -
 solenv/gbuild/platform/haiku.mk |   19 +
 svl/Library_svl.mk  |2 -
 tools/source/stream/strmunx.cxx |2 -
 vcl/Executable_svpclient.mk |4 ++
 vcl/Library_vcl.mk  |   21 ++
 vcl/inc/headless/svpinst.hxx|1 
 vcl/source/opengl/OpenGLHelper.cxx  |6 ++--
 vcl/source/salmain/salmain.cxx  |4 +-
 25 files changed, 128 insertions(+), 23 deletions(-)

New commits:
commit 9c036b1d3db253a1fd43ce76ce1d919e2029af59
Author: Kacper Kasper 
Date:   Sun Feb 25 02:55:15 2018 +0100

Make LibreOffice buildable on Haiku.

* Obviously VCL wiring is missing, but most components do build.

Change-Id: Ie853ada1423a8f4c2b647be59cd47a7730c42978
Reviewed-on: https://gerrit.libreoffice.org/50293
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 

diff --git a/bridges/inc/vtablefactory.hxx b/bridges/inc/vtablefactory.hxx
index 991716b423e8..70c87c385952 100644
--- a/bridges/inc/vtablefactory.hxx
+++ b/bridges/inc/vtablefactory.hxx
@@ -30,7 +30,8 @@
 
 /*See: http://people.redhat.com/drepper/selinux-mem.html*/
 #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \
-|| defined(NETBSD) || defined(DRAGONFLY) || defined (ANDROID)
+|| defined(NETBSD) || defined(DRAGONFLY) || defined (ANDROID) \
+|| defined(HAIKU)
 #define USE_DOUBLE_MMAP
 #endif
 
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx 
b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 2c289ea58657..9e3a91fb0a93 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -63,7 +63,7 @@ extern "C" void * allocExec(
 {
 std::size_t pagesize;
 #if defined SAL_UNX
-#if defined FREEBSD || defined NETBSD || defined OPENBSD || defined DRAGONFLY
+#if defined FREEBSD || defined NETBSD || defined OPENBSD || defined DRAGONFLY 
|| defined HAIKU
 pagesize = getpagesize();
 #else
 pagesize = sysconf(_SC_PAGESIZE);
diff --git a/configure.ac b/configure.ac
index 59df9857b616..6eacbc878174 100644
--- a/configure.ac
+++ b/configure.ac
@@ -792,7 +792,6 @@ haiku*)
 test_randr=no
 test_xrender=no
 test_freetype=yes
-test_cairo=yes
 enable_java=no
 enable_opengl=no
 enable_odk=no
@@ -803,7 +802,7 @@ haiku*)
 enable_gltf=no
 enable_collada=no
 enable_coinmp=no
-enable_pdfimport=no
+enable_pdfium=no
 enable_postgresql_sdbc=no
 enable_firebird_sdbc=no
 _os=Haiku
@@ -4614,6 +4613,10 @@ if test "$USING_X11" != TRUE; then
 enable_cairo_canvas=no
 fi
 
+if test "$OS" = "HAIKU"; then
+enable_cairo_canvas=yes
+fi
+
 dnl ===
 dnl check for cups support
 dnl ===
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index e18b23126dff..878febd603fb 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -102,6 +102,8 @@ else ifeq ($(OS),ANDROID)
 
 else ifeq ($(OS),IOS)
 
+else ifeq ($(OS),HAIKU)
+
 else
 
 $(eval $(call gb_Module_add_targets,desktop,\
diff --git a/distro-configs/LibreOfficeHaiku.conf 
b/distro-configs/LibreOfficeHaiku.conf
index 6026c7fb5942..426d19a825f6 100644
--- a/distro-configs/LibreOfficeHaiku.conf
+++ b/distro-configs/LibreOfficeHaiku.conf
@@ -47,6 +47,7 @@
 --with-system-redland
 --with-system-libcmis
 --with-system-cairo
+--with-system-poppler
 --with-theme=breeze sifr
 --with-galleries=no
 --without-helppack-integration
@@ -62,5 +63,4 @@
 --disable-postgresql-sdbc
 --disable-lotuswordpro
 --disable-firebird-sdbc
---disable-cairo-canvas
 --enable-python=no
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index

[Libreoffice-commits] core.git: bridges/inc bridges/source

2017-08-28 Thread Stephan Bergmann 
 bridges/inc/bridge.hxx  |8 ++--
 bridges/inc/cppinterfaceproxy.hxx   |8 ++--
 bridges/inc/unointerfaceproxy.hxx   |8 ++--
 bridges/source/cpp_uno/shared/bridge.cxx|5 ++---
 bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx |5 ++---
 bridges/source/cpp_uno/shared/unointerfaceproxy.cxx |7 ++-
 bridges/source/jni_uno/jni_bridge.cxx   |4 ++--
 bridges/source/jni_uno/jni_bridge.h |8 ++--
 bridges/source/jni_uno/jni_uno2java.cxx |8 +---
 9 files changed, 37 insertions(+), 24 deletions(-)

New commits:
commit 4ecc6555878027f1cc0f853e1aa023f12167f96f
Author: Stephan Bergmann 
Date:   Mon Aug 28 15:47:32 2017 +0200

Replace use of oslInterlockedCount with std::atomic in bridges

Change-Id: Iad47a01fd283345a2461eaaea50633bf840e5201

diff --git a/bridges/inc/bridge.hxx b/bridges/inc/bridge.hxx
index 5e3b146217b0..a01bb42bc163 100644
--- a/bridges/inc/bridge.hxx
+++ b/bridges/inc/bridge.hxx
@@ -20,7 +20,11 @@
 #ifndef INCLUDED_BRIDGES_INC_BRIDGE_HXX
 #define INCLUDED_BRIDGES_INC_BRIDGE_HXX
 
-#include "osl/interlck.h"
+#include 
+
+#include 
+#include 
+
 #include "sal/types.h"
 #include "typelib/typedescription.h"
 #include "uno/environment.h"
@@ -90,7 +94,7 @@ private:
 Bridge * pBridge;
 };
 
-oslInterlockedCount nRef;
+std::atomic nRef;
 
 uno_ExtEnvironment * pCppEnv;
 uno_ExtEnvironment * pUnoEnv;
diff --git a/bridges/inc/cppinterfaceproxy.hxx 
b/bridges/inc/cppinterfaceproxy.hxx
index ccd83660059a..00972829a53c 100644
--- a/bridges/inc/cppinterfaceproxy.hxx
+++ b/bridges/inc/cppinterfaceproxy.hxx
@@ -20,7 +20,11 @@
 #ifndef INCLUDED_BRIDGES_INC_CPPINTERFACEPROXY_HXX
 #define INCLUDED_BRIDGES_INC_CPPINTERFACEPROXY_HXX
 
-#include "osl/interlck.h"
+#include 
+
+#include 
+#include 
+
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 #include "typelib/typedescription.h"
@@ -84,7 +88,7 @@ private:
 static com::sun::star::uno::XInterface * castProxyToInterface(
 CppInterfaceProxy * pProxy);
 
-oslInterlockedCount nRef;
+std::atomic nRef;
 Bridge * pBridge;
 
 // mapping information
diff --git a/bridges/inc/unointerfaceproxy.hxx 
b/bridges/inc/unointerfaceproxy.hxx
index c9697d3491a8..c76b62dd28b0 100644
--- a/bridges/inc/unointerfaceproxy.hxx
+++ b/bridges/inc/unointerfaceproxy.hxx
@@ -20,7 +20,11 @@
 #ifndef INCLUDED_BRIDGES_INC_UNOINTERFACEPROXY_HXX
 #define INCLUDED_BRIDGES_INC_UNOINTERFACEPROXY_HXX
 
-#include "osl/interlck.h"
+#include 
+
+#include 
+#include 
+
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 #include "typelib/typedescription.h"
@@ -83,7 +87,7 @@ private:
 
 ~UnoInterfaceProxy();
 
-oslInterlockedCount nRef;
+std::atomic nRef;
 Bridge * pBridge;
 
 // mapping information
diff --git a/bridges/source/cpp_uno/shared/bridge.cxx 
b/bridges/source/cpp_uno/shared/bridge.cxx
index f752c626d253..805e56968482 100644
--- a/bridges/source/cpp_uno/shared/bridge.cxx
+++ b/bridges/source/cpp_uno/shared/bridge.cxx
@@ -24,7 +24,6 @@
 #include "unointerfaceproxy.hxx"
 
 #include "com/sun/star/uno/XInterface.hpp"
-#include "osl/interlck.h"
 #include "rtl/ustring.h"
 #include "sal/types.h"
 #include "typelib/typedescription.h"
@@ -151,7 +150,7 @@ uno_Mapping * Bridge::createMapping(
 
 void Bridge::acquire()
 {
-if (osl_atomic_increment(  ) == 1)
+if (++nRef == 1)
 {
 if (bExportCpp2Uno)
 {
@@ -172,7 +171,7 @@ void Bridge::acquire()
 
 void Bridge::release()
 {
-if (! osl_atomic_decrement(  ))
+if (! --nRef )
 {
 ::uno_revokeMapping( bExportCpp2Uno ?  :  );
 }
diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx 
b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
index 3fe7d98ea452..4a87eb389146 100644
--- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
@@ -26,7 +26,6 @@
 
 #include "com/sun/star/uno/XInterface.hpp"
 #include "osl/getglobalmutex.hxx"
-#include "osl/interlck.h"
 #include "osl/mutex.hxx"
 #include "rtl/instance.hxx"
 #include "typelib/typedescription.h"
@@ -120,7 +119,7 @@ com::sun::star::uno::XInterface * CppInterfaceProxy::create(
 
 void CppInterfaceProxy::acquireProxy()
 {
-if (osl_atomic_increment(  ) == 1)
+if (++nRef == 1)
 {
 // rebirth of proxy zombie
 // register at cpp env
@@ -134,7 +133,7 @@ void CppInterfaceProxy::acquireProxy()
 
 void CppInterfaceProxy::releaseProxy()
 {
-if (! osl_atomic_decrement(  )) // last release
+if (! --nRef ) // last release
 {
 // revoke from cpp env
 (*pBridge->getCppEnv()->revokeInterface)(
diff --git a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx 
b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
index 698624ea49b0..b2c608403f34 100644
---

[Libreoffice-commits] core.git: bridges/inc bridges/source

2017-03-03 Thread David Ostrovsky 
 bridges/inc/except.hxx  |2 --
 bridges/source/cpp_uno/msvc_win32_intel/except.cxx  |   16 +---
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx |   16 +---
 3 files changed, 2 insertions(+), 32 deletions(-)

New commits:
commit 1d4f1eae902fa115b1d7ef818a75dcdcdb9c8a65
Author: David Ostrovsky 
Date:   Sun Mar 13 23:21:57 2016 +0100

UNO bridges: Remove MSVC 2013 legacy code

Change-Id: Ia6f59f825ead50f92ed7a343df0c01f34ce5c6f8
Reviewed-on: https://gerrit.libreoffice.org/23199
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/bridges/inc/except.hxx b/bridges/inc/except.hxx
index f1437f3..4b90ee1 100644
--- a/bridges/inc/except.hxx
+++ b/bridges/inc/except.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_BRIDGES_INC_EXCEPT_HXX
 #define INCLUDED_BRIDGES_INC_EXCEPT_HXX
 
-#if _MSC_VER >= 1900 // VC 2015/2017 (and later?)
 // extern "C" void** __cdecl __current_exception()
 // is defined in MSVS14.0/VC/crt/src/vcruntime/frame.cpp:
 // return &__vcrt_getptd()->_curexception;
@@ -34,7 +33,6 @@
 //void*  _curexception;// current exception
 //[...]
 extern "C" void** __current_exception();
-#endif
 
 #endif
 
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx 
b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index bd805a4..3fa9474 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -484,21 +484,7 @@ int msci_filterCppException(
 
 if (rethrow && pRecord == pPointers->ExceptionRecord)
 {
-pRecord = *reinterpret_cast< EXCEPTION_RECORD ** >(
-#if _MSC_VER >= 1900 // VC 2015 (and later?)
-   __current_exception()
-#else
-// hack to get msvcrt internal _curexception field:
-reinterpret_cast< char * >( __pxcptinfoptrs() ) +
-// as long as we don't demand msvcr source as build prerequisite
-// (->platform sdk), we have to code those offsets here.
-//
-// crt\src\mtdll.h:
-// offsetof (_tiddata, _curexception) -
-// offsetof (_tiddata, _tpxcptinfoptrs):
-0x28 // msvcr80.dll (and later?)
-#endif
-);
+pRecord = *reinterpret_cast< EXCEPTION_RECORD ** 
>(__current_exception());
 }
 // rethrow: handle only C++ exceptions:
 if (pRecord == 0 || pRecord->ExceptionCode != MSVC_ExceptionCode)
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx 
b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index 5687c0d..8860344 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -802,21 +802,7 @@ int mscx_filterCppException(
 
 if (rethrow && pRecord == pPointers->ExceptionRecord)
 {
-pRecord = *reinterpret_cast< EXCEPTION_RECORD ** >(
-#if _MSC_VER >= 1900 // VC 2015/2017 (and later?)
-__current_exception()
-#else
-// Hack to get msvcrt internal _curexception field
-reinterpret_cast< char * >( __pxcptinfoptrs() ) +
-// As long as we don't demand MSVCR source as build prerequisite,
-// we have to code those offsets here.
-//
-// MSVS9/crt/src/mtdll.h:
-// offsetof (_tiddata, _curexception) -
-// offsetof (_tiddata, _tpxcptinfoptrs):
-0x48
-#endif
-);
+pRecord = *reinterpret_cast< EXCEPTION_RECORD ** 
>(__current_exception());
 }
 
 // Rethrow: handle only C++ exceptions:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/inc bridges/source

2015-09-12 Thread David Ostrovsky 
 bridges/inc/bridges/cpp_uno/shared/except.hxx   |   41 
 bridges/source/cpp_uno/msvc_win32_intel/except.cxx  |7 ++-
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx |   13 ++
 3 files changed, 53 insertions(+), 8 deletions(-)

New commits:
commit 1aad95eb96bb0e9416a608b8a0416bd7d46b1cab
Author: David Ostrovsky 
Date:   Thu Sep 10 23:03:39 2015 +0200

Actually fix uno bridge on MSVC 14.0

VC runtime was substantially refactored on MSVC 14.0. Among other,
_tiddata structure defined in crt/src/mtdll.h was replaced with
__vcrt_getptd defined in crt/src/vcruntime/vcruntime_internal.h.

All members before

  unsigned long  _NLG_dwCode

were removed, so that the approach to access the member

  void *  _tpxcptinfoptrs; /* ptr to exception info pointers */

with __pxcptinfoptrs() and compute the offset to the _curexception
member of _tiddata doesn't work on MSVC 14.0.

As of MSVC 14.0 __vcrt_getptd symbol isn't exported but Microsoft
have introduced methods to access current exception, current exception
context and processing throw (the later can be accessed through C++17
std::unhandled_exceptions() that was made available in MSVC 14.0):

* __current_exception()
* __current_exception_context()
* __processing_throw() aka std::unhandled_exceptions()

Make use of __current_exception() which we can hope will be maintained
going forward.

Change-Id: Ibfffa5fba62d6928328ac976cb1b24937277363e
Reviewed-on: https://gerrit.libreoffice.org/18475
Tested-by: Jenkins 
Reviewed-by: David Ostrovsky 

diff --git a/bridges/inc/bridges/cpp_uno/shared/except.hxx 
b/bridges/inc/bridges/cpp_uno/shared/except.hxx
new file mode 100644
index 000..fcb4552
--- /dev/null
+++ b/bridges/inc/bridges/cpp_uno/shared/except.hxx
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_EXCEPT_HXX
+#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_EXCEPT_HXX
+
+#if _MSC_VER >= 1900 // VC 2015 (and later?)
+// extern "C" void** __cdecl __current_exception()
+// is defined in MSVS14.0/VC/crt/src/vcruntime/frame.cpp:
+// return &__vcrt_getptd()->_curexception;
+//
+// __vcrt_getptd is defined in vcruntime_internal.h:
+//typedef struct __vcrt_ptd
+//{
+//// C++ Exception Handling (EH) state
+//unsigned long  _NLG_dwCode;  // Required by NLG routines
+//[...]
+//void*  _curexception;// current exception
+//[...]
+extern "C" void** __current_exception();
+#endif
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx 
b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index 48e5383..6aaf8c2 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -32,6 +32,7 @@
 #include "com/sun/star/uno/Any.hxx"
 #include 
 #include "msci.hxx"
+#include "bridges/cpp_uno/shared/except.hxx"
 
 
 #pragma pack(push, 8)
@@ -493,8 +494,11 @@ int msci_filterCppException(
 
 if (rethrow && pRecord == pPointers->ExceptionRecord)
 {
-// hack to get msvcrt internal _curexception field:
 pRecord = *reinterpret_cast< EXCEPTION_RECORD ** >(
+#if _MSC_VER >= 1900 // VC 2015 (and later?)
+   __current_exception()
+#else
+// hack to get msvcrt internal _curexception field:
 reinterpret_cast< char * >( __pxcptinfoptrs() ) +
 // as long as we don't demand msvcr source as build prerequisite
 // (->platform sdk), we have to code those offsets here.
@@ -503,6 +507,7 @@ int msci_filterCppException(
 // offsetof (_tiddata, _curexception) -
 // offsetof (_tiddata, _tpxcptinfoptrs):
 0x28 // msvcr80.dll (and later?)
+#endif
 );
 }
 // rethrow: handle only C++ exceptions:
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx

[Libreoffice-commits] core.git: bridges/inc bridges/source cppu/source sal/rtl stoc/source

2015-03-31 Thread Stephan Bergmann 
 bridges/inc/bridges/cpp_uno/bridge.hxx   |2 +-
 bridges/source/cpp_uno/gcc3_ios_arm/except.cxx   |6 +++---
 bridges/source/cpp_uno/gcc3_linux_arm/except.cxx |6 +++---
 bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx|6 +++---
 bridges/source/cpp_uno/gcc3_linux_intel/except.cxx   |6 +++---
 bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx|6 +++---
 bridges/source/cpp_uno/gcc3_linux_mips/except.cxx|6 +++---
 bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx   |6 +++---
 bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx  |6 +++---
 bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx |6 +++---
 bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx |6 +++---
 bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx |6 +++---
 bridges/source/cpp_uno/mingw_intel/except.cxx|6 +++---
 bridges/source/cpp_uno/mingw_x86-64/except.cxx   |6 +++---
 bridges/source/cpp_uno/msvc_win32_intel/except.cxx   |2 +-
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx  |2 +-
 cppu/source/typelib/typelib.cxx  |2 +-
 sal/rtl/bootstrap.cxx|2 +-
 stoc/source/invocation_adapterfactory/iafactory.cxx  |2 +-
 stoc/source/security/access_controller.cxx   |2 +-
 20 files changed, 46 insertions(+), 46 deletions(-)

New commits:
commit 96f5b780f083ff97af5f570836267565d963e742
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Mar 31 17:43:43 2015 +0200

Use OUString::unacquired

found with

  git grep -E '\* *\reinterpret_cast\[^]+\OUString\'

Change-Id: I9306d4ad8e3b1664f54cb7df86f2d79bfd3c6cb9

diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx 
b/bridges/inc/bridges/cpp_uno/bridge.hxx
index 6f43694..37ba95d 100644
--- a/bridges/inc/bridges/cpp_uno/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/bridge.hxx
@@ -432,7 +432,7 @@ inline void SAL_CALL cppu_cppenv_computeObjectIdentifier(
 oid.append( (sal_Unicode)';' );
 // ;environment[context]
 oid.append(
-*reinterpret_cast OUString const * (
+OUString::unacquired(
 ((uno_Environment *) pEnv)-pTypeName ) );
 oid.append( (sal_Unicode)'[' );
 oid.append( (sal_Int64)((uno_Environment *)pEnv)-pContext, 16 
);
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx 
b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index 9af0e32..c4befc9 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -269,7 +269,7 @@ static void deleteException( void * pExc )
 
 void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
 {
-SAL_INFO( bridges.ios, raiseException:   *reinterpret_cast OUString 
const * ( pUnoExc-pType-pTypeName ) );
+SAL_INFO( bridges.ios, raiseException:   OUString::unacquired( 
pUnoExc-pType-pTypeName ) );
 
 void * pCppExc;
 std::type_info * rtti;
@@ -283,7 +283,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * 
pUno2Cpp )
 {
 throw RuntimeException(
 OUString(cannot get typedescription for type ) +
-*reinterpret_cast OUString const * ( pUnoExc-pType-pTypeName 
) );
+OUString::unacquired( pUnoExc-pType-pTypeName ) );
 }
 
 pCppExc = __cxa_allocate_exception( pTypeDescr-nSize );
@@ -313,7 +313,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * 
pUno2Cpp )
 {
 throw RuntimeException(
 OUString(no rtti for type ) +
-*reinterpret_cast OUString const * ( pUnoExc-pType-pTypeName 
) );
+OUString::unacquired( pUnoExc-pType-pTypeName ) );
 }
 }
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx 
b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index 520c49f..bccc2ce 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -235,7 +235,7 @@ namespace CPPU_CURRENT_NAMESPACE
 #if OSL_DEBUG_LEVEL  1
 OString cstr(
 OUStringToOString(
-*reinterpret_cast OUString const * ( 
pUnoExc-pType-pTypeName ),
+OUString::unacquired( pUnoExc-pType-pTypeName ),
 RTL_TEXTENCODING_ASCII_US ) );
 fprintf( stderr,  uno exception occurred: %s\n, cstr.getStr() );
 #endif
@@ -251,7 +251,7 @@ namespace CPPU_CURRENT_NAMESPACE
 {
 throw RuntimeException(
 OUString(cannot get typedescription for type ) +
-*reinterpret_cast OUString const * ( 
pUnoExc-pType-pTypeName ) );
+OUString::unacquired( pUnoExc-pType-pTypeName ) );
 }
 
 pCppExc = __cxa_allocate_exception( pTypeDescr-nSize );
@@ -281,7 +281,7 @@ namespace CPPU_CURRENT_NAMESPACE
{
throw RuntimeException(

[Libreoffice-commits] core.git: bridges/inc bridges/source

2015-01-07 Thread Stephan Bergmann 
 bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx   |4 ++--
 bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx |5 ++---
 bridges/source/cpp_uno/gcc3_ios_arm/except.cxx |6 ++
 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx  |5 ++---
 bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx |6 ++
 bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx  |1 -
 bridges/source/cpp_uno/gcc3_linux_arm/except.cxx   |6 ++
 bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx |1 -
 bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx  |6 ++
 bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx  |6 ++
 bridges/source/cpp_uno/gcc3_linux_intel/except.cxx |5 ++---
 bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx |1 -
 bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx  |6 ++
 bridges/source/cpp_uno/gcc3_linux_mips/except.cxx  |6 ++
 bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx   |6 ++
 bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx |6 ++
 bridges/source/cpp_uno/gcc3_linux_s390/except.cxx  |6 ++
 bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx |6 ++
 bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx |6 ++
 bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx  |1 -
 bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx   |5 ++---
 bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx   |6 ++
 bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx   |6 ++
 bridges/source/cpp_uno/mingw_intel/except.cxx  |6 ++
 bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx|1 -
 bridges/source/cpp_uno/mingw_x86-64/except.cxx |6 ++
 bridges/source/cpp_uno/msvc_win32_intel/except.cxx |5 ++---
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx|5 ++---
 bridges/source/cpp_uno/shared/vtablefactory.cxx|4 ++--
 29 files changed, 48 insertions(+), 91 deletions(-)

New commits:
commit 063a511583df8c2253c16ac5eb617ecf9eee7754
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jan 7 12:36:11 2015 +0100

Revert Revert boost::unordered_map-std::unordered_map

This reverts commit 3976739f2378391fa09379c48844daf0e2790f5b,
the problem mentioned there was caused by a different commit, and
has meanwhile been fixed.

diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx 
b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
index 1e9a488..4216566 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
@@ -26,7 +26,7 @@
 #include sal/types.h
 #include typelib/typedescription.hxx
 
-#include boost/unordered_map.hpp
+#include unordered_map
 
 /*See: http://people.redhat.com/drepper/selinux-mem.html*/
 #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \
@@ -207,7 +207,7 @@ private:
 static void flushCode(
 unsigned char const * begin, unsigned char const * end);
 
-typedef boost::unordered_map OUString, Vtables, OUStringHash  Map;
+typedef std::unordered_map OUString, Vtables, OUStringHash  Map;
 
 osl::Mutex m_mutex;
 Map m_map;
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx 
b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
index 8d74357..2e22d92 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
@@ -21,7 +21,6 @@
 #include stdio.h
 #include dlfcn.h
 #include cxxabi.h
-#include boost/unordered_map.hpp
 
 #include rtl/strbuf.hxx
 #include rtl/ustrbuf.hxx
@@ -30,7 +29,7 @@
 #include com/sun/star/uno/genfunc.hxx
 #include typelib/typedescription.hxx
 #include uno/any2.h
-
+#include unordered_map
 #include share.hxx
 #include string.h
 
@@ -89,7 +88,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-typedef boost::unordered_map OUString, type_info *, OUStringHash  
t_rtti_map;
+typedef std::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_ios_arm/except.cxx 
b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index d20bf42..8085445 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -22,8 +22,6 @@
 #include dlfcn.h
 
 #include boost/static_assert.hpp
-#include boost/unordered_map.hpp
-
 #include rtl/strbuf.hxx
 #include rtl/ustrbuf.hxx
 #include osl/mutex.hxx
@@ -35,7 +33,7 @@
 #include com/sun/star/ucb/NameClashException.hpp
 #include typelib/typedescription.hxx
 #include uno/any2.h
-
+#include unordered_map
 #include share.hxx
 
 using namespace ::osl;
@@ -130,7 +128,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-typedef boost::unordered_map OUString, std::type_info *, OUStringHash  
t_rtti_map;
+typedef std::unordered_map

[Libreoffice-commits] core.git: bridges/inc bridges/source

2015-01-05 Thread Caolán McNamara 
 bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx   |4 ++--
 bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx |5 ++---
 bridges/source/cpp_uno/gcc3_ios_arm/except.cxx |6 ++
 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx  |5 ++---
 bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx |6 ++
 bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx  |1 -
 bridges/source/cpp_uno/gcc3_linux_arm/except.cxx   |6 ++
 bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx |1 -
 bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx  |6 ++
 bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx  |6 ++
 bridges/source/cpp_uno/gcc3_linux_intel/except.cxx |5 ++---
 bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx |1 -
 bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx  |6 ++
 bridges/source/cpp_uno/gcc3_linux_mips/except.cxx  |6 ++
 bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx   |6 ++
 bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx |6 ++
 bridges/source/cpp_uno/gcc3_linux_s390/except.cxx  |6 ++
 bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx |6 ++
 bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx |6 ++
 bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx  |1 -
 bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx   |5 ++---
 bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx   |6 ++
 bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx   |6 ++
 bridges/source/cpp_uno/mingw_intel/except.cxx  |6 ++
 bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx|1 -
 bridges/source/cpp_uno/mingw_x86-64/except.cxx |6 ++
 bridges/source/cpp_uno/msvc_win32_intel/except.cxx |5 ++---
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx|5 ++---
 bridges/source/cpp_uno/shared/vtablefactory.cxx|4 ++--
 bridges/source/jni_uno/jni_info.h  |4 ++--
 30 files changed, 50 insertions(+), 93 deletions(-)

New commits:
commit ce7f442bd0b600c0acc74d4757e894a2ba382c53
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Jan 5 08:15:57 2015 +

boost::unordered_map-std::unordered_map

Change-Id: I3a16703727f1a421e0ed18079e14219a4feeb8c8

diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx 
b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
index 1e9a488..4216566 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
@@ -26,7 +26,7 @@
 #include sal/types.h
 #include typelib/typedescription.hxx
 
-#include boost/unordered_map.hpp
+#include unordered_map
 
 /*See: http://people.redhat.com/drepper/selinux-mem.html*/
 #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \
@@ -207,7 +207,7 @@ private:
 static void flushCode(
 unsigned char const * begin, unsigned char const * end);
 
-typedef boost::unordered_map OUString, Vtables, OUStringHash  Map;
+typedef std::unordered_map OUString, Vtables, OUStringHash  Map;
 
 osl::Mutex m_mutex;
 Map m_map;
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx 
b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
index 8d74357..2e22d92 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
@@ -21,7 +21,6 @@
 #include stdio.h
 #include dlfcn.h
 #include cxxabi.h
-#include boost/unordered_map.hpp
 
 #include rtl/strbuf.hxx
 #include rtl/ustrbuf.hxx
@@ -30,7 +29,7 @@
 #include com/sun/star/uno/genfunc.hxx
 #include typelib/typedescription.hxx
 #include uno/any2.h
-
+#include unordered_map
 #include share.hxx
 #include string.h
 
@@ -89,7 +88,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-typedef boost::unordered_map OUString, type_info *, OUStringHash  
t_rtti_map;
+typedef std::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_ios_arm/except.cxx 
b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index d20bf42..8085445 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -22,8 +22,6 @@
 #include dlfcn.h
 
 #include boost/static_assert.hpp
-#include boost/unordered_map.hpp
-
 #include rtl/strbuf.hxx
 #include rtl/ustrbuf.hxx
 #include osl/mutex.hxx
@@ -35,7 +33,7 @@
 #include com/sun/star/ucb/NameClashException.hpp
 #include typelib/typedescription.hxx
 #include uno/any2.h
-
+#include unordered_map
 #include share.hxx
 
 using namespace ::osl;
@@ -130,7 +128,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-typedef boost::unordered_map OUString, std::type_info *, OUStringHash  
t_rtti_map;
+typedef std::unordered_map OUString, std::type_info *, OUStringHash  
t_rtti_map;

[Libreoffice-commits] core.git: bridges/inc bridges/source

2015-01-02 Thread Tor Lillqvist 
 bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx  |3 +--
 bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx |3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0478c43bef0510e3bfedc0f836e3a95635e0d391
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Jan 2 12:43:13 2015 +0200

No need for USE_DOUBLE_MMAP on OS X

I had introduced it with d83de4b1a93ba7ed7bc3243073be3de96a44bfa9 in
2012, when the C++/UNO bridge for 64-bit OS X was created mostly as a
copy of the Linux one.

Stephan says that the only need for USE_DOUBLE_MMAP should be on
SELinux anyway, so most likely also its use for the various BSDs and
Android are copypasta or cargo cult.

Change-Id: I1c16e830e5e8269b78b14837a9127a98612a6e54

diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx 
b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
index 5b4b06b..1e9a488 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
@@ -30,8 +30,7 @@
 
 /*See: http://people.redhat.com/drepper/selinux-mem.html*/
 #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \
-|| defined(NETBSD) || defined(DRAGONFLY) || defined (ANDROID) \
-|| (defined(MACOSX)  defined(__LP64__))
+|| defined(NETBSD) || defined(DRAGONFLY) || defined (ANDROID)
 #define USE_DOUBLE_MMAP
 #endif
 
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
index 5ba5c1f..663a663 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
@@ -459,10 +459,11 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock(
 
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+Slot ** slots, unsigned char * code,
 typelib_InterfaceTypeDescription const * type, sal_Int32 nFunctionOffset,
 sal_Int32 functionCount, sal_Int32 nVtableOffset )
 {
+const sal_PtrDiff writetoexecdiff = 0;
 (*slots) -= functionCount;
 Slot * s = *slots;
 for ( sal_Int32 nPos = 0; nPos  type-nMembers; ++nPos )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/inc bridges/source chart2/inc connectivity/source idlc/source sal/osl

2013-12-13 Thread Jelle van der Waa 
 bridges/inc/bridges/cpp_uno/bridge.hxx 
   |   10 --
 bridges/source/cpp_uno/shared/component.cxx
   |9 +++--
 bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
   |7 ---
 chart2/inc/GL/glew.h   
   |2 --
 connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h   
   |4 
 connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
   |4 
 
connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
 |4 
 connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h 
   |4 
 connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h   
   |4 
 connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
   |4 
 connectivity/source/drivers/mozab/post_include_mozilla.h   
   |2 --
 connectivity/source/drivers/mozab/pre_include_mozilla.h
   |2 --
 connectivity/source/parse/sqlbison.y   
   |8 ++--
 connectivity/source/parse/sqlflex.l
   |8 ++--
 idlc/source/parser.y   
   |4 +---
 idlc/source/scanner.l  
   |2 --
 sal/osl/unx/security.c 
   |5 -
 17 files changed, 8 insertions(+), 75 deletions(-)

New commits:
commit c69b6417af9d03b81813e6d56cdd082d511aef24
Author: Jelle van der Waa je...@vdwaa.nl
Date:   Thu Dec 12 21:42:10 2013 +0100

fdo#72598 Remove SunStudio cruft from code base

Change-Id: Ia6799c852eb95d496fbc8dcfdabde62dffc263a6
Reviewed-on: https://gerrit.libreoffice.org/7066
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx 
b/bridges/inc/bridges/cpp_uno/bridge.hxx
index 15d8eb8..ba9a847 100644
--- a/bridges/inc/bridges/cpp_uno/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/bridge.hxx
@@ -379,17 +379,11 @@ inline void SAL_CALL cppu_ext_getMapping(
 
//##
 
//##
 
-#if (defined(__SUNPRO_CC)  (__SUNPRO_CC == 0x500))
-static OUString * s_pStaticOidPart = 0;
-#endif
-
 // environment init stuff
 
//--
 inline const OUString  SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(())
 {
-#if ! (defined(__SUNPRO_CC)  (__SUNPRO_CC == 0x500))
 static OUString * s_pStaticOidPart = 0;
-#endif
 if (! s_pStaticOidPart)
 {
 ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
@@ -404,12 +398,8 @@ inline const OUString  SAL_CALL 
cppu_cppenv_getStaticOIdPart() SAL_THROW(())
 {
 aRet.append( (sal_Int32)ar[i], 16 );
 }
-#if (defined(__SUNPRO_CC)  (__SUNPRO_CC == 0x500))
-s_pStaticOidPart = new OUString( aRet.makeStringAndClear() );
-#else
 static OUString s_aStaticOidPart( aRet.makeStringAndClear() );
 s_pStaticOidPart = s_aStaticOidPart;
-#endif
 }
 }
 return *s_pStaticOidPart;
diff --git a/bridges/source/cpp_uno/shared/component.cxx 
b/bridges/source/cpp_uno/shared/component.cxx
index a7d2e22..bacd9a7 100644
--- a/bridges/source/cpp_uno/shared/component.cxx
+++ b/bridges/source/cpp_uno/shared/component.cxx
@@ -41,15 +41,13 @@ namespace bridges { namespace cpp_uno { namespace shared {
 
 namespace {
 
-#if (defined(__SUNPRO_CC)  (__SUNPRO_CC == 0x500)) \
-|| (defined(__GNUC__)  defined(__APPLE__))
+#if (defined(__GNUC__)  defined(__APPLE__))
 static OUString * s_pStaticOidPart = 0;
 #endif
 
 const OUString  SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(())
 {
-#if ! ((defined(__SUNPRO_CC)  (__SUNPRO_CC == 0x500)) \
-|| (defined(__GNUC__)  defined(__APPLE__)))
+#if ! (defined(__GNUC__)  defined(__APPLE__))
 static OUString * s_pStaticOidPart = 0;
 #endif
 if (! s_pStaticOidPart)
@@ -66,8 +64,7 @@ const OUString  SAL_CALL cppu_cppenv_getStaticOIdPart() 
SAL_THROW(())
 {
 aRet.append( (sal_Int32)ar[i], 16 );
 }
-#if (defined(__SUNPRO_CC)  (__SUNPRO_CC == 0x500)) \
-|| (defined(__GNUC__)  defined(__APPLE__))
+#if (defined(__GNUC__)  defined(__APPLE__))
 s_pStaticOidPart = new OUString( aRet.makeStringAndClear() );
 #else
 static OUString s_aStaticOidPart(
diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx

[Libreoffice-commits] core.git: bridges/inc bridges/source bridges/test

2013-04-02 Thread Chr . Rossmanith 
 bridges/inc/bridges/cpp_uno/bridge.hxx |2 
 bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx |2 
 bridges/source/cpp_uno/gcc3_ios_arm/except.cxx |2 
 bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx |2 
 bridges/source/cpp_uno/gcc3_linux_arm/except.cxx   |2 
 bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx  |2 
 bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx  |2 
 bridges/source/cpp_uno/gcc3_linux_intel/except.cxx |2 
 bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx  |2 
 bridges/source/cpp_uno/gcc3_linux_mips/except.cxx  |2 
 bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx   |2 
 bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx |2 
 bridges/source/cpp_uno/gcc3_linux_s390/except.cxx  |2 
 bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx |2 
 bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx |2 
 bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx|2 
 bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx   |4 
 bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx|2 
 bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx  |2 
 bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx   |2 
 bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx  |4 
 bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx   |2 
 bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx   |2 
 bridges/source/cpp_uno/mingw_intel/except.cxx  |2 
 bridges/source/cpp_uno/msvc_win32_intel/except.cxx |   17 +---
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx|   17 +---
 bridges/source/cpp_uno/shared/component.cxx|2 
 bridges/source/jni_uno/jni_data.cxx|   72 +++--
 bridges/source/jni_uno/jni_info.cxx|   23 ++---
 bridges/source/jni_uno/jni_info.h  |   18 +---
 bridges/source/jni_uno/jni_java2uno.cxx|   28 ++
 bridges/source/jni_uno/jni_uno2java.cxx|   29 ++
 bridges/test/java_uno/any/transport.cxx|4 
 bridges/test/testclient.cxx|6 -
 bridges/test/testoffice.cxx|6 -
 bridges/test/testsameprocess.cxx   |8 -
 bridges/test/testserver.cxx|6 -
 37 files changed, 127 insertions(+), 161 deletions(-)

New commits:
commit 7dac241ca0dd0e8c53c246d8490e954d5b594862
Author: Chr. Rossmanith chrrossman...@gmx.de
Date:   Sun Mar 31 20:41:33 2013 +0200

Remove RTL_CONSTASCII_(U)STRINGPARAM in bridges

Change-Id: Id8777ee7f587846399e95cf3b1b37d669a76bae5
Reviewed-on: https://gerrit.libreoffice.org/3139
Reviewed-by: Christina Roßmanith chrrossman...@web.de
Tested-by: Christina Roßmanith chrrossman...@web.de

diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx 
b/bridges/inc/bridges/cpp_uno/bridge.hxx
index 3fe9bc5..3e8eca4 100644
--- a/bridges/inc/bridges/cpp_uno/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/bridge.hxx
@@ -399,7 +399,7 @@ inline const OUString  SAL_CALL 
cppu_cppenv_getStaticOIdPart() SAL_THROW(())
 if (! s_pStaticOidPart)
 {
 OUStringBuffer aRet( 64 );
-aRet.appendAscii( RTL_CONSTASCII_STRINGPARAM(];) );
+aRet.append( ]; );
 // good guid
 sal_uInt8 ar[16];
 ::rtl_getGlobalProcessId( ar );
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx 
b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
index 5afea9d..9ce12f61 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
@@ -129,7 +129,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription 
*pTypeDescr ) SAL_THR
 {
 // RTTI symbol
 OStringBuffer buf( 64 );
-buf.append( RTL_CONSTASCII_STRINGPARAM(_ZTIN) );
+buf.append( _ZTIN );
 sal_Int32 index = 0;
 do
 {
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx 
b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index 41af149..45c6956 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -122,7 +122,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription 
*pTypeDescr ) SAL_THR
 {
 // RTTI symbol
 OStringBuffer buf( 64 );
-buf.append( RTL_CONSTASCII_STRINGPARAM(_ZTIN) );
+buf.append( _ZTIN );
 sal_Int32 index = 0;
 do
 {
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx 
b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
index 72774e3..95e44d4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
@@ -129,7 +129,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription 
*pTypeDescr ) SAL_THR
 {