moved from Arabica::Internal namespace to Arabica::convert::impl namespace

This commit is contained in:
jez 2007-09-10 16:27:53 +00:00
parent 3a1a0ae9de
commit 0281c34a61
10 changed files with 27 additions and 20 deletions

View file

@ -24,7 +24,9 @@ namespace {
};
} // namespace
std::codecvt_base::result Arabica::Internal::iso88591_2_utf8(
using namespace Arabica::convert::impl;
std::codecvt_base::result iso88591_2_utf8(
const char* from, const char* from_end, const char*& from_next,
char* to, char* to_limit, char*& to_next)
{
@ -58,7 +60,7 @@ std::codecvt_base::result Arabica::Internal::iso88591_2_utf8(
return std::codecvt_base::ok;
} // iso88591_2_utf8
std::codecvt_base::result Arabica::Internal::utf8_2_iso88591(
std::codecvt_base::result utf8_2_iso88591(
const char* from, const char* from_end, const char*& from_next,
char* to, char* to_limit, char*& to_next)
{

View file

@ -2,7 +2,10 @@
// --------------------------------------------------------------------------
#include <convert/impl/ucs2_utf16.hpp>
// --------------------------------------------------------------------------
std::codecvt_base::result Arabica::Internal::utf16_2_ucs2(bool be,
using namespace Arabica::convert::impl;
std::codecvt_base::result utf16_2_ucs2(bool be,
char const* from, char const* from_end, char const*& from_next,
wchar_t* to, wchar_t* to_limit, wchar_t*& to_next)
{
@ -20,7 +23,7 @@ std::codecvt_base::result Arabica::Internal::utf16_2_ucs2(bool be,
return (from_next == from_end) ? std::codecvt_base::ok : std::codecvt_base::partial;
} // utf16_2_ucs2
std::codecvt_base::result Arabica::Internal::ucs2_2_utf16(bool be,
std::codecvt_base::result ucs2_2_utf16(bool be,
wchar_t const* from, wchar_t const* from_end, wchar_t const*& from_next,
char* to, char* to_limit, char*& to_next)
{

View file

@ -27,7 +27,9 @@ namespace {
};
} // namespace
std::codecvt_base::result Arabica::Internal::ucs2_2_utf8(
using namespace Arabica::convert::impl;
std::codecvt_base::result ucs2_2_utf8(
const wchar_t* from, const wchar_t* from_end, const wchar_t*& from_next,
char* to, char* to_limit, char*& to_next)
{
@ -62,7 +64,7 @@ std::codecvt_base::result Arabica::Internal::ucs2_2_utf8(
return std::codecvt_base::ok;
} // ucs2_2_utf8
std::codecvt_base::result Arabica::Internal::utf8_2_ucs2(
std::codecvt_base::result utf8_2_ucs2(
const char* from, const char* from_end, const char*& from_next,
wchar_t* to, wchar_t* to_limit, wchar_t*& to_next)
{

View file

@ -15,7 +15,7 @@ std::codecvt_base::result iso88591utf8codecvt::do_out(std::mbstate_t& /* state *
char* to_limit,
char*& to_next) const
{
return Arabica::Internal::utf8_2_iso88591(from, from_end, from_next, to, to_limit, to_next);
return impl::utf8_2_iso88591(from, from_end, from_next, to, to_limit, to_next);
} // do_out
std::codecvt_base::result iso88591utf8codecvt::do_in(std::mbstate_t& /* state */,
@ -26,7 +26,7 @@ std::codecvt_base::result iso88591utf8codecvt::do_in(std::mbstate_t& /* state */
char* to_limit,
char*& to_next) const
{
return Arabica::Internal::iso88591_2_utf8(from, from_end, from_next, to, to_limit, to_next);
return impl::iso88591_2_utf8(from, from_end, from_next, to, to_limit, to_next);
} // do_in
std::codecvt_base::result iso88591utf8codecvt::do_unshift(std::mbstate_t& /* state */,

View file

@ -17,7 +17,7 @@ std::codecvt_base::result ucs2utf8codecvt::do_out(std::mbstate_t& /* state */,
wchar_t* to_limit,
wchar_t*& to_next) const
{
return Arabica::Internal::utf8_2_ucs2(from, from_end, from_next, to, to_limit, to_next);
return impl::utf8_2_ucs2(from, from_end, from_next, to, to_limit, to_next);
} // do_out
std::codecvt_base::result ucs2utf8codecvt::do_in(std::mbstate_t& /* state */,
@ -28,7 +28,7 @@ std::codecvt_base::result ucs2utf8codecvt::do_in(std::mbstate_t& /* state */,
char* to_limit,
char*& to_next) const
{
return Arabica::Internal::ucs2_2_utf8(from, from_end, from_next, to, to_limit, to_next);
return impl::ucs2_2_utf8(from, from_end, from_next, to, to_limit, to_next);
} // do_in
std::codecvt_base::result ucs2utf8codecvt::do_unshift(std::mbstate_t& /* state */,

View file

@ -19,7 +19,7 @@ std::codecvt_base::result utf16beucs2codecvt::do_out(std::mbstate_t& /* state */
char* to_limit,
char*& to_next) const
{
return Arabica::Internal::ucs2_2_utf16(true, from, from_end, from_next, to, to_limit, to_next);
return impl::ucs2_2_utf16(true, from, from_end, from_next, to, to_limit, to_next);
} // do_out
std::codecvt_base::result utf16beucs2codecvt::do_in(std::mbstate_t& /* state */,
@ -30,7 +30,7 @@ std::codecvt_base::result utf16beucs2codecvt::do_in(std::mbstate_t& /* state */,
wchar_t* to_limit,
wchar_t*& to_next) const
{
return Arabica::Internal::utf16_2_ucs2(true, from, from_end, from_next, to, to_limit, to_next);
return impl::utf16_2_ucs2(true, from, from_end, from_next, to, to_limit, to_next);
} // do_in
std::codecvt_base::result utf16beucs2codecvt::do_unshift(std::mbstate_t& /* state */,

View file

@ -20,7 +20,7 @@ std::codecvt_base::result utf16leucs2codecvt::do_out(std::mbstate_t& /* state */
char* to_limit,
char*& to_next) const
{
return Arabica::Internal::ucs2_2_utf16(false, from, from_end, from_next, to, to_limit, to_next);
return impl::ucs2_2_utf16(false, from, from_end, from_next, to, to_limit, to_next);
} // do_out
std::codecvt_base::result utf16leucs2codecvt::do_in(std::mbstate_t& /* state */,
@ -31,7 +31,7 @@ std::codecvt_base::result utf16leucs2codecvt::do_in(std::mbstate_t& /* state */,
wchar_t* to_limit,
wchar_t*& to_next) const
{
return Arabica::Internal::utf16_2_ucs2(false, from, from_end, from_next, to, to_limit, to_next);
return impl::utf16_2_ucs2(false, from, from_end, from_next, to, to_limit, to_next);
} // do_in
std::codecvt_base::result utf16leucs2codecvt::do_unshift(std::mbstate_t& /* state */,

View file

@ -17,7 +17,7 @@ std::codecvt_base::result utf16utf8codecvt::do_out(std::mbstate_t& /* state */,
wchar_t* to_limit,
wchar_t*& to_next) const
{
return Arabica::Internal::utf8_2_ucs2(from, from_end, from_next, to, to_limit, to_next);
return impl::utf8_2_ucs2(from, from_end, from_next, to, to_limit, to_next);
} // do_out
std::codecvt_base::result utf16utf8codecvt::do_in(std::mbstate_t& /* state */,
@ -28,7 +28,7 @@ std::codecvt_base::result utf16utf8codecvt::do_in(std::mbstate_t& /* state */,
char* to_limit,
char*& to_next) const
{
return Arabica::Internal::ucs2_2_utf8(from, from_end, from_next, to, to_limit, to_next);
return impl::ucs2_2_utf8(from, from_end, from_next, to, to_limit, to_next);
} // do_in
std::codecvt_base::result utf16utf8codecvt::do_unshift(std::mbstate_t& /* state */,

View file

@ -16,7 +16,7 @@ std::codecvt_base::result utf8iso88591codecvt::do_out(std::mbstate_t& /* state *
char* to_limit,
char*& to_next) const
{
return Arabica::Internal::iso88591_2_utf8(from, from_end, from_next, to, to_limit, to_next);
return impl::iso88591_2_utf8(from, from_end, from_next, to, to_limit, to_next);
} // do_out
std::codecvt_base::result utf8iso88591codecvt::do_in(std::mbstate_t& /* state */,
@ -27,7 +27,7 @@ std::codecvt_base::result utf8iso88591codecvt::do_in(std::mbstate_t& /* state */
char* to_limit,
char*& to_next) const
{
return Arabica::Internal::utf8_2_iso88591(from, from_end, from_next, to, to_limit, to_next);
return impl::utf8_2_iso88591(from, from_end, from_next, to, to_limit, to_next);
} // do_in
std::codecvt_base::result utf8iso88591codecvt::do_unshift(std::mbstate_t& /* state */,

View file

@ -17,7 +17,7 @@ std::codecvt_base::result utf8ucs2codecvt::do_out(std::mbstate_t& /* state */,
char* to_limit,
char*& to_next) const
{
return Arabica::Internal::ucs2_2_utf8(from, from_end, from_next, to, to_limit, to_next);
return impl::ucs2_2_utf8(from, from_end, from_next, to, to_limit, to_next);
} // do_out
std::codecvt_base::result utf8ucs2codecvt::do_in(std::mbstate_t& /* state */,
@ -28,7 +28,7 @@ std::codecvt_base::result utf8ucs2codecvt::do_in(std::mbstate_t& /* state */,
wchar_t* to_limit,
wchar_t*& to_next) const
{
return Arabica::Internal::utf8_2_ucs2(from, from_end, from_next, to, to_limit, to_next);
return impl::utf8_2_ucs2(from, from_end, from_next, to, to_limit, to_next);
} // do_in
std::codecvt_base::result utf8ucs2codecvt::do_unshift(std::mbstate_t& /* state */,