You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2013/03/20 21:32:42 UTC
svn commit: r1459034 - /subversion/trunk/subversion/svn/notify.c
Author: julianfoad
Date: Wed Mar 20 20:32:41 2013
New Revision: 1459034
URL: http://svn.apache.org/r1459034
Log:
* subversion/svn/notify.c
(svn_cl__notifier_reset_conflict_stats): Following r1459012, use
svn_hash__clear() instead of apr_hash_clear() because the latter is
only available since APR 1.3.
Modified:
subversion/trunk/subversion/svn/notify.c
Modified: subversion/trunk/subversion/svn/notify.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/notify.c?rev=1459034&r1=1459033&r2=1459034&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/notify.c (original)
+++ subversion/trunk/subversion/svn/notify.c Wed Mar 20 20:32:41 2013
@@ -38,6 +38,7 @@
#include "svn_sorts.h"
#include "svn_hash.h"
#include "cl.h"
+#include "private/svn_subr_private.h"
#include "svn_private_config.h"
@@ -77,9 +78,9 @@ svn_cl__notifier_reset_conflict_stats(vo
{
struct notify_baton *nb = baton;
- apr_hash_clear(nb->text_conflicts);
- apr_hash_clear(nb->prop_conflicts);
- apr_hash_clear(nb->tree_conflicts);
+ SVN_ERR(svn_hash__clear(nb->text_conflicts, nb->stats_pool));
+ SVN_ERR(svn_hash__clear(nb->prop_conflicts, nb->stats_pool));
+ SVN_ERR(svn_hash__clear(nb->tree_conflicts, nb->stats_pool));
nb->text_conflicts_resolved = 0;
nb->prop_conflicts_resolved = 0;
nb->tree_conflicts_resolved = 0;