Chromium Code Reviews| Index: xfa/fgas/crt/fgas_algorithm.h |
| diff --git a/xfa/fgas/crt/fgas_algorithm.h b/xfa/fgas/crt/fgas_algorithm.h |
| index 9fefb2bc403a27382ad3c4d52780abfff65be54c..f68b53f8cca1904ca18d4e65f154debb6439adf4 100644 |
| --- a/xfa/fgas/crt/fgas_algorithm.h |
| +++ b/xfa/fgas/crt/fgas_algorithm.h |
| @@ -11,41 +11,24 @@ |
| #include "core/fxcrt/include/fx_basic.h" |
| -#ifdef __cplusplus |
| -extern "C" { |
| -#endif |
| - |
| -int32_t FX_Base64EncodeA(const uint8_t* pSrc, int32_t iSrcLen, FX_CHAR* pDst); |
| -int32_t FX_Base64DecodeA(const FX_CHAR* pSrc, int32_t iSrcLen, uint8_t* pDst); |
| -int32_t FX_Base64DecodeW(const FX_WCHAR* pSrc, int32_t iSrcLen, uint8_t* pDst); |
| -uint8_t FX_Hex2Dec(uint8_t hexHigh, uint8_t hexLow); |
| -int32_t FX_SeparateStringW(const FX_WCHAR* pStr, |
| - int32_t iStrLen, |
| - FX_WCHAR delimiter, |
| - CFX_WideStringArray& pieces); |
| -#ifdef __cplusplus |
| -}; |
| -#endif |
| - |
| template <class baseType> |
| class CFX_DSPATemplate { |
|
Tom Sepez
2016/05/18 22:01:21
this needs to go someday.
dsinclair
2016/05/19 14:24:44
Acknowledged.
|
| public: |
| int32_t Lookup(const baseType& find, const baseType* pArray, int32_t iCount) { |
| - ASSERT(pArray != NULL); |
| - if (iCount < 1) { |
| + ASSERT(pArray); |
| + if (iCount < 1) |
| return -1; |
| - } |
| + |
| int32_t iStart = 0, iEnd = iCount - 1, iMid; |
| do { |
| iMid = (iStart + iEnd) / 2; |
| const baseType& v = pArray[iMid]; |
| - if (find == v) { |
| + if (find == v) |
| return iMid; |
| - } else if (find < v) { |
| + if (find < v) |
| iEnd = iMid - 1; |
| - } else { |
| + else |
| iStart = iMid + 1; |
| - } |
| } while (iStart <= iEnd); |
| return -1; |
| } |