summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-14 12:44:47 +0200
committerNoel Grandin <noel@peralex.com>2015-04-15 11:47:12 +0200
commit71b809959bb8f775d83dc52628448bb8b8322b28 (patch)
treef9aa4308050eb7d55611068602c0cf0e3c1b3690 /bridges
parent135907f2061550624ee1859745d94eee01849070 (diff)
remove unnecessary use of void in function declarations
ie. void f(void); becomes void f(); I used the following command to make the changes: git grep -lP '\(\s*void\s*\)' -- *.cxx \ | xargs perl -pi -w -e 's/(\w+)\s*\(\s*void\s*\)/$1\(\)/g;' and ran it for both .cxx and .hxx files. Change-Id: I314a1b56e9c14d10726e32841736b0ad5eef8ddd
Diffstat (limited to 'bridges')
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_arm/share.hxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx2
-rw-r--r--bridges/source/cpp_uno/mingw_intel/dllinit.cxx4
-rw-r--r--bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx2
-rw-r--r--bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx4
-rw-r--r--bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx4
-rw-r--r--bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx8
8 files changed, 14 insertions, 14 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
index 1bde6e3b9952..9c254914d400 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
@@ -79,7 +79,7 @@ namespace CPPU_CURRENT_NAMESPACE
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
}
-extern "C" void privateSnippetExecutor(void);
+extern "C" void privateSnippetExecutor();
namespace arm
{
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 8670f0d40801..f9960819bde7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -59,7 +59,7 @@
#define HWCAP_ARM_VFP 64
-int hasVFP(void)
+int hasVFP()
{
int fd = open ("/proc/self/auxv", O_RDONLY);
if (fd == -1)
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
index 68799e419d73..bba1ce6a771f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
@@ -553,7 +553,7 @@ namespace
*/
// static void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** gpregptr, void** fpregptr, void** ovrflw)
// static void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** gpregptr, void** ovrflw)
- static void cpp_vtable_call(void)
+ static void cpp_vtable_call()
{
int nFunctionIndex;
int vTableOffset;
diff --git a/bridges/source/cpp_uno/mingw_intel/dllinit.cxx b/bridges/source/cpp_uno/mingw_intel/dllinit.cxx
index 0b004d7de92e..5b9bb38eaa26 100644
--- a/bridges/source/cpp_uno/mingw_intel/dllinit.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/dllinit.cxx
@@ -20,8 +20,8 @@
#include <windows.h>
-void dso_init(void);
-void dso_exit(void);
+void dso_init();
+void dso_exit();
extern "C" BOOL WINAPI DllMain(HMODULE hModule, DWORD dwReason, LPVOID lpvReserved)
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
index 229159f6f3ae..78d4bcc7b72b 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
@@ -354,7 +354,7 @@ static typelib_TypeClass __cdecl cpp_mediate(
* is called on incoming vtable calls
* (called by asm snippets)
*/
-static __declspec(naked) void __cdecl cpp_vtable_call(void)
+static __declspec(naked) void __cdecl cpp_vtable_call()
{
__asm
{
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx b/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx
index d523b63aa975..2e96e8478380 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx
@@ -25,8 +25,8 @@
#pragma warning(pop)
-void dso_init(void);
-void dso_exit(void);
+void dso_init();
+void dso_exit();
extern "C" BOOL WINAPI DllMain(HMODULE hModule, DWORD dwReason, LPVOID lpvReserved)
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx
index d523b63aa975..2e96e8478380 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx
@@ -25,8 +25,8 @@
#pragma warning(pop)
-void dso_init(void);
-void dso_exit(void);
+void dso_init();
+void dso_exit();
extern "C" BOOL WINAPI DllMain(HMODULE hModule, DWORD dwReason, LPVOID lpvReserved)
diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
index 8ca98a841f15..3d583235b0c9 100644
--- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
@@ -38,16 +38,16 @@
static bridges::cpp_uno::shared::VtableFactory * pInstance;
#if defined(__GNUG__) && !defined(__MINGW32__)
-extern "C" void dso_init(void) __attribute__((constructor));
-extern "C" void dso_exit(void) __attribute__((destructor));
+extern "C" void dso_init() __attribute__((constructor));
+extern "C" void dso_exit() __attribute__((destructor));
#endif
-void dso_init(void) {
+void dso_init() {
if (!pInstance)
pInstance = new bridges::cpp_uno::shared::VtableFactory();
}
-void dso_exit(void) {
+void dso_exit() {
if (pInstance)
{
delete pInstance;