Author: brane Date: Fri Jul 26 20:00:31 2013 New Revision: 1507415 URL: http://svn.apache.org/r1507415 Log: Fix private header name clash in C++HL.
* build.conf (private-includes): Add subversion/bindings/cxxhl/src/private/*.hpp. * subversion/bindings/cxxhl/src/private/exception-private.hpp: Renamed from exception.hpp * subversion/bindings/cxxhl/src/cxxhl-private.hpp: Update include directive. Added: subversion/trunk/subversion/bindings/cxxhl/src/private/exception-private.hpp - copied unchanged from r1507413, subversion/trunk/subversion/bindings/cxxhl/src/private/exception.hpp Removed: subversion/trunk/subversion/bindings/cxxhl/src/private/exception.hpp Modified: subversion/trunk/build.conf subversion/trunk/subversion/bindings/cxxhl/src/cxxhl-private.hpp Modified: subversion/trunk/build.conf URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1507415&r1=1507414&r2=1507415&view=diff ============================================================================== --- subversion/trunk/build.conf (original) +++ subversion/trunk/build.conf Fri Jul 26 20:00:31 2013 @@ -42,6 +42,7 @@ private-includes = subversion/bindings/cxxhl/include/svncxxhl/*.hpp subversion/bindings/cxxhl/src/*.hpp subversion/bindings/cxxhl/src/aprwrap/*.hpp + subversion/bindings/cxxhl/src/private/*.hpp subversion/libsvn_subr/utf8proc/utf8proc.h subversion/libsvn_subr/utf8proc/utf8proc.c subversion/libsvn_subr/utf8proc/utf8proc_data.c Modified: subversion/trunk/subversion/bindings/cxxhl/src/cxxhl-private.hpp URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/cxxhl/src/cxxhl-private.hpp?rev=1507415&r1=1507414&r2=1507415&view=diff ============================================================================== --- subversion/trunk/subversion/bindings/cxxhl/src/cxxhl-private.hpp (original) +++ subversion/trunk/subversion/bindings/cxxhl/src/cxxhl-private.hpp Fri Jul 26 20:00:31 2013 @@ -24,6 +24,6 @@ #ifndef SVN_CXXHL_PRIVATE_PRIVATE_H #define SVN_CXXHL_PRIVATE_PRIVATE_H -#include "private/exception.hpp" +#include "private/exception-private.hpp" #endif // SVN_CXXHL_PRIVATE_PRIVATE_H