ICU-511.32.tar.gz

[apple/icu.git] / icuSources / common / cpputils.h

diff --git a/icuSources/common/cpputils.h b/icuSources/common/cpputils.h
index c1b439c7ff887b3636458ebb655bd23e323be986..b2e0cbc8d61cc77e919e53f8062ea7ab309b7720 100644 (file)
--- a/icuSources/common/cpputils.h
+++ b/icuSources/common/cpputils.h
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *
 /*
 ******************************************************************************
 *

-*   Copyright (C) 1997-2006, International Business Machines
+*   Copyright (C) 1997-2011, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************


@@ -69,7 +69,7 @@ uprv_arrayCopy(const UChar *src, int32_t srcStart,
  * @internal
  */
 static inline void
  * @internal
  */
 static inline void

-uprv_arrayCopy(const U_NAMESPACE_QUALIFIER UnicodeString *src, U_NAMESPACE_QUALIFIER UnicodeString *dst, int32_t count)
+uprv_arrayCopy(const icu::UnicodeString *src, icu::UnicodeString *dst, int32_t count)

 { while(count-- > 0) *dst++ = *src++; }
 
 /**
 { while(count-- > 0) *dst++ = *src++; }
 
 /**


@@ -77,8 +77,19 @@ uprv_arrayCopy(const U_NAMESPACE_QUALIFIER UnicodeString *src, U_NAMESPACE_QUALI
  * @internal
  */
 static inline void
  * @internal
  */
 static inline void

-uprv_arrayCopy(const U_NAMESPACE_QUALIFIER UnicodeString *src, int32_t srcStart,
-        U_NAMESPACE_QUALIFIER UnicodeString *dst, int32_t dstStart, int32_t count)
+uprv_arrayCopy(const icu::UnicodeString *src, int32_t srcStart,
+               icu::UnicodeString *dst, int32_t dstStart, int32_t count)

 { uprv_arrayCopy(src+srcStart, dst+dstStart, count); }
 
 { uprv_arrayCopy(src+srcStart, dst+dstStart, count); }
 

+/**
+ * Checks that the string is readable and writable.
+ * Sets U_ILLEGAL_ARGUMENT_ERROR if the string isBogus() or has an open getBuffer().
+ */
+inline void
+uprv_checkCanGetBuffer(const icu::UnicodeString &s, UErrorCode &errorCode) {
+    if(U_SUCCESS(errorCode) && s.isBogus()) {
+        errorCode=U_ILLEGAL_ARGUMENT_ERROR;
+    }
+}
+

 #endif /* _CPPUTILS */
 #endif /* _CPPUTILS */