diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-03 20:57:02 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-03 20:55:50 +0000 |
commit | 6cb9e6dad798ec59f055aebe84a9c4a21e4be40d (patch) | |
tree | 21a7d6c0b165251ba8e0f36e73c851d41ac9dd04 /bridges | |
parent | 7e8806cd728bf906e1a8f1d649bef7337f297b1c (diff) |
Remove redundant 'inline' keyword
...from function definitions occurring within class definitions. Done with
a rewriting Clang plugin (to be pushed later).
Change-Id: I9c6f2818a57ccdb361548895a7743107cbacdff8
Reviewed-on: https://gerrit.libreoffice.org/34874
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'bridges')
-rw-r--r-- | bridges/source/jni_uno/jni_base.h | 22 | ||||
-rw-r--r-- | bridges/source/jni_uno/jni_info.h | 8 |
2 files changed, 15 insertions, 15 deletions
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h index 5f4ada393d34..88f43bc968bc 100644 --- a/bridges/source/jni_uno/jni_base.h +++ b/bridges/source/jni_uno/jni_base.h @@ -63,19 +63,19 @@ class JNI_context void java_exc_occurred() const; public: - inline explicit JNI_context( + explicit JNI_context( JNI_info const * jni_info, JNIEnv * env, jobject class_loader ) : m_jni_info( jni_info ), m_env( env ), m_class_loader( class_loader ) {} - inline JNI_info const * get_info() const + JNI_info const * get_info() const { return m_jni_info; } - inline JNIEnv * operator -> () const + JNIEnv * operator -> () const { return m_env; } - inline JNIEnv * get_jni_env() const + JNIEnv * get_jni_env() const { return m_env; } // does not handle exceptions, *classClass will be null if exception @@ -125,7 +125,7 @@ class JNI_guarded_context void operator = ( JNI_guarded_context ) = delete; public: - inline explicit JNI_guarded_context( + explicit JNI_guarded_context( JNI_info const * jni_info, rtl::Reference<jvmaccess::UnoVirtualMachine> const & vm_access) : AttachGuard( vm_access->getVirtualMachine() ), @@ -204,13 +204,13 @@ inline JLocalAutoRef & JLocalAutoRef::operator = ( JLocalAutoRef & auto_ref ) struct rtl_mem { - inline static void * operator new ( size_t nSize ) + static void * operator new ( size_t nSize ) { return rtl_allocateMemory( nSize ); } - inline static void operator delete ( void * mem ) + static void operator delete ( void * mem ) { if (mem) rtl_freeMemory( mem ); } - inline static void * operator new ( size_t, void * mem ) + static void * operator new ( size_t, void * mem ) { return mem; } - inline static void operator delete ( void *, void * ) + static void operator delete ( void *, void * ) {} static inline rtl_mem * allocate( std::size_t bytes ); @@ -234,10 +234,10 @@ class TypeDescr public: inline explicit TypeDescr( typelib_TypeDescriptionReference * td_ref ); - inline ~TypeDescr() + ~TypeDescr() { TYPELIB_DANGER_RELEASE( m_td ); } - inline typelib_TypeDescription * get() const + typelib_TypeDescription * get() const { return m_td; } }; diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h index 1abc05160876..577a74c469fd 100644 --- a/bridges/source/jni_uno/jni_info.h +++ b/bridges/source/jni_uno/jni_info.h @@ -70,9 +70,9 @@ struct JNI_type_info virtual void destroy( JNIEnv * jni_env ) = 0; protected: - inline void destruct( JNIEnv * jni_env ) + void destruct( JNIEnv * jni_env ) { jni_env->DeleteGlobalRef( m_class ); } - virtual inline ~JNI_type_info() {} + virtual ~JNI_type_info() {} explicit JNI_type_info( JNI_context const & jni, typelib_TypeDescription * td ); }; @@ -115,7 +115,7 @@ struct JNI_type_info_holder JNI_type_info_holder(const JNI_type_info_holder&) = delete; const JNI_type_info_holder& operator=(const JNI_type_info_holder&) = delete; - inline JNI_type_info_holder() : m_info( nullptr ) {} + JNI_type_info_holder() : m_info( nullptr ) {} }; typedef std::unordered_map< @@ -235,7 +235,7 @@ private: JNI_info( JNIEnv * jni_env, jobject class_loader, jclass classClass, jmethodID methodForName ); - inline ~JNI_info() {} + ~JNI_info() {} }; inline void JNI_info::destroy( JNIEnv * jni_env ) |