Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Side by Side Diff: core/include/fxcrt/fx_string.h

Issue 1783023002: Re-enable MSVC warning 4800 for compiling with chromium_code (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: remove cast change on security_handler file Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « core/include/fxcrt/fx_ext.h ('k') | core/include/fxcrt/fx_system.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #ifndef CORE_INCLUDE_FXCRT_FX_STRING_H_ 7 #ifndef CORE_INCLUDE_FXCRT_FX_STRING_H_
8 #define CORE_INCLUDE_FXCRT_FX_STRING_H_ 8 #define CORE_INCLUDE_FXCRT_FX_STRING_H_
9 9
10 #include <stdint.h> // For intptr_t. 10 #include <stdint.h> // For intptr_t.
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 static FX_STRSIZE WStringLength(const unsigned short* str); 570 static FX_STRSIZE WStringLength(const unsigned short* str);
571 571
572 // Explicit conversion to raw string 572 // Explicit conversion to raw string
573 const FX_WCHAR* c_str() const { return m_pData ? m_pData->m_String : L""; } 573 const FX_WCHAR* c_str() const { return m_pData ? m_pData->m_String : L""; }
574 574
575 // Implicit conversion to C-style wide string -- deprecated 575 // Implicit conversion to C-style wide string -- deprecated
576 operator const FX_WCHAR*() const { return m_pData ? m_pData->m_String : L""; } 576 operator const FX_WCHAR*() const { return m_pData ? m_pData->m_String : L""; }
577 577
578 void Empty(); 578 void Empty();
579 579
580 FX_BOOL IsEmpty() const { return !GetLength(); } 580 bool IsEmpty() const { return !GetLength(); }
581 581
582 FX_STRSIZE GetLength() const { return m_pData ? m_pData->m_nDataLength : 0; } 582 FX_STRSIZE GetLength() const { return m_pData ? m_pData->m_nDataLength : 0; }
583 583
584 const CFX_WideString& operator=(const FX_WCHAR* str); 584 const CFX_WideString& operator=(const FX_WCHAR* str);
585 585
586 const CFX_WideString& operator=(const CFX_WideString& stringSrc); 586 const CFX_WideString& operator=(const CFX_WideString& stringSrc);
587 587
588 const CFX_WideString& operator=(const CFX_WideStringC& stringSrc); 588 const CFX_WideString& operator=(const CFX_WideStringC& stringSrc);
589 589
590 const CFX_WideString& operator+=(const FX_WCHAR* str); 590 const CFX_WideString& operator+=(const FX_WCHAR* str);
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
802 } 802 }
803 803
804 FX_FLOAT FX_atof(const CFX_ByteStringC& str); 804 FX_FLOAT FX_atof(const CFX_ByteStringC& str);
805 inline FX_FLOAT FX_atof(const CFX_WideStringC& wsStr) { 805 inline FX_FLOAT FX_atof(const CFX_WideStringC& wsStr) {
806 return FX_atof(FX_UTF8Encode(wsStr.GetPtr(), wsStr.GetLength())); 806 return FX_atof(FX_UTF8Encode(wsStr.GetPtr(), wsStr.GetLength()));
807 } 807 }
808 void FX_atonum(const CFX_ByteStringC& str, FX_BOOL& bInteger, void* pData); 808 void FX_atonum(const CFX_ByteStringC& str, FX_BOOL& bInteger, void* pData);
809 FX_STRSIZE FX_ftoa(FX_FLOAT f, FX_CHAR* buf); 809 FX_STRSIZE FX_ftoa(FX_FLOAT f, FX_CHAR* buf);
810 810
811 #endif // CORE_INCLUDE_FXCRT_FX_STRING_H_ 811 #endif // CORE_INCLUDE_FXCRT_FX_STRING_H_
OLDNEW
« no previous file with comments | « core/include/fxcrt/fx_ext.h ('k') | core/include/fxcrt/fx_system.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698