You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/11/06 00:39:27 UTC
svn commit: r1539198 - in
/subversion/trunk/subversion/bindings/javahl/native: JNIMutex.h
RemoteSession.h StateReporter.h jniwrapper/jni_env.hpp
jniwrapper/jni_object.hpp
Author: rhuijben
Date: Tue Nov 5 23:39:27 2013
New Revision: 1539198
URL: http://svn.apache.org/r1539198
Log:
Following up on r1539182, revert one fix and try another.
Modified:
subversion/trunk/subversion/bindings/javahl/native/JNIMutex.h
subversion/trunk/subversion/bindings/javahl/native/RemoteSession.h
subversion/trunk/subversion/bindings/javahl/native/StateReporter.h
subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_env.hpp
subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_object.hpp
Modified: subversion/trunk/subversion/bindings/javahl/native/JNIMutex.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/JNIMutex.h?rev=1539198&r1=1539197&r2=1539198&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/JNIMutex.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/JNIMutex.h Tue Nov 5 23:39:27 2013
@@ -39,7 +39,7 @@ class JNIMutex
public:
JNIMutex(apr_pool_t *pool);
~JNIMutex();
- friend JNICriticalSection;
+ friend class JNICriticalSection;
private:
/**
* The apr mutex.
Modified: subversion/trunk/subversion/bindings/javahl/native/RemoteSession.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/RemoteSession.h?rev=1539198&r1=1539197&r2=1539198&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/RemoteSession.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/RemoteSession.h Tue Nov 5 23:39:27 2013
@@ -114,7 +114,7 @@ class RemoteSession : public SVNBase
jboolean hasCapability(jstring capability);
private:
- friend CommitEditor;
+ friend class CommitEditor;
RemoteSession(int retryAttempts,
const char* url, const char* uuid,
const char* configDirectory,
Modified: subversion/trunk/subversion/bindings/javahl/native/StateReporter.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/StateReporter.h?rev=1539198&r1=1539197&r2=1539198&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/StateReporter.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/StateReporter.h Tue Nov 5 23:39:27 2013
@@ -63,7 +63,7 @@ private:
void* m_report_baton;
EditorProxy* m_editor;
- friend RemoteSession;
+ friend class RemoteSession;
apr_pool_t* get_report_pool() const { return pool.getPool(); }
void set_reporter_data(const svn_ra_reporter3_t* raw_reporter,
void* report_baton,
Modified: subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_env.hpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_env.hpp?rev=1539198&r1=1539197&r2=1539198&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_env.hpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_env.hpp Tue Nov 5 23:39:27 2013
@@ -413,7 +413,7 @@ public:
private:
::JNIEnv* m_env;
- JNIEXPORT jint JNICALL friend ::JNI_OnLoad(::JavaVM*, void*);
+ friend JNIEXPORT jint JNICALL ::JNI_OnLoad(::JavaVM*, void*);
static ::JavaVM* m_jvm;
static ::JNIEnv* env_from_jvm();
Modified: subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_object.hpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_object.hpp?rev=1539198&r1=1539197&r2=1539198&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_object.hpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_object.hpp Tue Nov 5 23:39:27 2013
@@ -130,8 +130,8 @@ private:
*/
class ClassCache
{
- JNIEXPORT jint JNICALL friend ::JNI_OnLoad(::JavaVM*, void*);
- JNIEXPORT void JNICALL friend ::JNI_OnUnload(::JavaVM*, void*);
+ friend JNIEXPORT jint JNICALL ::JNI_OnLoad(::JavaVM*, void*);
+ friend JNIEXPORT void JNICALL ::JNI_OnUnload(::JavaVM*, void*);
explicit ClassCache(Env env);
~ClassCache();