summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-12-08 09:46:01 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-12-08 13:28:16 +0100
commitab9b67bbb001f380b3973941443bfbc59fe7141c (patch)
tree4737847b2970d2310932f115935a9454aacff6fe /bridges
parent3c0cb54b7ca20439e7e5e1e19dc6fcc75709973b (diff)
Remove obsolete SAL_FALLTHROUGH completely
...after 7ffdd830d5fb52f2ca25aa80277d22ea6d89970b "HAVE_CPP_ATTRIBUTE_FALLTHROUGH is always true now" Change-Id: I54e5ff4e036a6bb3e5774d1c0524158aae18e937 Reviewed-on: https://gerrit.libreoffice.org/64800 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'bridges')
-rw-r--r--bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_ios/uno2cpp.cxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx2
-rw-r--r--bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx2
-rw-r--r--bridges/source/jni_uno/jni_data.cxx2
14 files changed, 16 insertions, 16 deletions
diff --git a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
index 40b7d918a9b2..cc1528f53d89 100644
--- a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
@@ -394,7 +394,7 @@ namespace
TYPELIB_DANGER_RELEASE( pTD );
}
} // else perform queryInterface()
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
eRet = cpp2uno_call(
pCppI, aMemberDescr.get(),
diff --git a/bridges/source/cpp_uno/gcc3_ios/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_ios/uno2cpp.cxx
index 916961c69caf..30ae398816c7 100644
--- a/bridges/source/cpp_uno/gcc3_ios/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/uno2cpp.cxx
@@ -84,7 +84,7 @@ void MapReturn(sal_uInt64 x0, sal_uInt64 x1, typelib_TypeDescriptionReference *p
case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER:
pRegisterReturn[1] = x1;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case typelib_TypeClass_LONG:
case typelib_TypeClass_UNSIGNED_LONG:
case typelib_TypeClass_ENUM:
@@ -542,7 +542,7 @@ void unoInterfaceProxyDispatch(
TYPELIB_DANGER_RELEASE( pTD );
}
} // else perform queryInterface()
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
// dependent dispatch
cpp_call(
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index b695cabcf4df..4ef17b8542e1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -402,7 +402,7 @@ namespace
}
TYPELIB_DANGER_RELEASE( pTD );
}
- } SAL_FALLTHROUGH; // else perform queryInterface()
+ } [[fallthrough]]; // else perform queryInterface()
default:
eRet = cpp2uno_call(
pCppI, aMemberDescr.get(),
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 852252969b37..97dbd9976fa1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -172,7 +172,7 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference *
case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER:
pRegisterReturn[1] = r1;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case typelib_TypeClass_LONG:
case typelib_TypeClass_UNSIGNED_LONG:
case typelib_TypeClass_ENUM:
@@ -714,7 +714,7 @@ void unoInterfaceProxyDispatch(
}
TYPELIB_DANGER_RELEASE( pTD );
}
- } SAL_FALLTHROUGH; // else perform queryInterface()
+ } [[fallthrough]]; // else perform queryInterface()
default:
// dependent dispatch
cpp_call(
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
index 288aeea1e0ce..b0b160b24bf2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
@@ -107,7 +107,7 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER:
static_cast<long*>(pRegisterReturn)[1] = edx;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case typelib_TypeClass_LONG:
case typelib_TypeClass_UNSIGNED_LONG:
case typelib_TypeClass_CHAR:
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
index 5fb2c013959c..70c6091ec207 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
@@ -323,7 +323,7 @@ extern "C" void cpp_vtable_call(
}
TYPELIB_DANGER_RELEASE( pTD );
}
- SAL_FALLTHROUGH; // else perform queryInterface()
+ [[fallthrough]]; // else perform queryInterface()
}
default:
cpp2uno_call(
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
index 1061a00c76c0..c61a77baf07e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
@@ -361,7 +361,7 @@ void unoInterfaceProxyDispatch(
}
TYPELIB_DANGER_RELEASE( pTD );
}
- SAL_FALLTHROUGH; // else perform queryInterface()
+ [[fallthrough]]; // else perform queryInterface()
}
default:
// dependent dispatch
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index 1f47f4c9b2dc..29212988f78d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -363,7 +363,7 @@ typelib_TypeClass cpp_vtable_call(
}
TYPELIB_DANGER_RELEASE( pTD );
}
- SAL_FALLTHROUGH; // else perform queryInterface()
+ [[fallthrough]]; // else perform queryInterface()
}
default:
{
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index a56f9f255d26..7ccf487ee9bd 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -406,7 +406,7 @@ void unoInterfaceProxyDispatch(
}
TYPELIB_DANGER_RELEASE( pTD );
}
- SAL_FALLTHROUGH; // else perform queryInterface()
+ [[fallthrough]]; // else perform queryInterface()
}
default:
// dependent dispatch
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 8f453e4aeb53..e371b15ce90e 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
@@ -364,7 +364,7 @@ typelib_TypeClass cpp_vtable_call(
}
TYPELIB_DANGER_RELEASE( pTD );
}
- SAL_FALLTHROUGH; // else perform queryInterface()
+ [[fallthrough]]; // else perform queryInterface()
}
default:
{
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
index 13002709436d..75cf8861c332 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
@@ -411,7 +411,7 @@ void unoInterfaceProxyDispatch(
}
TYPELIB_DANGER_RELEASE( pTD );
}
- SAL_FALLTHROUGH; // else perform queryInterface()
+ [[fallthrough]]; // else perform queryInterface()
}
default:
// dependent dispatch
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
index 3abbfaf9b7dd..cf266de14873 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
@@ -347,7 +347,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
}
TYPELIB_DANGER_RELEASE( pTD2 );
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
default:
{
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
index 524228ad3bc4..4415d525b0db 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
@@ -423,7 +423,7 @@ void unoInterfaceProxyDispatch(
}
TYPELIB_DANGER_RELEASE( pTD );
}
- SAL_FALLTHROUGH; // else perform queryInterface()
+ [[fallthrough]]; // else perform queryInterface()
}
default:
if ( ! cpp_call(
diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx
index bb26749cadaf..feb9674563c5 100644
--- a/bridges/source/jni_uno/jni_data.cxx
+++ b/bridges/source/jni_uno/jni_data.cxx
@@ -1738,7 +1738,7 @@ void Bridge::map_to_java(
jni.ensure_no_exception();
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
default:
{