diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-03 01:24:31 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-03 01:24:31 +0200 |
| commit | 4613b91ecac2745252c40be64e73de5ff920b02b (patch) | |
| tree | 26b0aa50bb4d580b156ab2eb9825707a17f51e99 /security | |
| parent | e1490c07e29f5e4715f73088b7ca7aab4ada90a6 (diff) | |
| download | UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar.gz UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar.lz UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar.xz UXP-4613b91ecac2745252c40be64e73de5ff920b02b.zip | |
Remove sandbox ductwork conditional code.
Diffstat (limited to 'security')
| -rw-r--r-- | security/sandbox/chromium/base/time/time.cc | 2 | ||||
| -rw-r--r-- | security/sandbox/chromium/base/time/time.h | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/security/sandbox/chromium/base/time/time.cc b/security/sandbox/chromium/base/time/time.cc index 9188887e2..76ffeb744 100644 --- a/security/sandbox/chromium/base/time/time.cc +++ b/security/sandbox/chromium/base/time/time.cc @@ -242,7 +242,6 @@ Time Time::LocalMidnight() const { return FromLocalExploded(exploded); } -#if !defined(MOZ_SANDBOX) // static bool Time::FromStringInternal(const char* time_string, bool is_local, @@ -263,7 +262,6 @@ bool Time::FromStringInternal(const char* time_string, *parsed_time = Time(result_time); return true; } -#endif std::ostream& operator<<(std::ostream& os, Time time) { Time::Exploded exploded; diff --git a/security/sandbox/chromium/base/time/time.h b/security/sandbox/chromium/base/time/time.h index ea19d7ed9..066d91083 100644 --- a/security/sandbox/chromium/base/time/time.h +++ b/security/sandbox/chromium/base/time/time.h @@ -522,7 +522,6 @@ class BASE_EXPORT Time : public time_internal::TimeBase<Time> { return FromExploded(true, exploded); } -#if !defined(MOZ_SANDBOX) // Converts a string representation of time to a Time object. // An example of a time string which is converted is as below:- // "Tue, 15 Nov 1994 12:45:26 GMT". If the timezone is not specified @@ -537,7 +536,6 @@ class BASE_EXPORT Time : public time_internal::TimeBase<Time> { static bool FromUTCString(const char* time_string, Time* parsed_time) { return FromStringInternal(time_string, false, parsed_time); } -#endif // Fills the given exploded structure with either the local time or UTC from // this time structure (containing UTC). @@ -565,7 +563,6 @@ class BASE_EXPORT Time : public time_internal::TimeBase<Time> { // |is_local = true| or UTC |is_local = false|. static Time FromExploded(bool is_local, const Exploded& exploded); -#if !defined(MOZ_SANDBOX) // Converts a string representation of time to a Time object. // An example of a time string which is converted is as below:- // "Tue, 15 Nov 1994 12:45:26 GMT". If the timezone is not specified @@ -576,7 +573,6 @@ class BASE_EXPORT Time : public time_internal::TimeBase<Time> { static bool FromStringInternal(const char* time_string, bool is_local, Time* parsed_time); -#endif }; // Inline the TimeDelta factory methods, for fast TimeDelta construction. |