diff options
| -rw-r--r-- | src/svnqt/CMakeLists.txt.orig | 171 | ||||
| -rw-r--r-- | src/svnqt/LICENSE_SVN | 274 | ||||
| -rw-r--r-- | src/svnqt/client_impl.cpp | 45 | ||||
| -rw-r--r-- | src/svnqt/client_impl.hpp | 19 | ||||
| -rw-r--r-- | src/svnqt/client_ls.cpp | 19 | ||||
| -rw-r--r-- | src/svnqt/client_status.cpp | 13 |
6 files changed, 350 insertions, 191 deletions
diff --git a/src/svnqt/CMakeLists.txt.orig b/src/svnqt/CMakeLists.txt.orig deleted file mode 100644 index d33c851..0000000 --- a/src/svnqt/CMakeLists.txt.orig +++ /dev/null @@ -1,171 +0,0 @@ -SET(SOURCES - apr.cpp - client_annotate.cpp - client_cat.cpp - client.cpp - client_diff.cpp - client_ls.cpp - client_modify.cpp - client_property.cpp - client_status.cpp - context.cpp - datetime.cpp - dirent.cpp - entry.cpp - exception.cpp - log_entry.cpp - path.cpp - pool.cpp - revision.cpp - status.cpp - targets.cpp - url.cpp - version_check.cpp - wc.cpp - lock_entry.cpp - client_lock.cpp - info_entry.cpp - client_impl.cpp - contextdata.cpp - commititem.cpp - repository.cpp - repositorydata.cpp - repositorylistener.cpp - svnstream.cpp - diff_data.cpp - svnfilestream.cpp - stringarray.cpp - diffoptions.cpp - conflictdescription.cpp - conflictresult.cpp - client_merge.cpp - cache/LogCache.cpp - cache/ReposLog.cpp - cache/DatabaseException.hpp - cache/DatabaseException.cpp - ) - - IF (SQLITE_FOUND) - MESSAGE(STATUS "Build own sqlite3 database modul") - SET(SOURCES - ${SOURCES} - cache/sqlite3/qsqlcachedresult.cpp - cache/sqlite3/qsql_sqlite3.cpp - cache/sqlite3/qsqlcachedresult.h - cache/sqlite3/qsql_sqlite3.h - ) - ELSE (SQLITE_FOUND) - MESSAGE(SEND_ERROR "The QT3 version requires sqlite3 but could not found") - ENDIF (SQLITE_FOUND) - -SET(CACHEINST_HEADERS - cache/LogCache.hpp - cache/ReposLog.hpp - cache/DatabaseException.hpp -) - -SET(INST_HEADERS - annotate_line.hpp - apr.hpp - check.hpp - client.hpp - commititem.hpp - context.hpp - context_listener.hpp - datetime.hpp - dirent.hpp - entry.hpp - exception.hpp - info_entry.hpp - lock_entry.hpp - log_entry.hpp - path.hpp - pool.hpp - repository.hpp - repositorylistener.hpp - revision.hpp - smart_pointer.hpp - shared_pointer.hpp - status.hpp - svnfilestream.hpp - svnstream.hpp - svnqttypes.hpp - targets.hpp - url.hpp - version_check.hpp - wc.hpp - stringarray.hpp - diffoptions.hpp - conflictdescription.hpp - conflictresult.hpp - ) - -FILE(GLOB svnhdr RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.hpp") -SET(svnhdr ${svnhdr} ${CACHE_INST_HEADERS}) - - - SET(TOUTF8 "utf8") - SET(FROMUTF8 "fromUtf8") - SET(QLIST "TQValueList") - SET(TOASCII "latin1") - SET(HOMEDIR "homeDirPath") - SET(QDATABASE "TQSqlDatabase*") - SET(QLONG "TQ_LLONG") - SET(svnqt-name svnqt) - -IF (HAVE_GCC_VISIBILITY) - SET(_SVNQT_EXPORT "__attribute__ ((visibility(\"default\")))") - SET(_SVNQT_NOEXPORT "__attribute__ ((visibility(\"hidden\")))") -ENDIF (HAVE_GCC_VISIBILITY) - -CONFIGURE_FILE( - "${CMAKE_CURRENT_SOURCE_DIR}/svnqt_defines.hpp.in" - "${CMAKE_CURRENT_BINARY_DIR}/svnqt_defines.hpp" - IMMEDIATE - @ONLY) - -SET(INST_HEADERS ${INST_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/svnqt_defines.hpp) -INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - -ADD_LIBRARY(${svnqt-name} SHARED ${SOURCES} ${svnhdr}) - SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib${LIB_SUFFIX}) - SET_TARGET_PROPERTIES(${svnqt-name} - PROPERTIES - COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) - -SET(LIB_MAJOR 4) -SET(LIB_MINOR 2) -SET(LIB_RELEASE 2) - -SET(_soversion ${LIB_MAJOR}.${LIB_MINOR}.${LIB_RELEASE}) - -SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES - SOVERSION ${LIB_MAJOR} - VERSION ${_soversion}) - -SET(ALL_LINKFLAGS ${APR_EXTRA_LIBFLAGS}) -SET(ALL_LINKFLAGS "${ALL_LINKFLAGS} ${APU_EXTRA_LIBFLAGS}") -SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}") -TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_LIBRARIES} ${SUBVERSION_ALL_LIBS}) - -IF (SQLITE_FOUND) - TARGET_LINK_LIBRARIES(${svnqt-name} ${SQLITE_LIBRARIES}) - INCLUDE_DIRECTORIES(SQLITE_INCLUDE_DIR) -ELSE (SQLITE_FOUND) - TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_QTSQL_LIBRARY}) -ENDIF (SQLITE_FOUND) - -# Just a small linking test -IF (BUILD_TESTS) - ADD_EXECUTABLE(testlink testmain.cpp) - TARGET_LINK_LIBRARIES(testlink ${svnqt-name}) -ENDIF (BUILD_TESTS) - - INSTALL(TARGETS ${svnqt-name} DESTINATION ${LIB_INSTALL_DIR}) - INSTALL(FILES ${INST_HEADERS} DESTINATION include/${svnqt-name}) - INSTALL(FILES ${CACHEINST_HEADERS} DESTINATION include/${svnqt-name}/cache) - -IF (BUILD_TESTS) - ADD_SUBDIRECTORY(tests) - ADD_SUBDIRECTORY(cache/test) -ENDIF (BUILD_TESTS) diff --git a/src/svnqt/LICENSE_SVN b/src/svnqt/LICENSE_SVN new file mode 100644 index 0000000..61d889a --- /dev/null +++ b/src/svnqt/LICENSE_SVN @@ -0,0 +1,274 @@ +A small section of code in client_impl.hpp and client_impl.cpp was taken and modified +from the source code of subversion 1.8.10, which is released under the following license. +--------------------------------------------------------------------------------- + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +SUBVERSION SUBCOMPONENTS: + +Subversion includes a number of subcomponents with separate copyright +notices and license terms. Your use of the source code for the these +subcomponents is subject to the terms and conditions of the following +licenses. + +For portions of the Python bindings test suite at +subversion/bindings/swig/python/tests/trac/: + + I. Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + + II. Copyright (C) 2003, 2004, 2005 Edgewall Software + Copyright (C) 2003, 2004, 2005 Jonas Borgström <[email protected]> + Copyright (C) 2005 Christopher Lenz <[email protected]> + + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + the documentation and/or other materials provided with the + distribution. + 3. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS + OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER + IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +For the file subversion/libsvn_subr/utf_width.c + + * Markus Kuhn -- 2007-05-26 (Unicode 5.0) + * + * Permission to use, copy, modify, and distribute this software + * for any purpose and without fee is hereby granted. The author + * disclaims all warranties with regard to this software. diff --git a/src/svnqt/client_impl.cpp b/src/svnqt/client_impl.cpp index 736afca..d138016 100644 --- a/src/svnqt/client_impl.cpp +++ b/src/svnqt/client_impl.cpp @@ -38,6 +38,51 @@ #include <tqmap.h> #include <tqstringlist.h> + +#if (!(SVN_VER_MAJOR == 1 && SVN_VER_MINOR <= 8)) +apr_array_header_t* svn_sort__hash(apr_hash_t *ht, + int (*comparison_func)(const svn_sort__item_t*, const svn_sort__item_t*), apr_pool_t *pool) +{ + apr_hash_index_t *hi; + apr_array_header_t *ary; + svn_boolean_t sorted; + svn_sort_item_type *prev_item; + + /* allocate an array with enough elements to hold all the keys. */ + ary = apr_array_make(pool, apr_hash_count(ht), sizeof(svn_sort_item_type)); + + /* loop over hash table and push all keys into the array */ + sorted = TRUE; + prev_item = NULL; + for (hi = apr_hash_first(pool, ht); hi; hi = apr_hash_next(hi)) + { + svn_sort_item_type *item = (svn_sort_item_type*)apr_array_push(ary); + apr_hash_this(hi, &item->key, &item->klen, &item->value); + + if (prev_item == NULL) + { + prev_item = item; + continue; + } + + if (sorted) + { + sorted = (comparison_func((svn_sort__item_t*)prev_item, (svn_sort__item_t*)item) < 0); + prev_item = item; + } + } + + /* quicksort the array if it isn't already sorted. */ + if (!sorted) + { + qsort(ary->elts, ary->nelts, ary->elt_size, + (int (*)(const void*, const void*))comparison_func); + } + + return ary; +} +#endif + namespace svn { diff --git a/src/svnqt/client_impl.hpp b/src/svnqt/client_impl.hpp index 4e2ea60..4760e39 100644 --- a/src/svnqt/client_impl.hpp +++ b/src/svnqt/client_impl.hpp @@ -31,6 +31,9 @@ #ifndef _SVNCPP_CLIENT_IMPL_H_ #define _SVNCPP_CLIENT_IMPL_H_ +#include "svn_sorts.h" +#include <svn_version.h> + #include "svnqt/client.hpp" #include "svnqt/svnqt_defines.hpp" @@ -46,6 +49,22 @@ class TQStringList; +#if (SVN_VER_MAJOR == 1 && SVN_VER_MINOR <= 8) +typedef svn_sort__item_t svn_sort_item_type; +#else +// Taken from subversion 1.8.10 source code and modified where needed + +// Same as svn_sort__item_t +typedef struct svn_sort_item_type { + const void *key; // pointer to the key + apr_ssize_t klen; // size of the key + void *value; // pointer to the value +} svn_sort_item_type; + +apr_array_header_t* svn_sort__hash(apr_hash_t *ht, + int (*comparison_func)(const svn_sort__item_t*, const svn_sort__item_t*), apr_pool_t *pool); +#endif + namespace svn { namespace stream { diff --git a/src/svnqt/client_ls.cpp b/src/svnqt/client_ls.cpp index cc4d178..054274c 100644 --- a/src/svnqt/client_ls.cpp +++ b/src/svnqt/client_ls.cpp @@ -38,7 +38,6 @@ // subversion api #include "svn_client.h" #include "svn_path.h" -#include "svn_sorts.h" //#include "svn_utf.h" #include "svnqt/dirent.hpp" @@ -47,12 +46,6 @@ #include "svnqt/helper.hpp" -static int -compare_items_as_paths (const svn_sort__item_t *a, const svn_sort__item_t *b) -{ - return svn_path_compare_paths ((const char *)a->key, (const char *)b->key); -} - namespace svn { @@ -82,7 +75,7 @@ namespace svn apr_array_header_t * array = svn_sort__hash ( - hash, compare_items_as_paths, pool); + hash, svn_sort_compare_items_as_paths, pool); DirEntries entries; @@ -90,9 +83,9 @@ namespace svn { const char *entryname; svn_dirent_t *dirent; - svn_sort__item_t *item; + svn_sort_item_type *item; - item = &APR_ARRAY_IDX (array, i, svn_sort__item_t); + item = &APR_ARRAY_IDX (array, i, svn_sort_item_type); entryname = static_cast<const char *>(item->key); @@ -131,7 +124,7 @@ namespace svn apr_array_header_t * array = svn_sort__hash ( - hash, compare_items_as_paths, pool); + hash, svn_sort_compare_items_as_paths, pool); DirEntries entries; @@ -140,9 +133,9 @@ namespace svn const char *entryname; svn_dirent_t *dirent; svn_lock_t * lockent; - svn_sort__item_t *item; + svn_sort_item_type *item; - item = &APR_ARRAY_IDX (array, i, svn_sort__item_t); + item = &APR_ARRAY_IDX (array, i, svn_sort_item_type); entryname = static_cast<const char *>(item->key); diff --git a/src/svnqt/client_status.cpp b/src/svnqt/client_status.cpp index 1c58610..4b437a3 100644 --- a/src/svnqt/client_status.cpp +++ b/src/svnqt/client_status.cpp @@ -38,7 +38,6 @@ // Subversion api #include "svn_client.h" -#include "svn_sorts.h" #include "svn_path.h" //#include "svn_utf.h" @@ -334,11 +333,11 @@ namespace svn /* Loop over array, printing each name/status-structure */ for (i = 0; i < statusarray->nelts; ++i) { - const svn_sort__item_t *item; + const svn_sort_item_type *item; const char *filePath; svn_wc_status2_t *status = NULL; - item = &APR_ARRAY_IDX (statusarray, i, const svn_sort__item_t); + item = &APR_ARRAY_IDX (statusarray, i, const svn_sort_item_type); status = (svn_wc_status2_t *) item->value; filePath = (const char *) item->key; @@ -462,11 +461,11 @@ namespace svn apr_array_header_t *statusarray = svn_sort__hash (status_hash, svn_sort_compare_items_as_paths, pool); - const svn_sort__item_t *item; + const svn_sort_item_type *item; const char *filePath; svn_wc_status2_t *status = NULL; - item = &APR_ARRAY_IDX (statusarray, 0, const svn_sort__item_t); + item = &APR_ARRAY_IDX (statusarray, 0, const svn_sort_item_type); status = (svn_wc_status2_t *) item->value; filePath = (const char *) item->key; @@ -715,9 +714,9 @@ namespace svn /* Loop over array, printing each name/status-structure */ for (i=0; i< statusarray->nelts; ++i) { - const svn_sort__item_t *item; + const svn_sort_item_type *item; InfoEntry*e = NULL; - item = &APR_ARRAY_IDX (statusarray, i, const svn_sort__item_t); + item = &APR_ARRAY_IDX (statusarray, i, const svn_sort_item_type); e = (InfoEntry *) item->value; ientries.push_back(*e); delete e; |