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 2013/11/05 21:27:14 UTC
svn commit: r1539121 - in
/subversion/trunk/subversion/bindings/javahl/native/jniwrapper:
jni_array.hpp jni_object.hpp
Author: brane
Date: Tue Nov 5 20:27:14 2013
New Revision: 1539121
URL: http://svn.apache.org/r1539121
Log:
Add a missing include to JavaHL's jniwrapper.
* subversion/bindings/javahl/native/jniwrapper/jni_array.hpp:
Include <cstring>.
(Java::ByteArray::ByteArray): Qualify strlen in the ::std namespace.
* subversion/bindings/javahl/native/jniwrapper/jni_object.hpp:
Include <cstring>.
(Java::String::String): Qualify strlen in the ::std namespace.
(Java::String::set_value): Likewise.
Modified:
subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_array.hpp
subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_object.hpp
Modified: subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_array.hpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_array.hpp?rev=1539121&r1=1539120&r2=1539121&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_array.hpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_array.hpp Tue Nov 5 20:27:14 2013
@@ -24,6 +24,7 @@
#ifndef SVN_JAVAHL_JNIWRAPPER_ARRAY_HPP
#define SVN_JAVAHL_JNIWRAPPER_ARRAY_HPP
+#include <cstring>
#include <string>
#include "svn_string.h"
@@ -54,7 +55,7 @@ public:
*/
explicit ByteArray(Env env, const char* text)
: m_env(env),
- m_length(jsize(::strlen(text))),
+ m_length(jsize(::std::strlen(text))),
m_array(m_env.NewByteArray(m_length))
{
ByteArray::Contents contents(*this);
Modified: subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_object.hpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_object.hpp?rev=1539121&r1=1539120&r2=1539121&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_object.hpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_object.hpp Tue Nov 5 20:27:14 2013
@@ -24,6 +24,7 @@
#ifndef SVN_JAVAHL_JNIWRAPPER_OBJECT_HPP
#define SVN_JAVAHL_JNIWRAPPER_OBJECT_HPP
+#include <cstring>
#include <string>
#include "jni_env.hpp"
@@ -262,7 +263,7 @@ public:
: str.m_env.GetStringUTFChars(str.get(), NULL)),
m_new_text(NULL),
m_mutable(true),
- m_length(m_text ? jsize(::strlen(m_text)) : 0)
+ m_length(m_text ? jsize(::std::strlen(m_text)) : 0)
{}
/**
@@ -274,7 +275,7 @@ public:
: str.m_env.GetStringUTFChars(str.get(), NULL)),
m_new_text(NULL),
m_mutable(false),
- m_length(m_text ? jsize(::strlen(m_text)) : 0)
+ m_length(m_text ? jsize(::std::strlen(m_text)) : 0)
{}
/**
@@ -314,7 +315,7 @@ public:
if (m_text && m_mutable)
{
m_new_text = new_text;
- m_length = jsize(::strlen(new_text));
+ m_length = jsize(::std::strlen(new_text));
}
else if (!m_mutable)
throw std::logic_error(