subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r991212 - /subversion/trunk/subversion/bindings/javahl/native/ClientContext.h
Date Tue, 31 Aug 2010 15:01:01 GMT
Author: hwright
Date: Tue Aug 31 15:01:01 2010
New Revision: 991212

URL: http://svn.apache.org/viewvc?rev=991212&view=rev
Log:
JavaHL: Protect a few class functions.

* subversion/bindings/javahl/native/ClientContext.h
  (notify, progress, resolve, javaResultToC): Make protected.

Modified:
    subversion/trunk/subversion/bindings/javahl/native/ClientContext.h

Modified: subversion/trunk/subversion/bindings/javahl/native/ClientContext.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ClientContext.h?rev=991212&r1=991211&r2=991212&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ClientContext.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ClientContext.h Tue Aug 31 15:01:01
2010
@@ -71,6 +71,19 @@ class ClientContext
    * Produce a baton for the getCommitMessage() callback.
    */
   void *getCommitMessageBaton(const char *message);
+ 
+ protected:
+  static void notify(void *baton, const svn_wc_notify_t *notify,
+                     apr_pool_t *pool);
+  static void progress(apr_off_t progressVal, apr_off_t total,
+                       void *baton, apr_pool_t *pool);
+  static svn_error_t *resolve(svn_wc_conflict_result_t **result,
+                              const svn_wc_conflict_description_t *desc,
+                              void *baton,
+                              apr_pool_t *pool);
+  static svn_wc_conflict_result_t *javaResultToC(jobject result,
+                                                 apr_pool_t *pool);
+
  public:
   ClientContext(jobject jsvnclient);
   ~ClientContext();
@@ -92,17 +105,6 @@ class ClientContext
    * specified location.
    */
   void setConfigDirectory(const char *configDir);
-
-  static void notify(void *baton, const svn_wc_notify_t *notify,
-                     apr_pool_t *pool);
-  static void progress(apr_off_t progressVal, apr_off_t total,
-                       void *baton, apr_pool_t *pool);
-  static svn_error_t *resolve(svn_wc_conflict_result_t **result,
-                              const svn_wc_conflict_description_t *desc,
-                              void *baton,
-                              apr_pool_t *pool);
-  static svn_wc_conflict_result_t *javaResultToC(jobject result,
-                                                 apr_pool_t *pool);
 };
 
 #endif // CLIENTCONTEXT_H



Mime
View raw message