Skip to content

Merging v2 into master #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
devjgm merged 74 commits into from
Apr 7, 2016
Merged

Merging v2 into master #21

devjgm merged 74 commits into from
Apr 7, 2016

Conversation

@devjgm
Copy link
Contributor

@devjgm devjgm commented Apr 7, 2016

Merging the v2 into the master branch. CCTZ v2 includes both the civil-time and time-zone libraries.

devbww and others added 30 commits March 3, 2016 16:12
@devbww
CCTZ Version 2.
84abf32 
Adds civil-time classes and new time-zone interfaces.
These are being proposed for C++ standardization.
@devbww
Add cctz::convert() helpers.
3642970
@devbww
Correct k_dp4y[] size.
820bbb2
@devbww
Fix a get_weekday() comment typo.
fa5f244
@devbww
Move the public headers to their own directory.
48703f3
@devbww
Move civil_time_detail.h to the public header directory too.
ce8a534
@devbww
Do not include civil_time_detail.h from within a namespace.
3559c98
Reworded some comments
ce37749
more comment tweaking
5a552bd
Added separate library targets for civiltime and timezone
26b652e
@devbww
Move the public headers to their own directory.
6fc904c
fixed operator<
d54c9ec
@devbww
Merge branch 'v2' of https://github.com/google/cctz into v2
623ec5a
adds operator<< support for civil time
089826f
Merge branch 'v2' of https://github.com/google/cctz into v2
a31fcce
@devjgm
Added blank line per Brad's suggestion.
8faa02f
added streaming support to cctz::weekday
60f1b47
updated readme
7487989
@devjgm
Fixed code formatting.
7e4d6e1
@devjgm
Added link to mailing list.
21900b9
@devjgm
Added logic to clean up .dSYM files
16d01eb
@devjgm
.
41233ea
@devjgm
.
bbcce66
@devjgm
Removed syntax highlighting of code blocks.
ea482cd 
The highlighter was making some percent signs in the format string red, which looked terrible.
@devjgm
added a makefile comment
4553c55
@devjgm
Merge branch 'v2' of https://github.com/google/cctz into v2
a5a9f49
@devbww
Reinstate allowance for 32-bit zoneinfo on pre-1902 dates.
c736b77
@devbww
Also clean up .dSYM for tests (if Makefile ever builds them).
d8610e5
@devjgm
Update README.md
318a143
@devbww
Makefile: support building from a subdir, and auto dependencies.
2a3a8c6
devbww and others added 27 commits April 1, 2016 15:14
@devbww
Move the constexpr data into the matching constexpr function
42531e8 
now that we demand C++14 support.  Also optimize dpm() a little.
@devbww
Add missing constexpr to implicit civil_time constructor.
d342dc8
@devbww
Field normalization: convert direct recursion to loops.
a42ddeb
@devbww
Field normalization: coalesce n_C() descendants into a single function.
0ac5ed8
@devbww
Field normalization: coalesce n_C4c() descendants into a single funct…
785574e 
…ion.
@devbww
Field normalization: coalesce month/hour/minute/second functions.
8aa56b4
@devbww
Convert next/prev_weekday() recursion to loops.
a8dd0ce
@devbww
Streaming of civil_time values should behave like single strings.
942d72f
@devbww
Field normalization: use simpler names after constexpr re-rolling.
c120829
@devbww
Use finer-grained constexpr backwards-compatibility defines.
9f7d732
@devbww
Re-roll ymd_ord() implementation for C++14 constexpr.
b3bea0f
@devbww
Field normalization: Replace k_days_per_century[] with code.
1191cdb
@devbww
Update cctz.h file header/copyright to match other files.
708d814
@devbww
Field normalization: use a clearer name for the days-per-month array.
f6101b2
@devbww
Wrap some long lines.
10229ab
@devbww
Field normalization: add an extra 4-century check to n_day().
08c8386
@devbww
Field normalization: bypass the days_per_month loop when possible.
50c326a
@devbww
Field normalization: replace k_days_per_4years[] with code.
3a7770d
added comment about alignment conversions
5fc1d6c
@devbww
Add "noexcept" declarations to the civil-time interface.
f097aa5
made op<< take const-refs
f1b70ee
Added docs about streaming
9776fee
added comment about constexpr
c1d2fcf
@devbww
Remove redundant constexpr from defaulted constructor.
94299ab
@devjgm
.
2a93469
@devbww
Add max()/min() factories for all civil_time types.
582cab4
@devbww
Merge branch 'v2' of https://github.com/google/cctz into v2
a9dafaf
@googlebot
Copy link

googlebot commented Apr 7, 2016

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for the commit author(s). If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.

@devjgm devjgm merged commit 182b96c into master Apr 7, 2016
@devjgm devjgm deleted the v2 branch April 7, 2016 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@devjgm @googlebot @devbww