Commit 7876d75

author

Charlie Barto

authored

Merge pull request #1571 from BillyONeal/filetime_zero

Added the ability to parse and emit the NT Epoch 1601年01月01日T00:00:00Z

2 parents 41e7d00 + a3da3e9 commit 7876d75Copy full SHA for 7876d75

File tree

5 files changed

+200

-115

lines changed

Release
- include/cpprest
  - asyncrt_utils.h
  - streams.h
- src/utilities
  - asyncrt_utils.cpp
- tests/functional/utils
  - datetime.cpp
vcpkg

5 files changed

+200

-115

lines changed

`‎Release/include/cpprest/asyncrt_utils.h`

Lines changed: 18 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -603,14 +603,21 @@ class datetime`
`603`	`603`	`}`
`604`	`604`	`}`
`605`	`605`
`606`		`- datetime() : m_interval(0) {}`
	`606`	`+ datetime() : m_interval(0) {}`
`607`	`607`
`608`	`608`	`/// <summary>`
`609`		`- /// Creates <c>datetime</c> from a string representing time in UTC in RFC 1123 format.`
	`609`	`+ /// Creates <c>datetime</c> from a string representing time in UTC in RFC 1123 or ISO 8601 format.`
`610`	`610`	`/// </summary>`
`611`	`611`	`/// <returns>Returns a <c>datetime</c> of zero if not successful.</returns>`
`612`	`612`	`static _ASYNCRTIMP datetime __cdecl from_string(const utility::string_t& timestring, date_format format = RFC_1123);`
`613`	`613`
	`614`	`+ /// <summary>`
	`615`	`+ /// Creates <c>datetime</c> from a string representing time in UTC in RFC 1123 or ISO 8601 format.`
	`616`	`+ /// </summary>`
	`617`	`+ /// <returns>Returns <c>datetime::maximum()</c> if not successful.</returns>`
	`618`	`+ static _ASYNCRTIMP datetime __cdecl from_string_maximum_error(const utility::string_t& timestring,`
	`619`	`+ date_format format = RFC_1123);`
	`620`	`+`
`614`	`621`	`/// <summary>`
`615`	`622`	`/// Returns a string representation of the <c>datetime</c>.`
`616`	`623`	`/// </summary>`
`@@ -621,20 +628,22 @@ class datetime`
`621`	`628`	`/// </summary>`
`622`	`629`	`interval_type to_interval() const { return m_interval; }`
`623`	`630`
	`631`	`+ static datetime from_interval(interval_type interval) { return datetime(interval); }`
	`632`	`+`
`624`	`633`	`datetime operator-(interval_type value) const { return datetime(m_interval - value); }`
`625`	`634`
`626`	`635`	`datetime operator+(interval_type value) const { return datetime(m_interval + value); }`
`627`	`636`
`628`	`637`	`bool operator==(datetime dt) const { return m_interval == dt.m_interval; }`
`629`	`638`
`630`	`639`	`bool operator!=(const datetime& dt) const { return !(*this == dt); }`
`631`		`-`
	`640`	`+`
`632`	`641`	`bool operator>(const datetime& dt) const { return this->m_interval > dt.m_interval; }`
`633`		`-`
	`642`	`+`
`634`	`643`	`bool operator<(const datetime& dt) const { return this->m_interval < dt.m_interval; }`
`635`		`-`
	`644`	`+`
`636`	`645`	`bool operator>=(const datetime& dt) const { return this->m_interval >= dt.m_interval; }`
`637`		`-`
	`646`	`+`
`638`	`647`	`bool operator<=(const datetime& dt) const { return this->m_interval <= dt.m_interval; }`
`639`	`648`
`640`	`649`	`static interval_type from_milliseconds(unsigned int milliseconds) { return milliseconds * _msTicks; }`
`@@ -649,6 +658,8 @@ class datetime`
`649`	`658`
`650`	`659`	`bool is_initialized() const { return m_interval != 0; }`
`651`	`660`
	`661`	`+ static datetime maximum() { return datetime(static_cast<interval_type>(-1)); }`
	`662`	`+`
`652`	`663`	`private:`
`653`	`664`	`friend int operator-(datetime t1, datetime t2);`
`654`	`665`
`@@ -659,7 +670,7 @@ class datetime`
`659`	`670`	`static const interval_type _dayTicks = 24 * 60 * 60 * _secondTicks;`
`660`	`671`
`661`	`672`	`// Private constructor. Use static methods to create an instance.`
`662`		`- datetime(interval_type interval) : m_interval(interval) {}`
	`673`	`+ datetime(interval_type interval) : m_interval(interval) {}`
`663`	`674`
`664`	`675`	`// Storing as hundreds of nanoseconds 10e-7, i.e. 1 here equals 100ns.`
`665`	`676`	`interval_type m_interval;`

`‎Release/include/cpprest/streams.h`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`
`18`	`18`	`#include "cpprest/astreambuf.h"`
`19`	`19`	`#include <iosfwd>`
	`20`	`+#include <cstdio>`
`20`	`21`
`21`	`22`	`namespace Concurrency`
`22`	`23`	`{`
`@@ -1434,7 +1435,8 @@ static pplx::task<FloatingPoint> _extract_result(std::shared_ptr<_double_state<F`
`1434`	`1435`
`1435`	`1436`	`if (state->exponent_number >= 0)`
`1436`	`1437`	`{`
`1437`		`- result *= pow(FloatingPoint(10.0), state->exponent_number);`
	`1438`	`+ result *= static_cast<FloatingPoint>(`
	`1439`	`+ std::pow(static_cast<FloatingPoint>(10.0), static_cast<FloatingPoint>(state->exponent_number)));`
`1438`	`1440`
`1439`	`1441`	`#pragma push_macro("max")`
`1440`	`1442`	`#undef max`
`@@ -1447,7 +1449,8 @@ static pplx::task<FloatingPoint> _extract_result(std::shared_ptr<_double_state<F`
`1447`	`1449`	`{`
`1448`	`1450`	`bool is_zero = (result == 0);`
`1449`	`1451`
`1450`		`- result /= pow(FloatingPoint(10.0), -state->exponent_number);`
	`1452`	`+ result /= static_cast<FloatingPoint>(`
	`1453`	`+ std::pow(static_cast<FloatingPoint>(10.0), static_cast<FloatingPoint>(-state->exponent_number)));`
`1451`	`1454`
`1452`	`1455`	`if (!is_zero && result > -std::numeric_limits<FloatingPoint>::denorm_min() &&`
`1453`	`1456`	`result < std::numeric_limits<FloatingPoint>::denorm_min())`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 7876d75

File tree

5 files changed

5 files changed

`‎Release/include/cpprest/asyncrt_utils.h`

`‎Release/include/cpprest/streams.h`

0 commit comments