ICU 56 update step 1

source/common/charstr.h

 /*
 **********************************************************************
-*   Copyright (c) 2001-2012, International Business Machines
+*   Copyright (c) 2001-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description
 *   11/19/2001  aliu        Creation.
 *   05/19/2010  markus      Rewritten from scratch
 **********************************************************************
 */
 
 #ifndef CHARSTRING_H
 #define CHARSTRING_H
@@ skipping 48 matching lines @@
     CharString &copyFrom(const CharString &other, UErrorCode &errorCode);
 
     UBool isEmpty() const { return len==0; }
     int32_t length() const { return len; }
     char operator[](int32_t index) const { return buffer[index]; }
     StringPiece toStringPiece() const { return StringPiece(buffer.getAlias(), len); }
 
     const char *data() const { return buffer.getAlias(); }
     char *data() { return buffer.getAlias(); }
 
+    /** @return last index of c, or -1 if c is not in this string */
+    int32_t lastIndexOf(char c) const;
+
     CharString &clear() { len=0; buffer[0]=0; return *this; }
     CharString &truncate(int32_t newLength);
 
     CharString &append(char c, UErrorCode &errorCode);
     CharString &append(const StringPiece &s, UErrorCode &errorCode) {
         return append(s.data(), s.length(), errorCode);
     }
     CharString &append(const CharString &s, UErrorCode &errorCode) {
         return append(s.data(), s.length(), errorCode);
     }
@@ skipping 25 matching lines @@
 
     CharString &appendInvariantChars(const UnicodeString &s, UErrorCode &errorCode);
 
     /**
      * Appends a filename/path part, e.g., a directory name.
      * First appends a U_FILE_SEP_CHAR if necessary.
      * Does nothing if s is empty.
      */
     CharString &appendPathPart(const StringPiece &s, UErrorCode &errorCode);
 
+    /**
+     * Appends a U_FILE_SEP_CHAR if this string is not empty
+     * and does not already end with a U_FILE_SEP_CHAR or U_FILE_ALT_SEP_CHAR.
+     */
+    CharString &ensureEndsWithFileSeparator(UErrorCode &errorCode);
+
 private:
     MaybeStackArray<char, 40> buffer;
     int32_t len;
 
     UBool ensureCapacity(int32_t capacity, int32_t desiredCapacityHint, UErrorCode &errorCode);
 
     CharString(const CharString &other); // forbid copying of this class
     CharString &operator=(const CharString &other); // forbid copying of this class
 };
 
 U_NAMESPACE_END
 
 #endif
 //eof