summaryrefslogtreecommitdiff
path: root/bridges/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-12-05 09:55:56 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-12-05 13:31:39 +0100
commit55e596956e56b175ab17b682e7c8ac7daeb9289a (patch)
tree3691e2f43d50019b5e0f0e0145714afb13bcc685 /bridges/source
parent6a10149c5fef13721e3f83727a828556f8e1ec9a (diff)
loplugin:external (clang-cl)
...plus loplugin:consttobool and loplugin:fakebool fallout Change-Id: Ie3d8121815c080b13bea6d9deca1eb138ca56138 Reviewed-on: https://gerrit.libreoffice.org/84515 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'bridges/source')
-rw-r--r--bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx19
1 files changed, 18 insertions, 1 deletions
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 e483d47c27b9..c725bca543c8 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -306,6 +306,9 @@ static OUString toRTTIname(
//RTTI simulation
typedef std::unordered_map< OUString, void * > t_string2PtrMap;
+
+namespace {
+
class type_info_descriptor;
class RTTInfos
@@ -323,7 +326,7 @@ public:
class type_info_
{
friend type_info * RTTInfos::getRTTI( OUString const & ) throw ();
- friend int mscx_filterCppException(
+ friend int mscx::mscx_filterCppException(
EXCEPTION_POINTERS *, uno_Any *, uno_Mapping * );
public:
@@ -338,11 +341,15 @@ private:
char _m_d_name[1];
};
+}
+
type_info_::~type_info_() throw ()
{
(void)_m_data;
}
+namespace {
+
class type_info_descriptor
{
private:
@@ -367,6 +374,8 @@ public:
}
};
+}
+
type_info_descriptor * RTTInfos::insert_new_type_info_descriptor(OUString const & rUNOname) {
// insert new type_info
@@ -484,6 +493,8 @@ static void GenerateDestructorTrampoline(
assert( p < code + codeSnippetSize );
}
+namespace {
+
// This looks like it is the struct catchabletype above
struct ExceptionType
@@ -538,10 +549,14 @@ public:
ExceptionInfos() throw ();
};
+}
+
DWORD ExceptionInfos::allocationGranularity = 0;
// This corresponds to the struct throwinfo described above.
+namespace {
+
struct RaiseInfo
{
sal_Int32 _n0;
@@ -557,6 +572,8 @@ struct RaiseInfo
explicit RaiseInfo(typelib_TypeDescription * pTD) throw ();
};
+}
+
/* Rewrite of 32-Bit-Code to work under 64 Bit:
* To use the 32 Bit offset values in the ExceptionType we have to
* allocate a single allocation block and use it for all code and date