You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2018/12/28 14:08:54 UTC
svn commit: r1849858 - in /subversion/trunk/subversion/bindings/cxx: src/
src/private/ tests/
Author: brane
Date: Fri Dec 28 14:08:54 2018
New Revision: 1849858
URL: http://svn.apache.org/viewvc?rev=1849858&view=rev
Log:
Move SVN++ implementation details to the 'impl' namespace, as documented.
(Affects lots of files; no functional change.)
Modified:
subversion/trunk/subversion/bindings/cxx/src/depth.cpp
subversion/trunk/subversion/bindings/cxx/src/exception.cpp
subversion/trunk/subversion/bindings/cxx/src/private/depth_private.hpp
subversion/trunk/subversion/bindings/cxx/src/private/exception_private.hpp
subversion/trunk/subversion/bindings/cxx/src/private/init_private.hpp
subversion/trunk/subversion/bindings/cxx/src/private/revision_private.hpp
subversion/trunk/subversion/bindings/cxx/src/private/strings_private.hpp
subversion/trunk/subversion/bindings/cxx/src/private/tristate_private.hpp
subversion/trunk/subversion/bindings/cxx/src/revision.cpp
subversion/trunk/subversion/bindings/cxx/tests/test_depth.cpp
subversion/trunk/subversion/bindings/cxx/tests/test_exceptions.cpp
subversion/trunk/subversion/bindings/cxx/tests/test_revision.cpp
subversion/trunk/subversion/bindings/cxx/tests/test_strings.cpp
subversion/trunk/subversion/bindings/cxx/tests/test_tristate.cpp
Modified: subversion/trunk/subversion/bindings/cxx/src/depth.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/cxx/src/depth.cpp?rev=1849858&r1=1849857&r2=1849858&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/cxx/src/depth.cpp (original)
+++ subversion/trunk/subversion/bindings/cxx/src/depth.cpp Fri Dec 28 14:08:54 2018
@@ -32,25 +32,25 @@ namespace svnxx {
std::string to_string(depth d)
{
- return std::string(svn_depth_to_word(detail::convert(d)));
+ return std::string(svn_depth_to_word(impl::convert(d)));
}
std::wstring to_wstring(depth d)
{
- return detail::convert<wchar_t>(svn_depth_to_word(detail::convert(d)));
+ return impl::convert<wchar_t>(svn_depth_to_word(impl::convert(d)));
}
std::u16string to_u16string(depth d)
{
- return detail::convert<char16_t>(svn_depth_to_word(detail::convert(d)));
+ return impl::convert<char16_t>(svn_depth_to_word(impl::convert(d)));
}
std::u32string to_u32string(depth d)
{
- return detail::convert<char32_t>(svn_depth_to_word(detail::convert(d)));
+ return impl::convert<char32_t>(svn_depth_to_word(impl::convert(d)));
}
-namespace detail {
+namespace impl {
svn_depth_t convert(depth d)
{
@@ -136,7 +136,7 @@ depth convert(svn_depth_t d)
return depth(d);
}
-} // namespace detail
+} // namespace impl
} // namespace svnxx
} // namespace subversion
} // namespace apache
Modified: subversion/trunk/subversion/bindings/cxx/src/exception.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/cxx/src/exception.cpp?rev=1849858&r1=1849857&r2=1849858&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/cxx/src/exception.cpp (original)
+++ subversion/trunk/subversion/bindings/cxx/src/exception.cpp Fri Dec 28 14:08:54 2018
@@ -37,16 +37,22 @@ namespace apache {
namespace subversion {
namespace svnxx {
+namespace detail {
+struct svn_error final : svn_error_t {};
+} // namespace detail
+
+
//
// checked_call
//
-namespace detail {
-
-struct svn_error final : svn_error_t {};
+namespace impl {
void checked_call(svn_error_t* const err)
{
+ using svn_error = detail::svn_error;
+ using error_ptr = detail::error_ptr;
+
if (!err)
return;
@@ -80,7 +86,7 @@ void checked_call(svn_error_t* const err
throw error_builder(err_ptr);
}
-} // namespace detail
+} // namespace impl
//
// Class error
Modified: subversion/trunk/subversion/bindings/cxx/src/private/depth_private.hpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/cxx/src/private/depth_private.hpp?rev=1849858&r1=1849857&r2=1849858&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/cxx/src/private/depth_private.hpp (original)
+++ subversion/trunk/subversion/bindings/cxx/src/private/depth_private.hpp Fri Dec 28 14:08:54 2018
@@ -31,7 +31,7 @@
namespace apache {
namespace subversion {
namespace svnxx {
-namespace detail {
+namespace impl {
/**
* Convert @a d to an svn_depth_t.
@@ -43,7 +43,7 @@ svn_depth_t convert(depth d);
*/
depth convert(svn_depth_t d);
-} // namespace detail
+} // namespace impl
} // namespace svnxx
} // namespace subversion
} // namespace apache
Modified: subversion/trunk/subversion/bindings/cxx/src/private/exception_private.hpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/cxx/src/private/exception_private.hpp?rev=1849858&r1=1849857&r2=1849858&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/cxx/src/private/exception_private.hpp (original)
+++ subversion/trunk/subversion/bindings/cxx/src/private/exception_private.hpp Fri Dec 28 14:08:54 2018
@@ -28,12 +28,14 @@
#ifndef SVNXX_PRIVATE_EXCEPTION_HPP
#define SVNXX_PRIVATE_EXCEPTION_HPP
+#include "svnxx/exception.hpp"
+
#include "svn_error.h"
namespace apache {
namespace subversion {
namespace svnxx {
-namespace detail {
+namespace impl {
/**
* Given a @a err, if it is not @c nullptr, convert it to a and throw an
@@ -49,7 +51,8 @@ inline svn_error_t* iteration_etopped()
{
return svn_error_create(SVN_ERR_ITER_BREAK, nullptr, nullptr);
}
-} // namespace detail
+
+} // namespace impl
} // namespace svnxx
} // namespace subversion
} // namespace apache
Modified: subversion/trunk/subversion/bindings/cxx/src/private/init_private.hpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/cxx/src/private/init_private.hpp?rev=1849858&r1=1849857&r2=1849858&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/cxx/src/private/init_private.hpp (original)
+++ subversion/trunk/subversion/bindings/cxx/src/private/init_private.hpp Fri Dec 28 14:08:54 2018
@@ -21,10 +21,6 @@
* @endcopyright
*/
-#ifndef __cplusplus
-#error "This is a C++ header file."
-#endif
-
#ifndef SVNXX_PRIVATE_INIT_HPP
#define SVNXX_PRIVATE_INIT_HPP
Modified: subversion/trunk/subversion/bindings/cxx/src/private/revision_private.hpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/cxx/src/private/revision_private.hpp?rev=1849858&r1=1849857&r2=1849858&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/cxx/src/private/revision_private.hpp (original)
+++ subversion/trunk/subversion/bindings/cxx/src/private/revision_private.hpp Fri Dec 28 14:08:54 2018
@@ -32,7 +32,7 @@
namespace apache {
namespace subversion {
namespace svnxx {
-namespace detail {
+namespace impl {
/**
* Convert @a kind to an svn_opt_revision_kind.
@@ -54,7 +54,7 @@ svn_opt_revision_t convert(const revisio
*/
revision convert(const svn_opt_revision_t& rev);
-} // namespace detail
+} // namespace impl
} // namespace svnxx
} // namespace subversion
} // namespace apache
Modified: subversion/trunk/subversion/bindings/cxx/src/private/strings_private.hpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/cxx/src/private/strings_private.hpp?rev=1849858&r1=1849857&r2=1849858&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/cxx/src/private/strings_private.hpp (original)
+++ subversion/trunk/subversion/bindings/cxx/src/private/strings_private.hpp Fri Dec 28 14:08:54 2018
@@ -32,7 +32,7 @@
namespace apache {
namespace subversion {
namespace svnxx {
-namespace detail {
+namespace impl {
namespace {
// Define codecvt types for our various converters.
@@ -98,7 +98,7 @@ inline std::string convert(const std::ba
return converter<C>().to_bytes(str);
}
-} // namespace detail
+} // namespace impl
} // namespace svnxx
} // namespace subversion
} // namespace apache
Modified: subversion/trunk/subversion/bindings/cxx/src/private/tristate_private.hpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/cxx/src/private/tristate_private.hpp?rev=1849858&r1=1849857&r2=1849858&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/cxx/src/private/tristate_private.hpp (original)
+++ subversion/trunk/subversion/bindings/cxx/src/private/tristate_private.hpp Fri Dec 28 14:08:54 2018
@@ -34,7 +34,7 @@
namespace apache {
namespace subversion {
namespace svnxx {
-namespace detail {
+namespace impl {
/**
* Converts an @c svn_tristate_t value to a @c tristate value.
@@ -55,7 +55,7 @@ inline constexpr svn_tristate_t convert(
: (!t ? svn_tristate_false : svn_tristate_unknown));
}
-} // namespace detail
+} // namespace impl
} // namespace svnxx
} // namespace subversion
} // namespace apache
Modified: subversion/trunk/subversion/bindings/cxx/src/revision.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/cxx/src/revision.cpp?rev=1849858&r1=1849857&r2=1849858&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/cxx/src/revision.cpp (original)
+++ subversion/trunk/subversion/bindings/cxx/src/revision.cpp Fri Dec 28 14:08:54 2018
@@ -28,7 +28,7 @@
namespace apache {
namespace subversion {
namespace svnxx {
-namespace detail {
+namespace impl {
svn_opt_revision_kind convert(revision::kind kind)
{
@@ -169,7 +169,7 @@ revision convert(const svn_opt_revision_
}
}
-} // namespace detail
+} // namespace impl
} // namespace svnxx
} // namespace subversion
} // namespace apache
Modified: subversion/trunk/subversion/bindings/cxx/tests/test_depth.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/cxx/tests/test_depth.cpp?rev=1849858&r1=1849857&r2=1849858&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/cxx/tests/test_depth.cpp (original)
+++ subversion/trunk/subversion/bindings/cxx/tests/test_depth.cpp Fri Dec 28 14:08:54 2018
@@ -24,28 +24,28 @@
#include "../src/private/depth_private.hpp"
namespace svn = ::apache::subversion::svnxx;
-namespace detail = ::apache::subversion::svnxx::detail;
+namespace impl = ::apache::subversion::svnxx::impl;
BOOST_AUTO_TEST_SUITE(depth);
BOOST_AUTO_TEST_CASE(convert_to)
{
- BOOST_TEST((detail::convert(svn::depth::unknown) == svn_depth_unknown));
- BOOST_TEST((detail::convert(svn::depth::exclude) == svn_depth_exclude));
- BOOST_TEST((detail::convert(svn::depth::empty) == svn_depth_empty));
- BOOST_TEST((detail::convert(svn::depth::files) == svn_depth_files));
- BOOST_TEST((detail::convert(svn::depth::immediates) == svn_depth_immediates));
- BOOST_TEST((detail::convert(svn::depth::infinity) == svn_depth_infinity));
+ BOOST_TEST((impl::convert(svn::depth::unknown) == svn_depth_unknown));
+ BOOST_TEST((impl::convert(svn::depth::exclude) == svn_depth_exclude));
+ BOOST_TEST((impl::convert(svn::depth::empty) == svn_depth_empty));
+ BOOST_TEST((impl::convert(svn::depth::files) == svn_depth_files));
+ BOOST_TEST((impl::convert(svn::depth::immediates) == svn_depth_immediates));
+ BOOST_TEST((impl::convert(svn::depth::infinity) == svn_depth_infinity));
}
BOOST_AUTO_TEST_CASE(convert_from)
{
- BOOST_TEST((detail::convert(svn_depth_unknown) == svn::depth::unknown));
- BOOST_TEST((detail::convert(svn_depth_exclude) == svn::depth::exclude));
- BOOST_TEST((detail::convert(svn_depth_empty) == svn::depth::empty));
- BOOST_TEST((detail::convert(svn_depth_files) == svn::depth::files));
- BOOST_TEST((detail::convert(svn_depth_immediates) == svn::depth::immediates));
- BOOST_TEST((detail::convert(svn_depth_infinity) == svn::depth::infinity));
+ BOOST_TEST((impl::convert(svn_depth_unknown) == svn::depth::unknown));
+ BOOST_TEST((impl::convert(svn_depth_exclude) == svn::depth::exclude));
+ BOOST_TEST((impl::convert(svn_depth_empty) == svn::depth::empty));
+ BOOST_TEST((impl::convert(svn_depth_files) == svn::depth::files));
+ BOOST_TEST((impl::convert(svn_depth_immediates) == svn::depth::immediates));
+ BOOST_TEST((impl::convert(svn_depth_infinity) == svn::depth::infinity));
}
BOOST_AUTO_TEST_CASE(char_names)
Modified: subversion/trunk/subversion/bindings/cxx/tests/test_exceptions.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/cxx/tests/test_exceptions.cpp?rev=1849858&r1=1849857&r2=1849858&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/cxx/tests/test_exceptions.cpp (original)
+++ subversion/trunk/subversion/bindings/cxx/tests/test_exceptions.cpp Fri Dec 28 14:08:54 2018
@@ -26,10 +26,10 @@
#include <ios>
#include <iostream>
-#include "svnxx.hpp"
-#include "../src/private.hpp"
+#include "../src/private/exception_private.hpp"
-#include "svn_error.h"
+namespace svn = ::apache::subversion::svnxx;
+namespace impl = ::apache::subversion::svnxx::impl;
#include "fixture_init.hpp"
@@ -53,19 +53,19 @@ svn_error_t* make_error_test_error()
BOOST_AUTO_TEST_CASE(thrown_error)
{
BOOST_CHECK_THROW(
- svn::detail::checked_call(make_error_test_error()),
+ impl::checked_call(make_error_test_error()),
svn::error);
}
BOOST_AUTO_TEST_CASE(catch_error)
{
BOOST_CHECK_THROW(
- svn::detail::checked_call(make_error_test_error()),
+ impl::checked_call(make_error_test_error()),
svn::error);
try
{
- svn::detail::checked_call(make_error_test_error());
+ impl::checked_call(make_error_test_error());
}
catch (const svn::error& err)
{
@@ -109,7 +109,7 @@ BOOST_AUTO_TEST_CASE(propagate_error)
std::exception_ptr xptr;
try
{
- svn::detail::checked_call(make_error_test_error());
+ impl::checked_call(make_error_test_error());
}
catch (...)
{
@@ -137,7 +137,7 @@ svn_error_t* make_cancel_test_error()
BOOST_AUTO_TEST_CASE(thtrown_cancelled)
{
BOOST_CHECK_THROW(
- svn::detail::checked_call(make_cancel_test_error()),
+ impl::checked_call(make_cancel_test_error()),
svn::cancelled);
}
@@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE(catch_cancelled)
{
try
{
- svn::detail::checked_call(make_cancel_test_error());
+ impl::checked_call(make_cancel_test_error());
}
catch (const svn::cancelled& err)
{
@@ -189,7 +189,7 @@ BOOST_AUTO_TEST_CASE(propagate_cancelled
std::exception_ptr xptr;
try
{
- svn::detail::checked_call(make_cancel_test_error());
+ impl::checked_call(make_cancel_test_error());
}
catch (...)
{
@@ -202,7 +202,7 @@ BOOST_AUTO_TEST_CASE(propagate_cancelled
BOOST_AUTO_TEST_CASE(iteration_stopped_cancels)
{
BOOST_CHECK_THROW(
- svn::detail::checked_call(svn::detail::iteration_etopped()),
+ impl::checked_call(impl::iteration_etopped()),
svn::cancelled);
}
@@ -210,7 +210,7 @@ BOOST_AUTO_TEST_CASE(iteration_stopped)
{
try
{
- svn::detail::checked_call(svn::detail::iteration_etopped());
+ impl::checked_call(impl::iteration_etopped());
}
catch (const svn::cancelled& err)
{
Modified: subversion/trunk/subversion/bindings/cxx/tests/test_revision.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/cxx/tests/test_revision.cpp?rev=1849858&r1=1849857&r2=1849858&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/cxx/tests/test_revision.cpp (original)
+++ subversion/trunk/subversion/bindings/cxx/tests/test_revision.cpp Fri Dec 28 14:08:54 2018
@@ -26,34 +26,34 @@
#include "../src/private/revision_private.hpp"
namespace svn = ::apache::subversion::svnxx;
-namespace detail = ::apache::subversion::svnxx::detail;
+namespace impl = ::apache::subversion::svnxx::impl;
BOOST_AUTO_TEST_SUITE(revision);
BOOST_AUTO_TEST_CASE(convert_to_kind)
{
using kind = svn::revision::kind;
- BOOST_TEST((detail::convert(kind::unspecified) == svn_opt_revision_unspecified));
- BOOST_TEST((detail::convert(kind::number) == svn_opt_revision_number));
- BOOST_TEST((detail::convert(kind::date) == svn_opt_revision_date));
- BOOST_TEST((detail::convert(kind::committed) == svn_opt_revision_committed));
- BOOST_TEST((detail::convert(kind::previous) == svn_opt_revision_previous));
- BOOST_TEST((detail::convert(kind::base) == svn_opt_revision_base));
- BOOST_TEST((detail::convert(kind::working) == svn_opt_revision_working));
- BOOST_TEST((detail::convert(kind::head) == svn_opt_revision_head));
+ BOOST_TEST((impl::convert(kind::unspecified) == svn_opt_revision_unspecified));
+ BOOST_TEST((impl::convert(kind::number) == svn_opt_revision_number));
+ BOOST_TEST((impl::convert(kind::date) == svn_opt_revision_date));
+ BOOST_TEST((impl::convert(kind::committed) == svn_opt_revision_committed));
+ BOOST_TEST((impl::convert(kind::previous) == svn_opt_revision_previous));
+ BOOST_TEST((impl::convert(kind::base) == svn_opt_revision_base));
+ BOOST_TEST((impl::convert(kind::working) == svn_opt_revision_working));
+ BOOST_TEST((impl::convert(kind::head) == svn_opt_revision_head));
}
BOOST_AUTO_TEST_CASE(convert_from_kind)
{
using kind = svn::revision::kind;
- BOOST_TEST((detail::convert(svn_opt_revision_unspecified) == kind::unspecified));
- BOOST_TEST((detail::convert(svn_opt_revision_number) == kind::number));
- BOOST_TEST((detail::convert(svn_opt_revision_date) == kind::date));
- BOOST_TEST((detail::convert(svn_opt_revision_committed) == kind::committed));
- BOOST_TEST((detail::convert(svn_opt_revision_previous) == kind::previous));
- BOOST_TEST((detail::convert(svn_opt_revision_base) == kind::base));
- BOOST_TEST((detail::convert(svn_opt_revision_working) == kind::working));
- BOOST_TEST((detail::convert(svn_opt_revision_head) == kind::head));
+ BOOST_TEST((impl::convert(svn_opt_revision_unspecified) == kind::unspecified));
+ BOOST_TEST((impl::convert(svn_opt_revision_number) == kind::number));
+ BOOST_TEST((impl::convert(svn_opt_revision_date) == kind::date));
+ BOOST_TEST((impl::convert(svn_opt_revision_committed) == kind::committed));
+ BOOST_TEST((impl::convert(svn_opt_revision_previous) == kind::previous));
+ BOOST_TEST((impl::convert(svn_opt_revision_base) == kind::base));
+ BOOST_TEST((impl::convert(svn_opt_revision_working) == kind::working));
+ BOOST_TEST((impl::convert(svn_opt_revision_head) == kind::head));
}
BOOST_AUTO_TEST_CASE(roundtrip_conversions)
@@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE(roundtrip_conversio
};
for (const auto& r : data)
- BOOST_TEST((detail::convert(detail::convert(r)) == r));
+ BOOST_TEST((impl::convert(impl::convert(r)) == r));
}
BOOST_AUTO_TEST_CASE(preconditions)
Modified: subversion/trunk/subversion/bindings/cxx/tests/test_strings.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/cxx/tests/test_strings.cpp?rev=1849858&r1=1849857&r2=1849858&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/cxx/tests/test_strings.cpp (original)
+++ subversion/trunk/subversion/bindings/cxx/tests/test_strings.cpp Fri Dec 28 14:08:54 2018
@@ -162,7 +162,7 @@ inline std::vector<std::basic_string<C>>
#include "fixture_init.hpp"
namespace svn = ::apache::subversion::svnxx;
-namespace detail = ::apache::subversion::svnxx::detail;
+namespace impl = ::apache::subversion::svnxx::impl;
BOOST_AUTO_TEST_SUITE(strings,
* boost::unit_test::fixture<init>());
@@ -170,19 +170,19 @@ BOOST_AUTO_TEST_SUITE(strings,
BOOST_AUTO_TEST_CASE(wstring_conversion_roundtrip)
{
for (const auto& sample : generate_string_data<wchar_t>(100))
- BOOST_TEST((sample == detail::convert<wchar_t>(detail::convert(sample))));
+ BOOST_TEST((sample == impl::convert<wchar_t>(impl::convert(sample))));
}
BOOST_AUTO_TEST_CASE(u16string_conversion_roundtrip)
{
for (const auto& sample : generate_string_data<char16_t>(100))
- BOOST_TEST((sample == detail::convert<char16_t>(detail::convert(sample))));
+ BOOST_TEST((sample == impl::convert<char16_t>(impl::convert(sample))));
}
BOOST_AUTO_TEST_CASE(u32string_conversion_roundtrip)
{
for (const auto& sample : generate_string_data<char32_t>(100))
- BOOST_TEST((sample == detail::convert<char32_t>(detail::convert(sample))));
+ BOOST_TEST((sample == impl::convert<char32_t>(impl::convert(sample))));
}
BOOST_AUTO_TEST_CASE(nulchar)
@@ -197,21 +197,21 @@ BOOST_AUTO_TEST_CASE(nulchar)
BOOST_TEST(u16nulstr.size() == 1);
BOOST_TEST(u32nulstr.size() == 1);
- BOOST_TEST(detail::convert<wchar_t>(nulstr).size() == 1);
- BOOST_TEST(detail::convert<char16_t>(nulstr).size() == 1);
- BOOST_TEST(detail::convert<char32_t>(nulstr).size() == 1);
-
- BOOST_TEST((detail::convert<wchar_t>(nulstr) == wnulstr));
- BOOST_TEST((detail::convert<char16_t>(nulstr) == u16nulstr));
- BOOST_TEST((detail::convert<char32_t>(nulstr) == u32nulstr));
-
- BOOST_TEST(detail::convert(wnulstr).size() == 1);
- BOOST_TEST(detail::convert(u16nulstr).size() == 1);
- BOOST_TEST(detail::convert(u32nulstr).size() == 1);
-
- BOOST_TEST((detail::convert(wnulstr) == nulstr));
- BOOST_TEST((detail::convert(u16nulstr) == nulstr));
- BOOST_TEST((detail::convert(u32nulstr) == nulstr));
+ BOOST_TEST(impl::convert<wchar_t>(nulstr).size() == 1);
+ BOOST_TEST(impl::convert<char16_t>(nulstr).size() == 1);
+ BOOST_TEST(impl::convert<char32_t>(nulstr).size() == 1);
+
+ BOOST_TEST((impl::convert<wchar_t>(nulstr) == wnulstr));
+ BOOST_TEST((impl::convert<char16_t>(nulstr) == u16nulstr));
+ BOOST_TEST((impl::convert<char32_t>(nulstr) == u32nulstr));
+
+ BOOST_TEST(impl::convert(wnulstr).size() == 1);
+ BOOST_TEST(impl::convert(u16nulstr).size() == 1);
+ BOOST_TEST(impl::convert(u32nulstr).size() == 1);
+
+ BOOST_TEST((impl::convert(wnulstr) == nulstr));
+ BOOST_TEST((impl::convert(u16nulstr) == nulstr));
+ BOOST_TEST((impl::convert(u32nulstr) == nulstr));
}
BOOST_AUTO_TEST_SUITE_END();
Modified: subversion/trunk/subversion/bindings/cxx/tests/test_tristate.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/cxx/tests/test_tristate.cpp?rev=1849858&r1=1849857&r2=1849858&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/cxx/tests/test_tristate.cpp (original)
+++ subversion/trunk/subversion/bindings/cxx/tests/test_tristate.cpp Fri Dec 28 14:08:54 2018
@@ -23,7 +23,7 @@
#include "../src/private/tristate_private.hpp"
namespace svn = ::apache::subversion::svnxx;
-namespace detail = ::apache::subversion::svnxx::detail;
+namespace impl = ::apache::subversion::svnxx::impl;
namespace {
constexpr auto T = svn::tristate(true);
@@ -51,13 +51,13 @@ BOOST_AUTO_TEST_CASE(constants)
BOOST_AUTO_TEST_CASE(conversions)
{
- BOOST_TEST(detail::convert(T) == svn_tristate_true);
- BOOST_TEST(detail::convert(F) == svn_tristate_false);
- BOOST_TEST(detail::convert(X) == svn_tristate_unknown);
-
- BOOST_TEST(detail::convert(svn_tristate_true) == T);
- BOOST_TEST(detail::convert(svn_tristate_false) == F);
- BOOST_TEST(svn::unknown(detail::convert(svn_tristate_unknown)));
+ BOOST_TEST(impl::convert(T) == svn_tristate_true);
+ BOOST_TEST(impl::convert(F) == svn_tristate_false);
+ BOOST_TEST(impl::convert(X) == svn_tristate_unknown);
+
+ BOOST_TEST(impl::convert(svn_tristate_true) == T);
+ BOOST_TEST(impl::convert(svn_tristate_false) == F);
+ BOOST_TEST(svn::unknown(impl::convert(svn_tristate_unknown)));
}
BOOST_AUTO_TEST_CASE(construct_true)