diff options
| author | weili <weili@chromium.org> | 2016-06-07 11:28:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-07 11:28:31 -0700 |
| commit | 98963398054a20287cf6b354932ef56ddb4da48c (patch) | |
| tree | b9a009dc12f7535e7fc798ee7e416e651272d863 /fpdfsdk/fsdk_baseannot.cpp | |
| parent | 4997b22f84307521a62838f874928bf56cd3423c (diff) | |
| download | pdfium-98963398054a20287cf6b354932ef56ddb4da48c.tar.xz | |
Fix more code which has shadow variables
The code has local variables that shadow struct or class member
variables. Also, when this happens, different variable names should be
used instead of namespaces.
These were discovered by /Wshadow warning flag in Clang.
Review-Url: https://codereview.chromium.org/2034253003
Diffstat (limited to 'fpdfsdk/fsdk_baseannot.cpp')
| -rw-r--r-- | fpdfsdk/fsdk_baseannot.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fpdfsdk/fsdk_baseannot.cpp b/fpdfsdk/fsdk_baseannot.cpp index 1345f234b6..7dcb663505 100644 --- a/fpdfsdk/fsdk_baseannot.cpp +++ b/fpdfsdk/fsdk_baseannot.cpp @@ -376,8 +376,7 @@ CFX_ByteString CPDFSDK_DateTime::ToPDFDateTimeString() { } void CPDFSDK_DateTime::ToSystemTime(FX_SYSTEMTIME& st) { - CPDFSDK_DateTime dt = *this; - time_t t = (time_t)dt; + time_t t = (time_t)(*this); struct tm* pTime = localtime(&t); if (pTime) { st.wYear = (uint16_t)pTime->tm_year + 1900; @@ -392,11 +391,12 @@ void CPDFSDK_DateTime::ToSystemTime(FX_SYSTEMTIME& st) { } CPDFSDK_DateTime CPDFSDK_DateTime::ToGMT() const { - CPDFSDK_DateTime dt = *this; - dt.AddSeconds(-gAfxGetTimeZoneInSeconds(dt.dt.tzHour, dt.dt.tzMinute)); - dt.dt.tzHour = 0; - dt.dt.tzMinute = 0; - return dt; + CPDFSDK_DateTime new_dt = *this; + new_dt.AddSeconds( + -gAfxGetTimeZoneInSeconds(new_dt.dt.tzHour, new_dt.dt.tzMinute)); + new_dt.dt.tzHour = 0; + new_dt.dt.tzMinute = 0; + return new_dt; } CPDFSDK_DateTime& CPDFSDK_DateTime::AddDays(short days) { |