Author: vmpn
Date: Mon Dec 24 23:11:33 2012
New Revision: 1425692
URL: http://svn.apache.org/viewvc?rev=1425692&view=rev
Log:
On the javahl-ra branch:
Bring up-to-date with JavaHL changes on trunk@1405517
Modified:
subversion/branches/javahl-ra/ (props changed)
subversion/branches/javahl-ra/subversion/bindings/javahl/native/CopySources.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/StringArray.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/Targets.cpp
Propchange: subversion/branches/javahl-ra/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1405517
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/native/CopySources.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/CopySources.cpp?rev=1425692&r1=1425691&r2=1425692&view=diff
==============================================================================
---
subversion/branches/javahl-ra/subversion/bindings/javahl/native/CopySources.cpp
(original)
+++
subversion/branches/javahl-ra/subversion/bindings/javahl/native/CopySources.cpp
Mon Dec 24 23:11:33 2012
@@ -95,7 +95,7 @@ CopySources::array(SVN::Pool &pool)
std::vector<jobject> sources = m_copySources.vector();
apr_array_header_t *copySources =
- apr_array_make(p, sources.size(), sizeof(svn_client_copy_source_t *));
+ apr_array_make(p, (int)sources.size(), sizeof(svn_client_copy_source_t *));
for (std::vector<jobject>::const_iterator it = sources.begin();
it < sources.end(); ++it)
{
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.cpp?rev=1425692&r1=1425691&r2=1425692&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.cpp
(original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/CreateJ.cpp
Mon Dec 24 23:11:33 2012
@@ -208,7 +208,7 @@ CreateJ::Checksum(const svn_checksum_t *
jbyteArray jdigest = JNIUtil::makeJByteArray(
(const signed char *)checksum->digest,
- svn_checksum_size(checksum));
+ (int)svn_checksum_size(checksum));
if (JNIUtil::isExceptionThrown())
POP_AND_RETURN_NULL;
@@ -1099,7 +1099,8 @@ jobject CreateJ::PropertyMap(apr_hash_t
POP_AND_RETURN_NULL;
jbyteArray jpropVal = JNIUtil::makeJByteArray(
- (const signed char *)val->data, val->len);
+ (const signed char *)val->data,
+ (int)val->len);
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp?rev=1425692&r1=1425691&r2=1425692&view=diff
==============================================================================
---
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp
(original)
+++
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp
Mon Dec 24 23:11:33 2012
@@ -195,7 +195,7 @@ void SVNClient::logMessages(const char *
SVN_JNI_ERR(target.error_occured(), );
apr_array_header_t *ranges =
- apr_array_make(subPool.getPool(), logRanges.size(),
+ apr_array_make(subPool.getPool(), (int)logRanges.size(),
sizeof(svn_opt_revision_range_t *));
std::vector<RevisionRange>::const_iterator it;
@@ -644,7 +644,7 @@ void SVNClient::merge(const char *path,
return;
apr_array_header_t *ranges =
- apr_array_make(subPool.getPool(), rangesToMerge.size(),
+ apr_array_make(subPool.getPool(), (int)rangesToMerge.size(),
sizeof(const svn_opt_revision_range_t *));
std::vector<RevisionRange>::const_iterator it;
@@ -854,7 +854,7 @@ jbyteArray SVNClient::propertyGet(const
return NULL;
return JNIUtil::makeJByteArray((const signed char *)propval->data,
- propval->len);
+ (int)propval->len);
}
void SVNClient::properties(const char *path, Revision &revision,
@@ -1158,7 +1158,7 @@ jbyteArray SVNClient::revProperty(const
return NULL;
return JNIUtil::makeJByteArray((const signed char *)propval->data,
- propval->len);
+ (int)propval->len);
}
void SVNClient::relocate(const char *from, const char *to, const char *path,
bool ignoreExternals)
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/native/StringArray.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/StringArray.cpp?rev=1425692&r1=1425691&r2=1425692&view=diff
==============================================================================
---
subversion/branches/javahl-ra/subversion/bindings/javahl/native/StringArray.cpp
(original)
+++
subversion/branches/javahl-ra/subversion/bindings/javahl/native/StringArray.cpp
Mon Dec 24 23:11:33 2012
@@ -39,7 +39,7 @@ StringArray::~StringArray()
const apr_array_header_t *StringArray::array(const SVN::Pool &pool)
{
apr_array_header_t *strings
- = apr_array_make(pool.getPool(), m_strings.size(), sizeof(char *));
+ = apr_array_make(pool.getPool(), (int)m_strings.size(), sizeof(char *));
std::vector<std::string>::const_iterator it;
for (it = m_strings.begin(); it < m_strings.end(); ++it)
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/native/Targets.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/Targets.cpp?rev=1425692&r1=1425691&r2=1425692&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/Targets.cpp
(original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/Targets.cpp
Mon Dec 24 23:11:33 2012
@@ -73,7 +73,7 @@ const apr_array_header_t *Targets::array
apr_pool_t *apr_pool = pool.getPool();
apr_array_header_t *apr_targets = apr_array_make (apr_pool,
- m_targets.size(),
+ (int)m_targets.size(),
sizeof(const char *));
for (it = m_targets.begin(); it != m_targets.end(); ++it)
