diff options
Diffstat (limited to 'subversion/bindings/javahl/native/Targets.cpp')
| -rw-r--r-- | subversion/bindings/javahl/native/Targets.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/subversion/bindings/javahl/native/Targets.cpp b/subversion/bindings/javahl/native/Targets.cpp index 767caca..85ecc34 100644 --- a/subversion/bindings/javahl/native/Targets.cpp +++ b/subversion/bindings/javahl/native/Targets.cpp @@ -40,13 +40,13 @@ Targets::Targets(const char *path, SVN::Pool &in_pool) : m_subpool(in_pool) { m_strArray = NULL; - m_targets.push_back (apr_pstrdup(m_subpool.getPool(), path)); - m_error_occured = NULL; + m_targets.push_back(apr_pstrdup(m_subpool.getPool(), path)); + m_error_occurred = NULL; } void Targets::add(const char *path) { - m_targets.push_back (path); + m_targets.push_back(path); } const apr_array_header_t *Targets::array(const SVN::Pool &pool) @@ -62,7 +62,7 @@ const apr_array_header_t *Targets::array(const SVN::Pool &pool) svn_error_t *err = JNIUtil::preprocessPath(tt, pool.getPool()); if (err != NULL) { - m_error_occured = err; + m_error_occurred = err; break; } m_targets.push_back(tt); @@ -72,9 +72,9 @@ const apr_array_header_t *Targets::array(const SVN::Pool &pool) std::vector<const char*>::const_iterator it; apr_pool_t *apr_pool = pool.getPool(); - apr_array_header_t *apr_targets = apr_array_make (apr_pool, - m_targets.size(), - sizeof(const char *)); + apr_array_header_t *apr_targets + = apr_array_make(apr_pool, static_cast<int>(m_targets.size()), + sizeof(const char *)); for (it = m_targets.begin(); it != m_targets.end(); ++it) { @@ -83,7 +83,7 @@ const apr_array_header_t *Targets::array(const SVN::Pool &pool) svn_error_t *err = JNIUtil::preprocessPath(target, pool.getPool()); if (err != NULL) { - m_error_occured = err; + m_error_occurred = err; break; } APR_ARRAY_PUSH(apr_targets, const char *) = target; @@ -96,10 +96,10 @@ Targets::Targets(StringArray &strArray, SVN::Pool &in_pool) : m_subpool(in_pool) { m_strArray = &strArray; - m_error_occured = NULL; + m_error_occurred = NULL; } -svn_error_t *Targets::error_occured() +svn_error_t *Targets::error_occurred() { - return m_error_occured; + return m_error_occurred; } |