You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/09/16 14:21:34 UTC
svn commit: r997712 -
/subversion/branches/object-model/subversion/bindings/javahl/native/
Author: hwright
Date: Thu Sep 16 12:21:33 2010
New Revision: 997712
URL: http://svn.apache.org/viewvc?rev=997712&view=rev
Log:
On the object-model branch:
Rename the JNI Pool header to avoid a conflict with the C++ bindings.
(The end goal, of course, is to remove this file entirely, in favor of the
version from the C++ bindings.)
* subversion/bindings/javahl/native/Pool.h:
Moved from here...
* subversion/bindings/javahl/native/Pool.h:
...to here.
* subversion/bindings/javahl/native/Pool.cpp
subversion/bindings/javahl/native/StringArray.h
subversion/bindings/javahl/native/Targets.h
subversion/bindings/javahl/native/CopySources.cpp
subversion/bindings/javahl/native/JNIUtil.cpp
subversion/bindings/javahl/native/InputStream.h
subversion/bindings/javahl/native/RevisionRange.h
subversion/bindings/javahl/native/Path.cpp
subversion/bindings/javahl/native/SVNClient.cpp
subversion/bindings/javahl/native/Prompter.cpp
subversion/bindings/javahl/native/RevpropTable.h
subversion/bindings/javahl/native/RevisionRange.cpp
subversion/bindings/javahl/native/OutputStream.h
subversion/bindings/javahl/native/CopySources.h
subversion/bindings/javahl/native/JNIUtil.h
subversion/bindings/javahl/native/File.h
subversion/bindings/javahl/native/ClientContext.h
subversion/bindings/javahl/native/Array.h:
Update references.
Added:
subversion/branches/object-model/subversion/bindings/javahl/native/JNIPool.h
- copied unchanged from r997703, subversion/branches/object-model/subversion/bindings/javahl/native/Pool.h
Removed:
subversion/branches/object-model/subversion/bindings/javahl/native/Pool.h
Modified:
subversion/branches/object-model/subversion/bindings/javahl/native/Array.h
subversion/branches/object-model/subversion/bindings/javahl/native/ClientContext.h
subversion/branches/object-model/subversion/bindings/javahl/native/CopySources.cpp
subversion/branches/object-model/subversion/bindings/javahl/native/CopySources.h
subversion/branches/object-model/subversion/bindings/javahl/native/File.h
subversion/branches/object-model/subversion/bindings/javahl/native/InputStream.h
subversion/branches/object-model/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/object-model/subversion/bindings/javahl/native/JNIUtil.h
subversion/branches/object-model/subversion/bindings/javahl/native/OutputStream.h
subversion/branches/object-model/subversion/bindings/javahl/native/Path.cpp
subversion/branches/object-model/subversion/bindings/javahl/native/Pool.cpp
subversion/branches/object-model/subversion/bindings/javahl/native/Prompter.cpp
subversion/branches/object-model/subversion/bindings/javahl/native/RevisionRange.cpp
subversion/branches/object-model/subversion/bindings/javahl/native/RevisionRange.h
subversion/branches/object-model/subversion/bindings/javahl/native/RevpropTable.h
subversion/branches/object-model/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/object-model/subversion/bindings/javahl/native/StringArray.h
subversion/branches/object-model/subversion/bindings/javahl/native/Targets.h
Modified: subversion/branches/object-model/subversion/bindings/javahl/native/Array.h
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/Array.h?rev=997712&r1=997711&r2=997712&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/Array.h (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/Array.h Thu Sep 16 12:21:33 2010
@@ -28,7 +28,7 @@
#define ARRAY_H
#include <jni.h>
-#include "Pool.h"
+#include "JNIPool.h"
struct apr_array_header_t;
Modified: subversion/branches/object-model/subversion/bindings/javahl/native/ClientContext.h
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/ClientContext.h?rev=997712&r1=997711&r2=997712&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/ClientContext.h (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/ClientContext.h Thu Sep 16 12:21:33 2010
@@ -33,7 +33,7 @@
#include "svn_client.h"
#include <jni.h>
-#include "Pool.h"
+#include "JNIPool.h"
#include "JNIStringHolder.h"
class Prompter;
Modified: subversion/branches/object-model/subversion/bindings/javahl/native/CopySources.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/CopySources.cpp?rev=997712&r1=997711&r2=997712&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/CopySources.cpp (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/CopySources.cpp Thu Sep 16 12:21:33 2010
@@ -27,7 +27,7 @@
#include <apr_pools.h>
#include "svn_client.h"
-#include "Pool.h"
+#include "JNIPool.h"
#include "JNIUtil.h"
#include "JNIStringHolder.h"
#include "Revision.h"
Modified: subversion/branches/object-model/subversion/bindings/javahl/native/CopySources.h
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/CopySources.h?rev=997712&r1=997711&r2=997712&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/CopySources.h (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/CopySources.h Thu Sep 16 12:21:33 2010
@@ -30,7 +30,7 @@
#include <jni.h>
#include <apr_tables.h>
-#include "Pool.h"
+#include "JNIPool.h"
#include "Array.h"
/**
Modified: subversion/branches/object-model/subversion/bindings/javahl/native/File.h
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/File.h?rev=997712&r1=997711&r2=997712&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/File.h (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/File.h Thu Sep 16 12:21:33 2010
@@ -29,7 +29,7 @@
#include <jni.h>
#include "svn_io.h"
-#include "Pool.h"
+#include "JNIPool.h"
#include "JNIStringHolder.h"
/**
Modified: subversion/branches/object-model/subversion/bindings/javahl/native/InputStream.h
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/InputStream.h?rev=997712&r1=997711&r2=997712&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/InputStream.h (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/InputStream.h Thu Sep 16 12:21:33 2010
@@ -29,7 +29,7 @@
#include <jni.h>
#include "svn_io.h"
-#include "Pool.h"
+#include "JNIPool.h"
/**
* This class contains a Java objects implementing the interface InputStream and
Modified: subversion/branches/object-model/subversion/bindings/javahl/native/JNIUtil.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/JNIUtil.cpp?rev=997712&r1=997711&r2=997712&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/JNIUtil.cpp Thu Sep 16 12:21:33 2010
@@ -57,7 +57,7 @@ extern "C" {
#include "JNICriticalSection.h"
#include "JNIThreadData.h"
#include "JNIStringHolder.h"
-#include "Pool.h"
+#include "JNIPool.h"
// Static members of JNIUtil are allocated here.
apr_pool_t *JNIUtil::g_pool = NULL;
Modified: subversion/branches/object-model/subversion/bindings/javahl/native/JNIUtil.h
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/JNIUtil.h?rev=997712&r1=997711&r2=997712&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/JNIUtil.h (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/JNIUtil.h Thu Sep 16 12:21:33 2010
@@ -29,7 +29,7 @@
#include <list>
#include <vector>
-#include "Pool.h"
+#include "JNIPool.h"
struct apr_pool_t;
struct svn_error;
class JNIMutex;
Modified: subversion/branches/object-model/subversion/bindings/javahl/native/OutputStream.h
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/OutputStream.h?rev=997712&r1=997711&r2=997712&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/OutputStream.h (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/OutputStream.h Thu Sep 16 12:21:33 2010
@@ -29,7 +29,7 @@
#include <jni.h>
#include "svn_io.h"
-#include "Pool.h"
+#include "JNIPool.h"
/**
* This class contains a Java objects implementing the interface OutputStream
Modified: subversion/branches/object-model/subversion/bindings/javahl/native/Path.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/Path.cpp?rev=997712&r1=997711&r2=997712&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/Path.cpp (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/Path.cpp Thu Sep 16 12:21:33 2010
@@ -28,7 +28,7 @@
#include "Path.h"
#include "svn_path.h"
#include "JNIUtil.h"
-#include "Pool.h"
+#include "JNIPool.h"
/**
* Constructor
Modified: subversion/branches/object-model/subversion/bindings/javahl/native/Pool.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/Pool.cpp?rev=997712&r1=997711&r2=997712&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/Pool.cpp (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/Pool.cpp Thu Sep 16 12:21:33 2010
@@ -24,7 +24,7 @@
* @brief Implementation of the class Pool
*/
-#include "Pool.h"
+#include "JNIPool.h"
#include "JNIUtil.h"
#include "JNIMutex.h"
#include "JNICriticalSection.h"
Modified: subversion/branches/object-model/subversion/bindings/javahl/native/Prompter.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/Prompter.cpp?rev=997712&r1=997711&r2=997712&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/Prompter.cpp (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/Prompter.cpp Thu Sep 16 12:21:33 2010
@@ -25,7 +25,7 @@
*/
#include "Prompter.h"
-#include "Pool.h"
+#include "JNIPool.h"
#include "JNIUtil.h"
#include "JNIStringHolder.h"
#include "../include/org_apache_subversion_javahl_callback_UserPasswordCallback.h"
Modified: subversion/branches/object-model/subversion/bindings/javahl/native/RevisionRange.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/RevisionRange.cpp?rev=997712&r1=997711&r2=997712&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/RevisionRange.cpp (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/RevisionRange.cpp Thu Sep 16 12:21:33 2010
@@ -31,7 +31,7 @@
#include "JNIUtil.h"
#include "RevisionRange.h"
#include "Revision.h"
-#include "Pool.h"
+#include "JNIPool.h"
RevisionRange::RevisionRange(jobject jrevisionRange)
{
Modified: subversion/branches/object-model/subversion/bindings/javahl/native/RevisionRange.h
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/RevisionRange.h?rev=997712&r1=997711&r2=997712&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/RevisionRange.h (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/RevisionRange.h Thu Sep 16 12:21:33 2010
@@ -30,7 +30,7 @@
#include <jni.h>
#include "svn_types.h"
-#include "Pool.h"
+#include "JNIPool.h"
/**
* A container for our copy sources, which can convert them into an
Modified: subversion/branches/object-model/subversion/bindings/javahl/native/RevpropTable.h
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/RevpropTable.h?rev=997712&r1=997711&r2=997712&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/RevpropTable.h (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/RevpropTable.h Thu Sep 16 12:21:33 2010
@@ -28,7 +28,7 @@
#define REVPROPTABLE_H
#include <jni.h>
-#include "Pool.h"
+#include "JNIPool.h"
struct apr_hash_t;
Modified: subversion/branches/object-model/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/SVNClient.cpp?rev=997712&r1=997711&r2=997712&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/SVNClient.cpp Thu Sep 16 12:21:33 2010
@@ -30,7 +30,7 @@
#include "DiffSummaryReceiver.h"
#include "ClientContext.h"
#include "Prompter.h"
-#include "Pool.h"
+#include "JNIPool.h"
#include "Targets.h"
#include "Revision.h"
#include "RevisionRange.h"
Modified: subversion/branches/object-model/subversion/bindings/javahl/native/StringArray.h
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/StringArray.h?rev=997712&r1=997711&r2=997712&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/StringArray.h (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/StringArray.h Thu Sep 16 12:21:33 2010
@@ -28,7 +28,7 @@
#define STRINGARRAY_H
#include <jni.h>
-#include "Pool.h"
+#include "JNIPool.h"
struct apr_array_header_t;
Modified: subversion/branches/object-model/subversion/bindings/javahl/native/Targets.h
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/javahl/native/Targets.h?rev=997712&r1=997711&r2=997712&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/javahl/native/Targets.h (original)
+++ subversion/branches/object-model/subversion/bindings/javahl/native/Targets.h Thu Sep 16 12:21:33 2010
@@ -28,7 +28,7 @@
#define TARGETS_H
#include <jni.h>
-#include "Pool.h"
+#include "JNIPool.h"
#include "StringArray.h"
struct apr_array_header_t;