diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
commit | 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 (patch) | |
tree | e2fc5ec44d0e83e7f8d066b14d1628b8f5cebe87 /xfa/src/fgas/include/fx_datetime.h | |
parent | 63de95b699a4374982c2ddffced89e0da028fe4c (diff) | |
download | pdfium-6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33.tar.xz |
Merge to XFA: Kill CFX_Object.
Not just a simple merge, but changes to remove CFX_Object from XFA.
Original Review URL: https://codereview.chromium.org/1088733002
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1087053002
Diffstat (limited to 'xfa/src/fgas/include/fx_datetime.h')
-rw-r--r-- | xfa/src/fgas/include/fx_datetime.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xfa/src/fgas/include/fx_datetime.h b/xfa/src/fgas/include/fx_datetime.h index dd0a5d6147..d18b899fc6 100644 --- a/xfa/src/fgas/include/fx_datetime.h +++ b/xfa/src/fgas/include/fx_datetime.h @@ -21,7 +21,7 @@ enum FX_WEEKDAY { FX_BOOL FX_IsLeapYear(FX_INT32 iYear);
FX_INT32 FX_DaysInYear(FX_INT32 iYear);
FX_BYTE FX_DaysInMonth(FX_INT32 iYear, FX_BYTE iMonth);
-class CFX_Unitime : public CFX_Object
+class CFX_Unitime
{
public:
CFX_Unitime()
@@ -278,7 +278,7 @@ typedef FX_DATETIMEZONE const * FX_LPCDATETIMEZONE; #if _FX_OS_ != _FX_ANDROID_
#pragma pack(pop)
#endif
-class CFX_DateTime : public CFX_Object
+class CFX_DateTime
{
public:
CFX_DateTime() {}
|