Modified: subversion/branches/1.9.x/subversion/bindings/javahl/native/RevisionRangeList.cpp URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/RevisionRangeList.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff ============================================================================== --- subversion/branches/1.9.x/subversion/bindings/javahl/native/RevisionRangeList.cpp (original) +++ subversion/branches/1.9.x/subversion/bindings/javahl/native/RevisionRangeList.cpp Wed Jun 10 04:00:29 2015 @@ -60,7 +60,7 @@ RevisionRangeList RevisionRangeList::cre jmethodID mid = 0; if (mid == 0) { - jclass cls = env->FindClass(JAVA_PACKAGE"/types/RevisionRangeList"); + jclass cls = env->FindClass(JAVAHL_CLASS("/types/RevisionRangeList")); if (JNIUtil::isJavaExceptionThrown()) return RevisionRangeList(NULL, pool);
Modified: subversion/branches/1.9.x/subversion/bindings/javahl/native/SVNClient.cpp URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/SVNClient.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff ============================================================================== --- subversion/branches/1.9.x/subversion/bindings/javahl/native/SVNClient.cpp (original) +++ subversion/branches/1.9.x/subversion/bindings/javahl/native/SVNClient.cpp Wed Jun 10 04:00:29 2015 @@ -96,21 +96,21 @@ SVNClient *SVNClient::getCppObject(jobje { static jfieldID fid = 0; jlong cppAddr = SVNBase::findCppAddrForJObject(jthis, &fid, - JAVA_PACKAGE"/SVNClient"); + JAVAHL_CLASS("/SVNClient")); return (cppAddr == 0 ? NULL : reinterpret_cast<SVNClient *>(cppAddr)); } void SVNClient::dispose(jobject jthis) { static jfieldID fid = 0; - SVNBase::dispose(jthis, &fid, JAVA_PACKAGE"/SVNClient"); + SVNBase::dispose(jthis, &fid, JAVAHL_CLASS("/SVNClient")); } jobject SVNClient::getVersionExtended(bool verbose) { JNIEnv *const env = JNIUtil::getEnv(); - jclass clazz = env->FindClass(JAVA_PACKAGE"/types/VersionExtended"); + jclass clazz = env->FindClass(JAVAHL_CLASS("/types/VersionExtended")); if (JNIUtil::isJavaExceptionThrown()) return NULL; Modified: subversion/branches/1.9.x/subversion/bindings/javahl/native/SVNRepos.cpp URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/SVNRepos.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff ============================================================================== --- subversion/branches/1.9.x/subversion/bindings/javahl/native/SVNRepos.cpp (original) +++ subversion/branches/1.9.x/subversion/bindings/javahl/native/SVNRepos.cpp Wed Jun 10 04:00:29 2015 @@ -50,14 +50,14 @@ SVNRepos *SVNRepos::getCppObject(jobject { static jfieldID fid = 0; jlong cppAddr = SVNBase::findCppAddrForJObject(jthis, &fid, - JAVA_PACKAGE"/SVNRepos"); + JAVAHL_CLASS("/SVNRepos")); return (cppAddr == 0 ? NULL : reinterpret_cast<SVNRepos *>(cppAddr)); } void SVNRepos::dispose(jobject jthis) { static jfieldID fid = 0; - SVNBase::dispose(jthis, &fid, JAVA_PACKAGE"/SVNRepos"); + SVNBase::dispose(jthis, &fid, JAVAHL_CLASS("/SVNRepos")); } void SVNRepos::cancelOperation() @@ -716,7 +716,7 @@ jobject SVNRepos::lslocks(File &path, sv NULL); JNIEnv *env = JNIUtil::getEnv(); - jclass clazz = env->FindClass(JAVA_PACKAGE"/types/Lock"); + jclass clazz = env->FindClass(JAVAHL_CLASS("/types/Lock")); if (JNIUtil::isJavaExceptionThrown()) return NULL; Modified: subversion/branches/1.9.x/subversion/bindings/javahl/native/StateReporter.cpp URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/StateReporter.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff ============================================================================== --- subversion/branches/1.9.x/subversion/bindings/javahl/native/StateReporter.cpp (original) +++ subversion/branches/1.9.x/subversion/bindings/javahl/native/StateReporter.cpp Wed Jun 10 04:00:29 2015 @@ -52,7 +52,7 @@ StateReporter::getCppObject(jobject jthi { static jfieldID fid = 0; jlong cppAddr = SVNBase::findCppAddrForJObject(jthis, &fid, - JAVA_PACKAGE"/remote/StateReporter"); + JAVAHL_CLASS("/remote/StateReporter")); return (cppAddr == 0 ? NULL : reinterpret_cast<StateReporter*>(cppAddr)); } @@ -65,7 +65,7 @@ StateReporter::dispose(jobject jthis) abortReport(); static jfieldID fid = 0; - SVNBase::dispose(jthis, &fid, JAVA_PACKAGE"/remote/StateReporter"); + SVNBase::dispose(jthis, &fid, JAVAHL_CLASS("/remote/StateReporter")); } namespace { Modified: subversion/branches/1.9.x/subversion/bindings/javahl/native/StatusCallback.cpp URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/StatusCallback.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff ============================================================================== --- subversion/branches/1.9.x/subversion/bindings/javahl/native/StatusCallback.cpp (original) +++ subversion/branches/1.9.x/subversion/bindings/javahl/native/StatusCallback.cpp Wed Jun 10 04:00:29 2015 @@ -81,13 +81,13 @@ StatusCallback::doStatus(const char *loc // it can be cached. if (mid == 0) { - jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/StatusCallback"); + jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/StatusCallback")); if (JNIUtil::isJavaExceptionThrown()) POP_AND_RETURN(SVN_NO_ERROR); mid = env->GetMethodID(clazz, "doStatus", "(Ljava/lang/String;" - "L"JAVA_PACKAGE"/types/Status;)V"); + JAVAHL_ARG("/types/Status;") ")V"); if (JNIUtil::isJavaExceptionThrown() || mid == 0) POP_AND_RETURN(SVN_NO_ERROR); } Modified: subversion/branches/1.9.x/subversion/bindings/javahl/native/SubversionException.cpp URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/SubversionException.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff ============================================================================== --- subversion/branches/1.9.x/subversion/bindings/javahl/native/SubversionException.cpp (original) +++ subversion/branches/1.9.x/subversion/bindings/javahl/native/SubversionException.cpp Wed Jun 10 04:00:29 2015 @@ -27,6 +27,6 @@ namespace JavaHL { const char* const SubversionException::m_class_name = - JAVA_PACKAGE"/SubversionException"; + JAVAHL_CLASS("/SubversionException"); } // namespace JavaHL Modified: subversion/branches/1.9.x/subversion/bindings/javahl/native/VersionExtended.cpp URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/VersionExtended.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff ============================================================================== --- subversion/branches/1.9.x/subversion/bindings/javahl/native/VersionExtended.cpp (original) +++ subversion/branches/1.9.x/subversion/bindings/javahl/native/VersionExtended.cpp Wed Jun 10 04:00:29 2015 @@ -35,7 +35,7 @@ VersionExtended::getCppObject(jobject jt static jfieldID fid = 0; jlong cppAddr = SVNBase::findCppAddrForJObject( - jthis, &fid, JAVA_PACKAGE"/types/VersionExtended"); + jthis, &fid, JAVAHL_CLASS("/types/VersionExtended")); return (cppAddr == 0 ? NULL : reinterpret_cast<VersionExtended *>(cppAddr)); } @@ -46,7 +46,7 @@ static jobject getWrapperAddress(jobject if (!*fid) { *fid = env->GetFieldID(env->GetObjectClass(jthat), "wrapper", - "L"JAVA_PACKAGE"/types/VersionExtended;"); + JAVAHL_ARG("/types/VersionExtended;")); if (JNIUtil::isJavaExceptionThrown()) { *fid = 0; @@ -94,5 +94,5 @@ VersionExtended::~VersionExtended() {} void VersionExtended::dispose(jobject jthis) { static jfieldID fid = 0; - SVNBase::dispose(jthis, &fid, JAVA_PACKAGE"/types/VersionExtended"); + SVNBase::dispose(jthis, &fid, JAVAHL_CLASS("/types/VersionExtended")); } Modified: subversion/branches/1.9.x/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff ============================================================================== --- subversion/branches/1.9.x/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp (original) +++ subversion/branches/1.9.x/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp Wed Jun 10 04:00:29 2015 @@ -275,7 +275,7 @@ Java_org_apache_subversion_javahl_util_C static jmethodID mid = 0; if (0 == mid) { - jclass cls = e->FindClass(JAVA_PACKAGE"/ISVNConfig$Enumerator"); + jclass cls = e->FindClass(JAVAHL_CLASS("/ISVNConfig$Enumerator")); if (JNIUtil::isJavaExceptionThrown()) return false; mid = e->GetMethodID(cls, "option", Modified: subversion/branches/1.9.x/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp?rev=1684558&r1=1684557&r2=1684558&view=diff ============================================================================== --- subversion/branches/1.9.x/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp (original) +++ subversion/branches/1.9.x/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp Wed Jun 10 04:00:29 2015 @@ -61,7 +61,7 @@ build_keywords_common(Java::Env env, con svn_string_t* keywords_string = keywords_contents.get_string(pool); const char* revision = (jrevision < 0 ? NULL : apr_psprintf(pool.getPool(), - "%"APR_UINT64_T_FMT, + "%" APR_UINT64_T_FMT, apr_uint64_t(jrevision))); const Java::String::Contents url_contents(url); const Java::String::Contents root_url_contents(repos_root_url);
