3party/date
0
0
Fork 0
mirror of https://github.com/HowardHinnant/date.git synced 2024-12-25 23:40:53 +08:00
Code Issues Projects Releases Wiki Activity

Remove trailing whitespace and add gitattributes (#672)

Browse Source
This commit is contained in:
Aaron Franke 2021-05-24 08:22:43 -04:00 committed by GitHub
parent 38267fa1ef
commit 417402ad35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 105 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored Normal file
View File

@ -0,0 +1,2 @@
# Normalize EOL for all files that Git considers text files.
* text=auto eol=lf

2
.gitignore vendored
View File

@ -135,7 +135,7 @@ publish/
# Publish Web Output # Publish Web Output
*.[Pp]ublish.xml *.[Pp]ublish.xml
*.azurePubxml *.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings # TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted # but database connection strings (with potential passwords) will be unencrypted
*.pubxml *.pubxml
*.publishproj *.publishproj

4
include/date/ios.h
View File

@ -36,10 +36,10 @@
{ {
namespace iOSUtils namespace iOSUtils
{ {
std::string get_tzdata_path(); std::string get_tzdata_path();
std::string get_current_timezone(); std::string get_current_timezone();
} // namespace iOSUtils } // namespace iOSUtils
} // namespace date } // namespace date

16
include/date/julian.h
View File

@ -1655,10 +1655,10 @@ inline
bool bool
month_day::ok() const NOEXCEPT month_day::ok() const NOEXCEPT
{ {
CONSTDATA julian::day d[] = { CONSTDATA julian::day d[] = {
julian::day(31), julian::day(29), julian::day(31), julian::day(30), julian::day(31), julian::day(29), julian::day(31), julian::day(30),
julian::day(31), julian::day(30), julian::day(31), julian::day(31), julian::day(31), julian::day(30), julian::day(31), julian::day(31),
julian::day(30), julian::day(31), julian::day(30), julian::day(31) julian::day(30), julian::day(31), julian::day(30), julian::day(31)
}; };
return m_.ok() && julian::day(1) <= d_ && d_ <= d[static_cast<unsigned>(m_)-1]; return m_.ok() && julian::day(1) <= d_ && d_ <= d[static_cast<unsigned>(m_)-1];
} }
@ -1949,10 +1949,10 @@ inline
day day
year_month_day_last::day() const NOEXCEPT year_month_day_last::day() const NOEXCEPT
{ {
CONSTDATA julian::day d[] = { CONSTDATA julian::day d[] = {
julian::day(31), julian::day(28), julian::day(31), julian::day(30), julian::day(31), julian::day(28), julian::day(31), julian::day(30),
julian::day(31), julian::day(30), julian::day(31), julian::day(31), julian::day(31), julian::day(30), julian::day(31), julian::day(31),
julian::day(30), julian::day(31), julian::day(30), julian::day(31) julian::day(30), julian::day(31), julian::day(30), julian::day(31)
}; };
return month() != feb || !y_.is_leap() ? d[static_cast<unsigned>(month())-1] : julian::day(29); return month() != feb || !y_.is_leap() ? d[static_cast<unsigned>(month())-1] : julian::day(29);
} }

20
include/date/solar_hijri.h
View File

@ -1707,11 +1707,11 @@ inline
bool bool
month_day::ok() const NOEXCEPT month_day::ok() const NOEXCEPT
{ {
CONSTDATA solar_hijri::day d[] = { CONSTDATA solar_hijri::day d[] = {
solar_hijri::day(31), solar_hijri::day(31), solar_hijri::day(31), solar_hijri::day(31), solar_hijri::day(31), solar_hijri::day(31),
solar_hijri::day(31), solar_hijri::day(31), solar_hijri::day(31), solar_hijri::day(31), solar_hijri::day(31), solar_hijri::day(31),
solar_hijri::day(30), solar_hijri::day(30), solar_hijri::day(30), solar_hijri::day(30), solar_hijri::day(30), solar_hijri::day(30),
solar_hijri::day(30), solar_hijri::day(30), solar_hijri::day(30) solar_hijri::day(30), solar_hijri::day(30), solar_hijri::day(30)
}; };
return m_.ok() && solar_hijri::day(1) <= d_ && d_ <= d[static_cast<unsigned>(m_)-1]; return m_.ok() && solar_hijri::day(1) <= d_ && d_ <= d[static_cast<unsigned>(m_)-1];
} }
@ -2002,11 +2002,11 @@ inline
day day
year_month_day_last::day() const NOEXCEPT year_month_day_last::day() const NOEXCEPT
{ {
CONSTDATA solar_hijri::day d[] = { CONSTDATA solar_hijri::day d[] = {
solar_hijri::day(31), solar_hijri::day(31), solar_hijri::day(31), solar_hijri::day(31), solar_hijri::day(31), solar_hijri::day(31),
solar_hijri::day(31), solar_hijri::day(31), solar_hijri::day(31), solar_hijri::day(31), solar_hijri::day(31), solar_hijri::day(31),
solar_hijri::day(30), solar_hijri::day(30), solar_hijri::day(30), solar_hijri::day(30), solar_hijri::day(30), solar_hijri::day(30),
solar_hijri::day(30), solar_hijri::day(30), solar_hijri::day(29) solar_hijri::day(30), solar_hijri::day(30), solar_hijri::day(29)
}; };
return month() != esf || !y_.is_leap() ? return month() != esf || !y_.is_leap() ?
d[static_cast<unsigned>(month()) - 1] : solar_hijri::day(30); d[static_cast<unsigned>(month()) - 1] : solar_hijri::day(30);

110
src/ios.mm
View File

@ -51,7 +51,7 @@ namespace date
{ {
namespace iOSUtils namespace iOSUtils
{ {
struct TarInfo struct TarInfo
{ {
char objType; char objType;
@ -60,14 +60,14 @@ namespace date
size_t blocksContentSize; // adjusted size to 512 bytes blocks size_t blocksContentSize; // adjusted size to 512 bytes blocks
bool success; bool success;
}; };
std::string convertCFStringRefPathToCStringPath(CFStringRef ref); std::string convertCFStringRefPathToCStringPath(CFStringRef ref);
bool extractTzdata(CFURLRef homeUrl, CFURLRef archiveUrl, std::string destPath); bool extractTzdata(CFURLRef homeUrl, CFURLRef archiveUrl, std::string destPath);
TarInfo getTarObjectInfo(std::ifstream &readStream); TarInfo getTarObjectInfo(std::ifstream &readStream);
std::string getTarObject(std::ifstream &readStream, int64_t size); std::string getTarObject(std::ifstream &readStream, int64_t size);
bool writeFile(const std::string &tzdataPath, const std::string &fileName, bool writeFile(const std::string &tzdataPath, const std::string &fileName,
const std::string &data, size_t realContentSize); const std::string &data, size_t realContentSize);
std::string std::string
get_current_timezone() get_current_timezone()
{ {
@ -75,18 +75,18 @@ namespace date
CFStringRef tzNameRef = CFTimeZoneGetName(tzRef); CFStringRef tzNameRef = CFTimeZoneGetName(tzRef);
CFIndex bufferSize = CFStringGetLength(tzNameRef) + 1; CFIndex bufferSize = CFStringGetLength(tzNameRef) + 1;
char buffer[bufferSize]; char buffer[bufferSize];
if (CFStringGetCString(tzNameRef, buffer, bufferSize, kCFStringEncodingUTF8)) if (CFStringGetCString(tzNameRef, buffer, bufferSize, kCFStringEncodingUTF8))
{ {
CFRelease(tzRef); CFRelease(tzRef);
return std::string(buffer); return std::string(buffer);
} }
CFRelease(tzRef); CFRelease(tzRef);
return ""; return "";
} }
std::string std::string
get_tzdata_path() get_tzdata_path()
{ {
@ -96,7 +96,7 @@ namespace date
INTERNAL_DIR + "/" + TZDATA_DIR); INTERNAL_DIR + "/" + TZDATA_DIR);
std::string result_path(std::string(convertCFStringRefPathToCStringPath(homePath)) + std::string result_path(std::string(convertCFStringRefPathToCStringPath(homePath)) +
INTERNAL_DIR); INTERNAL_DIR);
if (access(path.c_str(), F_OK) == 0) if (access(path.c_str(), F_OK) == 0)
{ {
#if TAR_DEBUG #if TAR_DEBUG
@ -104,34 +104,34 @@ namespace date
#endif #endif
CFRelease(homeUrlRef); CFRelease(homeUrlRef);
CFRelease(homePath); CFRelease(homePath);
return result_path; return result_path;
} }
CFBundleRef mainBundle = CFBundleGetMainBundle(); CFBundleRef mainBundle = CFBundleGetMainBundle();
CFArrayRef paths = CFBundleCopyResourceURLsOfType(mainBundle, CFSTR(TARGZ_EXTENSION), CFArrayRef paths = CFBundleCopyResourceURLsOfType(mainBundle, CFSTR(TARGZ_EXTENSION),
NULL); NULL);
if (CFArrayGetCount(paths) != 0) if (CFArrayGetCount(paths) != 0)
{ {
// get archive path, assume there is no other tar.gz in bundle // get archive path, assume there is no other tar.gz in bundle
CFURLRef archiveUrl = static_cast<CFURLRef>(CFArrayGetValueAtIndex(paths, 0)); CFURLRef archiveUrl = static_cast<CFURLRef>(CFArrayGetValueAtIndex(paths, 0));
CFStringRef archiveName = CFURLCopyPath(archiveUrl); CFStringRef archiveName = CFURLCopyPath(archiveUrl);
archiveUrl = CFBundleCopyResourceURL(mainBundle, archiveName, NULL, NULL); archiveUrl = CFBundleCopyResourceURL(mainBundle, archiveName, NULL, NULL);
extractTzdata(homeUrlRef, archiveUrl, path); extractTzdata(homeUrlRef, archiveUrl, path);
CFRelease(archiveUrl); CFRelease(archiveUrl);
CFRelease(archiveName); CFRelease(archiveName);
} }
CFRelease(homeUrlRef); CFRelease(homeUrlRef);
CFRelease(homePath); CFRelease(homePath);
CFRelease(paths); CFRelease(paths);
return result_path; return result_path;
} }
std::string std::string
convertCFStringRefPathToCStringPath(CFStringRef ref) convertCFStringRefPathToCStringPath(CFStringRef ref)
{ {
@ -142,55 +142,55 @@ namespace date
delete[] buffer; delete[] buffer;
return result; return result;
} }
bool bool
extractTzdata(CFURLRef homeUrl, CFURLRef archiveUrl, std::string destPath) extractTzdata(CFURLRef homeUrl, CFURLRef archiveUrl, std::string destPath)
{ {
std::string TAR_TMP_PATH = "/tmp.tar"; std::string TAR_TMP_PATH = "/tmp.tar";
CFStringRef homeStringRef = CFURLCopyPath(homeUrl); CFStringRef homeStringRef = CFURLCopyPath(homeUrl);
auto homePath = convertCFStringRefPathToCStringPath(homeStringRef); auto homePath = convertCFStringRefPathToCStringPath(homeStringRef);
CFRelease(homeStringRef); CFRelease(homeStringRef);
CFStringRef archiveStringRef = CFURLCopyPath(archiveUrl); CFStringRef archiveStringRef = CFURLCopyPath(archiveUrl);
auto archivePath = convertCFStringRefPathToCStringPath(archiveStringRef); auto archivePath = convertCFStringRefPathToCStringPath(archiveStringRef);
CFRelease(archiveStringRef); CFRelease(archiveStringRef);
// create Library path // create Library path
auto libraryPath = homePath + INTERNAL_DIR; auto libraryPath = homePath + INTERNAL_DIR;
// create tzdata path // create tzdata path
auto tzdataPath = libraryPath + "/" + TZDATA_DIR; auto tzdataPath = libraryPath + "/" + TZDATA_DIR;
// -- replace %20 with " " // -- replace %20 with " "
const std::string search = "%20"; const std::string search = "%20";
const std::string replacement = " "; const std::string replacement = " ";
size_t pos = 0; size_t pos = 0;
while ((pos = archivePath.find(search, pos)) != std::string::npos) { while ((pos = archivePath.find(search, pos)) != std::string::npos) {
archivePath.replace(pos, search.length(), replacement); archivePath.replace(pos, search.length(), replacement);
pos += replacement.length(); pos += replacement.length();
} }
gzFile tarFile = gzopen(archivePath.c_str(), "rb"); gzFile tarFile = gzopen(archivePath.c_str(), "rb");
// create tar unpacking path // create tar unpacking path
auto tarPath = libraryPath + TAR_TMP_PATH; auto tarPath = libraryPath + TAR_TMP_PATH;
// create tzdata directory // create tzdata directory
mkdir(destPath.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); mkdir(destPath.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
// ======= extract tar ======== // ======= extract tar ========
std::ofstream os(tarPath.c_str(), std::ofstream::out | std::ofstream::app); std::ofstream os(tarPath.c_str(), std::ofstream::out | std::ofstream::app);
unsigned int bufferLength = 1024 * 256; // 256Kb unsigned int bufferLength = 1024 * 256; // 256Kb
unsigned char *buffer = (unsigned char *)malloc(bufferLength); unsigned char *buffer = (unsigned char *)malloc(bufferLength);
bool success = true; bool success = true;
while (true) while (true)
{ {
int readBytes = gzread(tarFile, buffer, bufferLength); int readBytes = gzread(tarFile, buffer, bufferLength);
if (readBytes > 0) if (readBytes > 0)
{ {
os.write((char *) &buffer[0], readBytes); os.write((char *) &buffer[0], readBytes);
@ -214,21 +214,21 @@ namespace date
break; break;
} }
} }
os.close(); os.close();
free(buffer); free(buffer);
gzclose(tarFile); gzclose(tarFile);
if (!success) if (!success)
{ {
remove(tarPath.c_str()); remove(tarPath.c_str());
return false; return false;
} }
// ======== extract files ========= // ======== extract files =========
uint64_t location = 0; // Position in the file uint64_t location = 0; // Position in the file
// get file size // get file size
struct stat stat_buf; struct stat stat_buf;
int res = stat(tarPath.c_str(), &stat_buf); int res = stat(tarPath.c_str(), &stat_buf);
@ -239,20 +239,20 @@ namespace date
return false; return false;
} }
int64_t tarSize = stat_buf.st_size; int64_t tarSize = stat_buf.st_size;
// create read stream // create read stream
std::ifstream is(tarPath.c_str(), std::ifstream::in | std::ifstream::binary); std::ifstream is(tarPath.c_str(), std::ifstream::in | std::ifstream::binary);
// process files // process files
while (location < tarSize) while (location < tarSize)
{ {
TarInfo info = getTarObjectInfo(is); TarInfo info = getTarObjectInfo(is);
if (!info.success || info.realContentSize == 0) if (!info.success || info.realContentSize == 0)
{ {
break; // something wrong or all files are read break; // something wrong or all files are read
} }
switch (info.objType) switch (info.objType)
{ {
case '0': // file case '0': // file
@ -266,17 +266,17 @@ namespace date
#endif #endif
writeFile(tzdataPath, info.objName, obj, info.realContentSize); writeFile(tzdataPath, info.objName, obj, info.realContentSize);
location += info.blocksContentSize; location += info.blocksContentSize;
break; break;
} }
} }
} }
remove(tarPath.c_str()); remove(tarPath.c_str());
return true; return true;
} }
TarInfo TarInfo
getTarObjectInfo(std::ifstream &readStream) getTarObjectInfo(std::ifstream &readStream)
{ {
@ -285,22 +285,22 @@ namespace date
char type; char type;
char name[TAR_NAME_SIZE + 1]; char name[TAR_NAME_SIZE + 1];
char sizeBuf[TAR_SIZE_SIZE + 1]; char sizeBuf[TAR_SIZE_SIZE + 1];
readStream.read(buffer, length); readStream.read(buffer, length);
memcpy(&type, &buffer[TAR_TYPE_POSITION], 1); memcpy(&type, &buffer[TAR_TYPE_POSITION], 1);
memset(&name, '\0', TAR_NAME_SIZE + 1); memset(&name, '\0', TAR_NAME_SIZE + 1);
memcpy(&name, &buffer[TAR_NAME_POSITION], TAR_NAME_SIZE); memcpy(&name, &buffer[TAR_NAME_POSITION], TAR_NAME_SIZE);
memset(&sizeBuf, '\0', TAR_SIZE_SIZE + 1); memset(&sizeBuf, '\0', TAR_SIZE_SIZE + 1);
memcpy(&sizeBuf, &buffer[TAR_SIZE_POSITION], TAR_SIZE_SIZE); memcpy(&sizeBuf, &buffer[TAR_SIZE_POSITION], TAR_SIZE_SIZE);
size_t realSize = strtol(sizeBuf, NULL, 8); size_t realSize = strtol(sizeBuf, NULL, 8);
size_t blocksSize = realSize + (TAR_BLOCK_SIZE - (realSize % TAR_BLOCK_SIZE)); size_t blocksSize = realSize + (TAR_BLOCK_SIZE - (realSize % TAR_BLOCK_SIZE));
return {type, std::string(name), realSize, blocksSize, true}; return {type, std::string(name), realSize, blocksSize, true};
} }
std::string std::string
getTarObject(std::ifstream &readStream, int64_t size) getTarObject(std::ifstream &readStream, int64_t size)
{ {
@ -308,29 +308,29 @@ namespace date
readStream.read(buffer, size); readStream.read(buffer, size);
return std::string(buffer); return std::string(buffer);
} }
bool bool
writeFile(const std::string &tzdataPath, const std::string &fileName, const std::string &data, writeFile(const std::string &tzdataPath, const std::string &fileName, const std::string &data,
size_t realContentSize) size_t realContentSize)
{ {
std::ofstream os(tzdataPath + "/" + fileName, std::ofstream::out | std::ofstream::binary); std::ofstream os(tzdataPath + "/" + fileName, std::ofstream::out | std::ofstream::binary);
if (!os) { if (!os) {
return false; return false;
} }
// trim empty space // trim empty space
char trimmedData[realContentSize + 1]; char trimmedData[realContentSize + 1];
memset(&trimmedData, '\0', realContentSize); memset(&trimmedData, '\0', realContentSize);
memcpy(&trimmedData, data.c_str(), realContentSize); memcpy(&trimmedData, data.c_str(), realContentSize);
// write // write
os.write(trimmedData, realContentSize); os.write(trimmedData, realContentSize);
os.close(); os.close();
return true; return true;
} }
} // namespace iOSUtils } // namespace iOSUtils
} // namespace date } // namespace date

6
test/date_test/detail/decimal_format_seconds.pass.cpp
View File

@ -33,15 +33,15 @@
// private: // private:
// std::chrono::seconds s_; // std::chrono::seconds s_;
// precision sub_s_; // precision sub_s_;
// //
// public: // public:
// constexpr explicit decimal_format_seconds(const Duration& d) noexcept; // constexpr explicit decimal_format_seconds(const Duration& d) noexcept;
// //
// constexpr std::chrono::seconds& seconds() noexcept; // constexpr std::chrono::seconds& seconds() noexcept;
// constexpr std::chrono::seconds seconds() const noexcept; // constexpr std::chrono::seconds seconds() const noexcept;
// constexpr precision subseconds() const noexcept; // constexpr precision subseconds() const noexcept;
// constexpr precision to_duration() const noexcept; // constexpr precision to_duration() const noexcept;
// //
// template <class CharT, class Traits> // template <class CharT, class Traits>
// friend // friend
// std::basic_ostream<CharT, Traits>& // std::basic_ostream<CharT, Traits>&

22
test/date_test/multi_year_duration_addition.pass.cpp
View File

@ -83,7 +83,7 @@ main()
constexpr ConvertibleToMonths custom_month; constexpr ConvertibleToMonths custom_month;
constexpr ConvertibleToYears custom_year; constexpr ConvertibleToYears custom_year;
constexpr ConvertibleToYearsAndMonths prefer_year; constexpr ConvertibleToYearsAndMonths prefer_year;
{ {
constexpr year_month ym = 2001_y/feb; constexpr year_month ym = 2001_y/feb;
@ -97,7 +97,7 @@ main()
NOEXCEPT_ASSERT(copy(ym) += one_month); NOEXCEPT_ASSERT(copy(ym) += one_month);
CPP14_ASSERT((copy(ym) -= one_month) == 2001_y/jan); CPP14_ASSERT((copy(ym) -= one_month) == 2001_y/jan);
NOEXCEPT_ASSERT(copy(ym) -= one_month); NOEXCEPT_ASSERT(copy(ym) -= one_month);
CPP11_ASSERT(ym + one_year == 2002_y/feb); CPP11_ASSERT(ym + one_year == 2002_y/feb);
NOEXCEPT_ASSERT(ym + one_year); NOEXCEPT_ASSERT(ym + one_year);
CPP11_ASSERT(one_year + ym == 2002_y/feb); CPP11_ASSERT(one_year + ym == 2002_y/feb);
@ -141,7 +141,7 @@ main()
NOEXCEPT_ASSERT(copy(ym) += custom_month); NOEXCEPT_ASSERT(copy(ym) += custom_month);
CPP14_ASSERT((copy(ym) -= custom_month) == 2001_y/jan); CPP14_ASSERT((copy(ym) -= custom_month) == 2001_y/jan);
NOEXCEPT_ASSERT(copy(ym) -= custom_month); NOEXCEPT_ASSERT(copy(ym) -= custom_month);
CPP11_ASSERT(ym + custom_year == 2002_y/feb); CPP11_ASSERT(ym + custom_year == 2002_y/feb);
NOEXCEPT_ASSERT(ym + custom_year); NOEXCEPT_ASSERT(ym + custom_year);
CPP11_ASSERT(custom_year + ym == 2002_y/feb); CPP11_ASSERT(custom_year + ym == 2002_y/feb);
@ -177,7 +177,7 @@ main()
NOEXCEPT_ASSERT(copy(ym) += one_month); NOEXCEPT_ASSERT(copy(ym) += one_month);
CPP14_ASSERT((copy(ym) -= one_month) == 2001_y/jan/10); CPP14_ASSERT((copy(ym) -= one_month) == 2001_y/jan/10);
NOEXCEPT_ASSERT(copy(ym) -= one_month); NOEXCEPT_ASSERT(copy(ym) -= one_month);
CPP11_ASSERT(ym + one_year == 2002_y/feb/10); CPP11_ASSERT(ym + one_year == 2002_y/feb/10);
NOEXCEPT_ASSERT(ym + one_year); NOEXCEPT_ASSERT(ym + one_year);
CPP11_ASSERT(one_year + ym == 2002_y/feb/10); CPP11_ASSERT(one_year + ym == 2002_y/feb/10);
@ -221,7 +221,7 @@ main()
NOEXCEPT_ASSERT(copy(ym) += custom_month); NOEXCEPT_ASSERT(copy(ym) += custom_month);
CPP14_ASSERT((copy(ym) -= custom_month) == 2001_y/jan/10); CPP14_ASSERT((copy(ym) -= custom_month) == 2001_y/jan/10);
NOEXCEPT_ASSERT(copy(ym) -= custom_month); NOEXCEPT_ASSERT(copy(ym) -= custom_month);
CPP11_ASSERT(ym + custom_year == 2002_y/feb/10); CPP11_ASSERT(ym + custom_year == 2002_y/feb/10);
NOEXCEPT_ASSERT(ym + custom_year); NOEXCEPT_ASSERT(ym + custom_year);
CPP11_ASSERT(custom_year + ym == 2002_y/feb/10); CPP11_ASSERT(custom_year + ym == 2002_y/feb/10);
@ -257,7 +257,7 @@ main()
NOEXCEPT_ASSERT(copy(ym) += one_month); NOEXCEPT_ASSERT(copy(ym) += one_month);
CPP14_ASSERT((copy(ym) -= one_month) == 2001_y/jan/last); CPP14_ASSERT((copy(ym) -= one_month) == 2001_y/jan/last);
NOEXCEPT_ASSERT(copy(ym) -= one_month); NOEXCEPT_ASSERT(copy(ym) -= one_month);
CPP11_ASSERT(ym + one_year == 2002_y/feb/last); CPP11_ASSERT(ym + one_year == 2002_y/feb/last);
NOEXCEPT_ASSERT(ym + one_year); NOEXCEPT_ASSERT(ym + one_year);
CPP11_ASSERT(one_year + ym == 2002_y/feb/last); CPP11_ASSERT(one_year + ym == 2002_y/feb/last);
@ -301,7 +301,7 @@ main()
NOEXCEPT_ASSERT(copy(ym) += custom_month); NOEXCEPT_ASSERT(copy(ym) += custom_month);
CPP14_ASSERT((copy(ym) -= custom_month) == 2001_y/jan/last); CPP14_ASSERT((copy(ym) -= custom_month) == 2001_y/jan/last);
NOEXCEPT_ASSERT(copy(ym) -= custom_month); NOEXCEPT_ASSERT(copy(ym) -= custom_month);
CPP11_ASSERT(ym + custom_year == 2002_y/feb/last); CPP11_ASSERT(ym + custom_year == 2002_y/feb/last);
NOEXCEPT_ASSERT(ym + custom_year); NOEXCEPT_ASSERT(ym + custom_year);
CPP11_ASSERT(custom_year + ym == 2002_y/feb/last); CPP11_ASSERT(custom_year + ym == 2002_y/feb/last);
@ -337,7 +337,7 @@ main()
NOEXCEPT_ASSERT(copy(ym) += one_month); NOEXCEPT_ASSERT(copy(ym) += one_month);
CPP14_ASSERT((copy(ym) -= one_month) == 2001_y/jan/fri[4]); CPP14_ASSERT((copy(ym) -= one_month) == 2001_y/jan/fri[4]);
NOEXCEPT_ASSERT(copy(ym) -= one_month); NOEXCEPT_ASSERT(copy(ym) -= one_month);
CPP11_ASSERT(ym + one_year == 2002_y/feb/fri[4]); CPP11_ASSERT(ym + one_year == 2002_y/feb/fri[4]);
NOEXCEPT_ASSERT(ym + one_year); NOEXCEPT_ASSERT(ym + one_year);
CPP11_ASSERT(one_year + ym == 2002_y/feb/fri[4]); CPP11_ASSERT(one_year + ym == 2002_y/feb/fri[4]);
@ -381,7 +381,7 @@ main()
NOEXCEPT_ASSERT(copy(ym) += custom_month); NOEXCEPT_ASSERT(copy(ym) += custom_month);
CPP14_ASSERT((copy(ym) -= custom_month) == 2001_y/jan/fri[4]); CPP14_ASSERT((copy(ym) -= custom_month) == 2001_y/jan/fri[4]);
NOEXCEPT_ASSERT(copy(ym) -= custom_month); NOEXCEPT_ASSERT(copy(ym) -= custom_month);
CPP11_ASSERT(ym + custom_year == 2002_y/feb/fri[4]); CPP11_ASSERT(ym + custom_year == 2002_y/feb/fri[4]);
NOEXCEPT_ASSERT(ym + custom_year); NOEXCEPT_ASSERT(ym + custom_year);
CPP11_ASSERT(custom_year + ym == 2002_y/feb/fri[4]); CPP11_ASSERT(custom_year + ym == 2002_y/feb/fri[4]);
@ -417,7 +417,7 @@ main()
NOEXCEPT_ASSERT(copy(ym) += one_month); NOEXCEPT_ASSERT(copy(ym) += one_month);
CPP14_ASSERT((copy(ym) -= one_month) == 2001_y/jan/fri[last]); CPP14_ASSERT((copy(ym) -= one_month) == 2001_y/jan/fri[last]);
NOEXCEPT_ASSERT(copy(ym) -= one_month); NOEXCEPT_ASSERT(copy(ym) -= one_month);
CPP11_ASSERT(ym + one_year == 2002_y/feb/fri[last]); CPP11_ASSERT(ym + one_year == 2002_y/feb/fri[last]);
NOEXCEPT_ASSERT(ym + one_year); NOEXCEPT_ASSERT(ym + one_year);
CPP11_ASSERT(one_year + ym == 2002_y/feb/fri[last]); CPP11_ASSERT(one_year + ym == 2002_y/feb/fri[last]);
@ -461,7 +461,7 @@ main()
NOEXCEPT_ASSERT(copy(ym) += custom_month); NOEXCEPT_ASSERT(copy(ym) += custom_month);
CPP14_ASSERT((copy(ym) -= custom_month) == 2001_y/jan/fri[last]); CPP14_ASSERT((copy(ym) -= custom_month) == 2001_y/jan/fri[last]);
NOEXCEPT_ASSERT(copy(ym) -= custom_month); NOEXCEPT_ASSERT(copy(ym) -= custom_month);
CPP11_ASSERT(ym + custom_year == 2002_y/feb/fri[last]); CPP11_ASSERT(ym + custom_year == 2002_y/feb/fri[last]);
NOEXCEPT_ASSERT(ym + custom_year); NOEXCEPT_ASSERT(ym + custom_year);
CPP11_ASSERT(custom_year + ym == 2002_y/feb/fri[last]); CPP11_ASSERT(custom_year + ym == 2002_y/feb/fri[last]);

2
test/date_test/year_month.pass.cpp
View File

@ -123,7 +123,7 @@ void test_arithemtic_not_ok()
assert(ym - months{0} == ym2); assert(ym - months{0} == ym2);
assert(ym - ym2 == months{0}); assert(ym - ym2 == months{0});
assert(ym2 - ym == months{0}); assert(ym2 - ym == months{0});
auto ymc = ym; auto ymc = ym;
ymc += months{0}; ymc += months{0};
assert(ymc.ok()); assert(ymc.ok());

2
test/posix/ptz.pass.cpp
View File

@ -56,7 +56,7 @@ main()
auto tp = local_days{2021_y/1/1} + 0s; auto tp = local_days{2021_y/1/1} + 0s;
assert(tzp.get_info(tp).result == local_info::unique); assert(tzp.get_info(tp).result == local_info::unique);
assert(is_equal(tzi->get_info(tp), tzp.get_info(tp))); assert(is_equal(tzi->get_info(tp), tzp.get_info(tp)));
tp = local_days{2021_y/10/Sunday[1]} + 2h + 30min; tp = local_days{2021_y/10/Sunday[1]} + 2h + 30min;
assert(tzp.get_info(tp).result == local_info::nonexistent); assert(tzp.get_info(tp).result == local_info::nonexistent);
assert(is_equal(tzi->get_info(tp), tzp.get_info(tp))); assert(is_equal(tzi->get_info(tp), tzp.get_info(tp)));

20
test/tz_test/zoned_time.pass.cpp
View File

@ -25,12 +25,12 @@
// { // {
// public: // public:
// using duration = typename std::common_type<Duration, std::chrono::seconds>::type; // using duration = typename std::common_type<Duration, std::chrono::seconds>::type;
// //
// zoned_time(); // zoned_time();
// zoned_time(const sys_time<Duration>& st); // zoned_time(const sys_time<Duration>& st);
// explicit zoned_time(const time_zone* z); // explicit zoned_time(const time_zone* z);
// explicit zoned_time(std::string_view name); // explicit zoned_time(std::string_view name);
// //
// template <class Duration2, // template <class Duration2,
// class = typename std::enable_if // class = typename std::enable_if
// < // <
@ -38,36 +38,36 @@
// sys_time<Duration>>::value // sys_time<Duration>>::value
// >::type> // >::type>
// zoned_time(const zoned_time<Duration2>& zt) NOEXCEPT; // zoned_time(const zoned_time<Duration2>& zt) NOEXCEPT;
// //
// zoned_time(const time_zone* z, const local_time<Duration>& tp); // zoned_time(const time_zone* z, const local_time<Duration>& tp);
// zoned_time(std::string_view name, const local_time<Duration>& tp); // zoned_time(std::string_view name, const local_time<Duration>& tp);
// zoned_time(const time_zone* z, const local_time<Duration>& tp, choose c); // zoned_time(const time_zone* z, const local_time<Duration>& tp, choose c);
// zoned_time(std::string_view name, const local_time<Duration>& tp, choose c); // zoned_time(std::string_view name, const local_time<Duration>& tp, choose c);
// //
// zoned_time(const time_zone* z, const zoned_time<Duration>& zt); // zoned_time(const time_zone* z, const zoned_time<Duration>& zt);
// zoned_time(std::string_view name, const zoned_time<Duration>& zt); // zoned_time(std::string_view name, const zoned_time<Duration>& zt);
// zoned_time(const time_zone* z, const zoned_time<Duration>& zt, choose); // zoned_time(const time_zone* z, const zoned_time<Duration>& zt, choose);
// zoned_time(std::string_view name, const zoned_time<Duration>& zt, choose); // zoned_time(std::string_view name, const zoned_time<Duration>& zt, choose);
// //
// zoned_time(const time_zone* z, const sys_time<Duration>& st); // zoned_time(const time_zone* z, const sys_time<Duration>& st);
// zoned_time(std::string_view name, const sys_time<Duration>& st); // zoned_time(std::string_view name, const sys_time<Duration>& st);
// //
// zoned_time& operator=(const sys_time<Duration>& st); // zoned_time& operator=(const sys_time<Duration>& st);
// zoned_time& operator=(const local_time<Duration>& ut); // zoned_time& operator=(const local_time<Duration>& ut);
// //
// explicit operator sys_time<duration>() const; // explicit operator sys_time<duration>() const;
// explicit operator local_time<duration>() const; // explicit operator local_time<duration>() const;
// //
// const time_zone* get_time_zone() const; // const time_zone* get_time_zone() const;
// local_time<duration> get_local_time() const; // local_time<duration> get_local_time() const;
// sys_time<duration> get_sys_time() const; // sys_time<duration> get_sys_time() const;
// sys_info get_info() const; // sys_info get_info() const;
// //
// template <class Duration1, class Duration2> // template <class Duration1, class Duration2>
// friend // friend
// bool // bool
// operator==(const zoned_time<Duration1>& x, const zoned_time<Duration2>& y); // operator==(const zoned_time<Duration1>& x, const zoned_time<Duration2>& y);
// //
// template <class CharT, class Traits, class Duration1> // template <class CharT, class Traits, class Duration1>
// friend // friend
// std::basic_ostream<CharT, Traits>& // std::basic_ostream<CharT, Traits>&

2
test/tz_test/zoned_time_deduction.pass.cpp
View File

@ -154,7 +154,7 @@ main()
{ {
zoned_time zt{}; zoned_time zt{};
static_assert(std::is_same<decltype(zt), zoned_time<seconds>>::value, ""); static_assert(std::is_same<decltype(zt), zoned_time<seconds>>::value, "");
} }
// zoned_time // zoned_time
{ {