Add missing operators for CFX_WideStringC.

core/include/fxcrt/fx_string.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef _FX_STRING_H_
 #define _FX_STRING_H_
 
+#include <algorithm>
+
 #include "fx_memory.h"
 
 class CFX_ByteStringC;
 class CFX_ByteString;
 class CFX_WideStringC;
 class CFX_WideString;
 struct CFX_CharMap;
 class CFX_BinaryBuf;
 typedef int FX_STRSIZE;
 class CFX_ByteStringL;
@@ skipping 457 matching lines @@
 template<FX_STRSIZE limit>
 class CFX_StringBufTemplate : public CFX_StringBufBase
 {
 public:
 
     CFX_StringBufTemplate() : CFX_StringBufBase(limit) {}
 
     FX_CHAR             m_Buffer[limit];
 };
 typedef CFX_StringBufTemplate<256> CFX_StringBuf256;
-class CFX_WideStringC 
+class CFX_WideStringC
 {
 public:
     typedef FX_WCHAR value_type;
 
     CFX_WideStringC()
     {
         m_Ptr = NULL;
         m_Length = 0;
     }
 
@@ skipping 101 matching lines @@
     CFX_WideStringC     Right(FX_STRSIZE count) const
     {
         if (count < 1) {
             return CFX_WideStringC();
         }
         if (count > m_Length) {
             count = m_Length;
         }
         return CFX_WideStringC(m_Ptr + m_Length - count, count);
     }
+
+    const FX_WCHAR& operator[] (int index) const

[Lei Zhang, 2015/04/21 22:07:56]

Same as last CL, size_t ?

[Tom Sepez, 2015/04/22 17:06:45]

Done.

+    {
+        return m_Ptr[index];
+    }
+
+    bool operator< (const CFX_WideStringC& that)

[brucedawson, 2015/04/22 10:47:12]

The operator itself needs to be const.

[Tom Sepez, 2015/04/22 17:06:45]

Done.

+    {
+        int result = wmemcmp(m_Ptr, that.m_Ptr, std::min(m_Length, that.m_Length));

[Tom Sepez, 2015/04/22 17:06:45]

Bruce, you're OK with wmemcmp, right?  No windows strangeness hiding here?

+        return result < 0 || (result == 0 && m_Length < that.m_Length);
+     }
+
 protected:
+    FX_LPCWSTR          m_Ptr;
+    FX_STRSIZE          m_Length;
 
-    FX_LPCWSTR          m_Ptr;
-
-    FX_STRSIZE          m_Length;
 private:
-
     void*                       operator new (size_t) throw()
     {
         return NULL;
     }
 };
 typedef const CFX_WideStringC&  FX_WSTR;
 #define FX_WSTRC(wstr) CFX_WideStringC(wstr, FX_ArraySize(wstr) - 1)
 struct CFX_StringDataW {
 
     long                m_nRefs;
@@ skipping 241 matching lines @@
 CFX_ByteString  FX_UTF8Encode(FX_LPCWSTR pwsStr, FX_STRSIZE len);
 inline CFX_ByteString   FX_UTF8Encode(FX_WSTR wsStr)
 {
     return FX_UTF8Encode(wsStr.GetPtr(), wsStr.GetLength());
 }
 inline CFX_ByteString   FX_UTF8Encode(const CFX_WideString &wsStr)
 {
     return FX_UTF8Encode(wsStr.c_str(), wsStr.GetLength());
 }
 #endif