diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2015-10-18 17:00:26 +0700 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2015-10-19 21:43:07 +0700 |
| commit | e6650503faaec336fca836b99763c5fd41a8ddb2 (patch) | |
| tree | 412fba593b9d456c0e76cd9fcc951e4bd97608d9 /src/svnqt/client_status.cpp | |
| parent | 26944d84f6234cab2705ceb41bf2e54dfddee1c4 (diff) | |
| download | tdesvn-e6650503faaec336fca836b99763c5fd41a8ddb2.tar.gz tdesvn-e6650503faaec336fca836b99763c5fd41a8ddb2.zip | |
Fixed FTBFS introduced by subversion 1.9. This relates to bug 2528.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit e42c18959be00a4ec623e53d7025ed13ced90adf)
Diffstat (limited to 'src/svnqt/client_status.cpp')
| -rw-r--r-- | src/svnqt/client_status.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
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; |