svn commit: r1713440 - in /subversion/branches/move-tracking-2/subversion: include/private/svn_branch_impl.h libsvn_delta/branch.c libsvn_delta/branch_compat.c libsvn_delta/branch_nested.c libsvn_delta/branch_private.h

[ju...@apache.org]

Author: julianfoad
Date: Mon Nov  9 14:27:15 2015
New Revision: 1713440

URL: http://svn.apache.org/viewvc?rev=1713440&view=rev
Log:
On the 'move-tracking-2' branch: Refactoring: Allow public subclassing of
branch classes.

* subversion/include/private/svn_branch_impl.h
  Rename and move...

* subversion/libsvn_delta/branch_private.h
  ... from here.

* subversion/libsvn_delta/branch.c,
  subversion/libsvn_delta/branch_compat.c,
  subversion/libsvn_delta/branch_nested.c
  Update the '#include'.

Added:
    subversion/branches/move-tracking-2/subversion/include/private/svn_branch_impl.h
      - copied, changed from r1713431, subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_private.h
Removed:
    subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_private.h
Modified:
    subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
    subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_compat.c
    subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_nested.c

Copied: subversion/branches/move-tracking-2/subversion/include/private/svn_branch_impl.h (from r1713431, subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_private.h)
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_branch_impl.h?p2=subversion/branches/move-tracking-2/subversion/include/private/svn_branch_impl.h&p1=subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_private.h&r1=1713431&r2=1713440&rev=1713440&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_private.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_branch_impl.h Mon Nov  9 14:27:15 2015
@@ -20,16 +20,18 @@
  * ====================================================================
  * @endcopyright
  *
- * @file branch_private.h
- * @brief Nested branches and subbranch-root elements
+ * @file svn_branch_impl.h
+ * @brief Declarations needed by implementators of branch classes
  *
  * @since New in 1.10.
  */
 
-#ifndef BRANCH_PRIVATE_H
-#define	BRANCH_PRIVATE_H
+#ifndef SVN_BRANCH_IMPL_H
+#define SVN_BRANCH_IMPL_H
 
-#ifdef	__cplusplus
+#include "private/svn_branch.h"
+
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -212,9 +214,9 @@ struct svn_branch_state_vtable_t
 };
 
 
-#ifdef	__cplusplus
+#ifdef __cplusplus
 }
 #endif
 
-#endif	/* BRANCH_PRIVATE_H */
+#endif /* SVN_BRANCH_IMPL_H */
 

Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c?rev=1713440&r1=1713439&r2=1713440&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Mon Nov  9 14:27:15 2015
@@ -32,10 +32,9 @@
 
 #include "private/svn_element.h"
 #include "private/svn_branch.h"
+#include "private/svn_branch_impl.h"
 #include "private/svn_sorts_private.h"
 
-#include "branch_private.h"
-
 #include "svn_private_config.h"
 
 

Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_compat.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_compat.c?rev=1713440&r1=1713439&r2=1713440&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_compat.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_compat.c Mon Nov  9 14:27:15 2015
@@ -31,14 +31,13 @@
 #include "svn_props.h"
 #include "svn_pools.h"
 
+#include "private/svn_branch_impl.h"
 #include "private/svn_branch_repos.h"
 #include "private/svn_branch_nested.h"
 #include "private/svn_delta_private.h"
 #include "private/svn_branch_compat.h"
 #include "../libsvn_delta/debug_editor.h"
 
-#include "branch_private.h"
-
 #include "svn_private_config.h"
 
 

Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_nested.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_nested.c?rev=1713440&r1=1713439&r2=1713440&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_nested.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_nested.c Mon Nov  9 14:27:15 2015
@@ -31,10 +31,9 @@
 #include "svn_pools.h"
 
 #include "private/svn_branch_nested.h"
+#include "private/svn_branch_impl.h"
 #include "private/svn_branch_repos.h"
 
-#include "branch_private.h"
-
 #include "svn_private_config.h"