diff -up ./include/beecrypt/c++/lang/String.h.tv ./include/beecrypt/c++/lang/String.h
--- ./include/beecrypt/c++/lang/String.h.tv 2018-08-22 08:42:24.961119850 +0200
+++ ./include/beecrypt/c++/lang/String.h 2018-08-22 08:42:41.048467595 +0200
@@ -73,11 +73,11 @@ namespace beecrypt {
String(const bytearray&);
String(const array<jchar>&);
String(const String& copy);
- String(const UnicodeString& copy);
+ String(const icu::UnicodeString& copy);
virtual ~String() {}
String& operator=(const String& copy);
- String& operator=(const UnicodeString& copy);
+ String& operator=(const icu::UnicodeString& copy);
virtual jchar charAt(jint index) const throw (IndexOutOfBoundsException);
virtual jint compareTo(const String& str) const throw ();
@@ -101,7 +101,7 @@ namespace beecrypt {
String toUpperCase() const throw ();
const array<jchar>& toCharArray() const throw ();
virtual String toString() const throw ();
- UnicodeString toUnicodeString() const throw ();
+ icu::UnicodeString toUnicodeString() const throw ();
};
BEECRYPTCXXAPI
diff -up ./c++/beeyond/DHIESParameterSpec.cxx.tv ./c++/beeyond/DHIESParameterSpec.cxx
--- ./c++/beeyond/DHIESParameterSpec.cxx.tv 2005-05-27 09:42:52.000000000 +0200
+++ ./c++/beeyond/DHIESParameterSpec.cxx 2018-08-22 10:23:32.686730113 +0200
@@ -68,16 +68,16 @@ DHIESParameterSpec::DHIESParameterSpec(c
DHIESParameterSpec::DHIESParameterSpec(const String& descriptor) throw (IllegalArgumentException)
{
- UnicodeString match(descriptor.toUnicodeString());
+ icu::UnicodeString match(descriptor.toUnicodeString());
UErrorCode status = U_ZERO_ERROR;
UParseError error;
- auto_ptr<RegexPattern> p(RegexPattern::compile("DHIES\\((\\w(?:\\w|\\d)*(?:-(?:\\w|\\d)*)*),(\\w(?:\\w|\\d)*(?:-(?:\\w|\\d)*)*),(\\w(?:\\w|\\d)*(?:-(?:\\w|\\d)*)*)(?:,(\\d+))?(?:,(\\d+))?\\)", error, status));
+ auto_ptr<icu::RegexPattern> p(icu::RegexPattern::compile("DHIES\\((\\w(?:\\w|\\d)*(?:-(?:\\w|\\d)*)*),(\\w(?:\\w|\\d)*(?:-(?:\\w|\\d)*)*),(\\w(?:\\w|\\d)*(?:-(?:\\w|\\d)*)*)(?:,(\\d+))?(?:,(\\d+))?\\)", error, status));
if (U_FAILURE(status))
throw RuntimeException("RegexPattern doesn't compile");
- auto_ptr<RegexMatcher> m(p->matcher(match, status));
+ auto_ptr<icu::RegexMatcher> m(p->matcher(match, status));
if (!m->matches(status))
throw IllegalArgumentException("couldn't parse descriptor into DHIES(<digest>,<cipher>,<mac>[,<cipherkeylen>[,<mackeylen>]])");
diff -up ./c++/crypto/Cipher.cxx.tv ./c++/crypto/Cipher.cxx
--- ./c++/crypto/Cipher.cxx.tv 2018-08-22 08:58:33.194080201 +0200
+++ ./c++/crypto/Cipher.cxx 2018-08-22 09:00:32.670669239 +0200
@@ -32,7 +32,7 @@ using beecrypt::security::Security;
using namespace beecrypt::crypto;
namespace {
- RegexPattern* _amppat = 0;
+ icu::RegexPattern* _amppat = 0;
}
const int Cipher::ENCRYPT_MODE = 1;
@@ -55,7 +55,7 @@ Cipher::~Cipher()
Cipher* Cipher::getInstance(const String& transformation) throw (NoSuchAlgorithmException, NoSuchPaddingException)
{
- UnicodeString match(transformation.toUnicodeString());
+ icu::UnicodeString match(transformation.toUnicodeString());
UErrorCode status = U_ZERO_ERROR;
@@ -63,14 +63,14 @@ Cipher* Cipher::getInstance(const String
{
UParseError error;
- _amppat = RegexPattern::compile("(\\w+)(?:/(\\w*))?(?:/(\\w+))?", error, status);
+ _amppat = icu::RegexPattern::compile("(\\w+)(?:/(\\w*))?(?:/(\\w+))?", error, status);
// shouldn't happen
if (U_FAILURE(status))
throw RuntimeException("ICU regex compilation problem");
}
status = U_ZERO_ERROR;
- RegexMatcher *m = _amppat->matcher(match, status);
+ icu::RegexMatcher *m = _amppat->matcher(match, status);
status = U_ZERO_ERROR;
if (m->matches(status))
@@ -225,13 +225,13 @@ Cipher* Cipher::getInstance(const String
{
UParseError error;
- _amppat = RegexPattern::compile("(\\w+)(?:/(\\w*))?(?:/(\\w+))?", error, status);
+ _amppat = icu::RegexPattern::compile("(\\w+)(?:/(\\w*))?(?:/(\\w+))?", error, status);
// shouldn't happen
if (U_FAILURE(status))
throw RuntimeException("ICU regex compilation problem");
}
- RegexMatcher *m = _amppat->matcher(transformation.toUnicodeString(), status);
+ icu::RegexMatcher *m = _amppat->matcher(transformation.toUnicodeString(), status);
if (m->matches(status))
{
@@ -382,13 +382,13 @@ Cipher* Cipher::getInstance(const String
{
UParseError error;
- _amppat = RegexPattern::compile("(\\w+)(?:/(\\w*))?(?:/(\\w+))?", error, status);
+ _amppat = icu::RegexPattern::compile("(\\w+)(?:/(\\w*))?(?:/(\\w+))?", error, status);
// shouldn't happen
if (U_FAILURE(status))
throw RuntimeException("ICU regex compilation problem");
}
- RegexMatcher *m = _amppat->matcher(transformation.toUnicodeString(), status);
+ icu::RegexMatcher *m = _amppat->matcher(transformation.toUnicodeString(), status);
if (m->matches(status))
{
diff -up ./c++/lang/Integer.cxx.tv ./c++/lang/Integer.cxx
--- ./c++/lang/Integer.cxx.tv 2005-05-16 13:57:55.000000000 +0200
+++ ./c++/lang/Integer.cxx 2018-08-22 08:56:35.376527118 +0200
@@ -76,11 +76,11 @@ jint Integer::parseInteger(const String&
{
UErrorCode status = U_ZERO_ERROR;
- NumberFormat* nf = NumberFormat::createInstance(status);
+ icu::NumberFormat* nf = icu::NumberFormat::createInstance(status);
if (nf)
{
- Formattable fmt((int32_t) 0);
+ icu::Formattable fmt((int32_t) 0);
nf->parse(s.toUnicodeString(), fmt, status);
@@ -92,7 +92,7 @@ jint Integer::parseInteger(const String&
return fmt.getLong();
}
else
- throw RuntimeException("unable to create ICU NumberFormat instance");
+ throw RuntimeException("unable to create ICU icu::NumberFormat instance");
}
Integer::Integer(jint value) throw () : _val(value)
diff -up ./c++/lang/Long.cxx.tv ./c++/lang/Long.cxx
--- ./c++/lang/Long.cxx.tv 2018-08-22 08:53:36.473650329 +0200
+++ ./c++/lang/Long.cxx 2018-08-22 08:55:42.066371901 +0200
@@ -88,11 +88,11 @@ jlong Long::parseLong(const String& s) t
{
UErrorCode status = U_ZERO_ERROR;
- NumberFormat* nf = NumberFormat::createInstance(status);
+ icu::NumberFormat* nf = icu::NumberFormat::createInstance(status);
if (nf)
{
- Formattable fmt((int64_t) 0);
+ icu::Formattable fmt((int64_t) 0);
nf->parse(s.toUnicodeString(), fmt, status);
diff -up ./c++/lang/String.cxx.tv ./c++/lang/String.cxx
--- ./c++/lang/String.cxx.tv 2018-08-22 08:52:27.242150094 +0200
+++ ./c++/lang/String.cxx 2018-08-22 08:52:55.051752721 +0200
@@ -87,7 +87,7 @@ String::String(const String& copy) : _va
assert(_value.size() <= Integer::MAX_VALUE);
}
-String::String(const UnicodeString& copy) : _value((int) copy.length())
+String::String(const icu::UnicodeString& copy) : _value((int) copy.length())
{
assert(_value.size() <= Integer::MAX_VALUE);
@@ -103,7 +103,7 @@ String& String::operator=(const String&
return *this;
}
-String& String::operator=(const UnicodeString& copy)
+String& String::operator=(const icu::UnicodeString& copy)
{
assert(copy.length() <= Integer::MAX_VALUE);
@@ -397,9 +397,9 @@ String String::toString() const throw ()
return *this;
}
-UnicodeString String::toUnicodeString() const throw ()
+icu::UnicodeString String::toUnicodeString() const throw ()
{
- return UnicodeString(_value.data(), (int32_t) _value.size());
+ return icu::UnicodeString(_value.data(), (int32_t) _value.size());
}
String String::valueOf(bool b)
diff -up ./c++/util/Date.cxx.tv ./c++/util/Date.cxx
--- ./c++/util/Date.cxx.tv 2018-08-22 08:57:05.994190595 +0200
+++ ./c++/util/Date.cxx 2018-08-22 08:57:49.402131236 +0200
@@ -31,7 +31,7 @@ namespace {
#if WIN32
__declspec(thread) DateFormat* format = 0;
#else
- __thread DateFormat* format = 0;
+ __thread icu::DateFormat* format = 0;
#endif
}
@@ -112,9 +112,9 @@ String Date::toString() const throw ()
String result;
if (!format)
- format = DateFormat::createDateTimeInstance();
+ format = icu::DateFormat::createDateTimeInstance();
- UnicodeString tmp;
+ icu::UnicodeString tmp;
result = format->format((UDate) _time, tmp);
