You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2014/02/15 14:04:01 UTC
svn commit: r1568631 - in
/subversion/trunk/subversion/bindings/javahl/native: ClientContext.cpp
EditorProxy.cpp OperationContext.cpp SVNClient.cpp
org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
Author: brane
Date: Sat Feb 15 13:04:01 2014
New Revision: 1568631
URL: http://svn.apache.org/r1568631
Log:
Reorganize the include order in JavaHL to make the --disable-nls build work
on some platforms. Hopefully for the last time.
[in subversion/bindings/javahl]
* native/ClientContext.cpp,
native/EditorProxy.cpp,
native/OperationContext.cpp,
native/SVNClient.cpp,
native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp:
Change include order and put svn_private_config.h last.
Modified:
subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp
subversion/trunk/subversion/bindings/javahl/native/EditorProxy.cpp
subversion/trunk/subversion/bindings/javahl/native/OperationContext.cpp
subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
Modified: subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp?rev=1568631&r1=1568630&r2=1568631&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp Sat Feb 15 13:04:01 2014
@@ -26,7 +26,6 @@
#include "svn_client.h"
#include "private/svn_wc_private.h"
-#include "svn_private_config.h"
#include "ClientContext.h"
#include "JNIUtil.h"
@@ -37,6 +36,7 @@
#include "EnumMapper.h"
#include "CommitMessage.h"
+#include "svn_private_config.h"
ClientContext::ClientContext(jobject jsvnclient, SVN::Pool &pool)
: OperationContext(pool)
Modified: subversion/trunk/subversion/bindings/javahl/native/EditorProxy.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/EditorProxy.cpp?rev=1568631&r1=1568630&r2=1568631&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/EditorProxy.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/EditorProxy.cpp Sat Feb 15 13:04:01 2014
@@ -23,6 +23,7 @@
* @file EditorProxy.h
* @brief Interface of all editor proxy classes
*/
+#include <apr_pools.h>
#include "JNIUtil.h"
#include "JNIStackElement.h"
@@ -30,15 +31,13 @@
#include "CreateJ.h"
#include "EnumMapper.h"
-#include <apr_pools.h>
-#include "svn_error.h"
-#include "svn_private_config.h"
-
// Newstyle: stream wrapper
#include <memory>
#include "NativeStream.hpp"
#include "jniwrapper/jni_stack.hpp"
+#include "svn_error.h"
+#include "svn_private_config.h"
EditorProxy::EditorProxy(jobject jeditor, apr_pool_t* edit_pool,
const char* repos_root_url, const char* base_relpath,
Modified: subversion/trunk/subversion/bindings/javahl/native/OperationContext.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/OperationContext.cpp?rev=1568631&r1=1568630&r2=1568631&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/OperationContext.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/OperationContext.cpp Sat Feb 15 13:04:01 2014
@@ -26,11 +26,6 @@
#include <apr_file_io.h>
-#include "svn_client.h"
-#include "private/svn_wc_private.h"
-#include "private/svn_dep_compat.h"
-#include "svn_private_config.h"
-
#include "GlobalConfig.h"
#include "OperationContext.h"
#include "JNIUtil.h"
@@ -41,6 +36,11 @@
#include "EnumMapper.h"
#include "CommitMessage.h"
+#include "svn_client.h"
+#include "private/svn_wc_private.h"
+#include "private/svn_dep_compat.h"
+#include "svn_private_config.h"
+
OperationContext::OperationContext(SVN::Pool &pool)
: m_config(NULL),
m_prompter(NULL),
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1568631&r1=1568630&r2=1568631&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Sat Feb 15 13:04:01 2014
@@ -24,6 +24,11 @@
* @brief: Implementation of the SVNClient class
*/
+#include <vector>
+#include <iostream>
+#include <sstream>
+#include <string>
+
#include "SVNClient.h"
#include "JNIUtil.h"
#include "CopySources.h"
@@ -54,6 +59,8 @@
#include "PropertyTable.h"
#include "DiffOptions.h"
#include "CreateJ.h"
+#include "JNIStringHolder.h"
+
#include "svn_auth.h"
#include "svn_dso.h"
#include "svn_types.h"
@@ -67,12 +74,6 @@
#include "svn_path.h"
#include "svn_utf.h"
#include "svn_private_config.h"
-#include "JNIStringHolder.h"
-#include <vector>
-#include <iostream>
-#include <sstream>
-#include <string>
-
SVNClient::SVNClient(jobject jthis_in)
: m_lastPath("", pool), context(jthis_in, pool)
Modified: subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp?rev=1568631&r1=1568630&r2=1568631&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp Sat Feb 15 13:04:01 2014
@@ -25,6 +25,9 @@
* util.ConfigImpl.Category.
*/
+#include <string>
+#include <vector>
+
#include "../include/org_apache_subversion_javahl_util_ConfigImpl_Category.h"
#include "JNIUtil.h"
#include "JNIStackElement.h"
@@ -33,12 +36,9 @@
#include "CreateJ.h"
#include "EnumMapper.h"
-#include "svn_private_config.h"
#include "svn_config.h"
#include "svn_hash.h"
-
-#include <string>
-#include <vector>
+#include "svn_private_config.h"
namespace {
struct ImplContext