[18-30] Replace typedefs with alias #704

AlisdairM · 2016-04-15T15:56:28Z

This set of changes replace (almost) all use of 'typedef' in the library with a type alias instead:
typedef Original NewName; -> using NewName = Original;

Attention was paid to retaining table-like formatting where present, which is worth reviewing in case I made idiosyncratic choices.

Clause 20 has NOT been applied, as that clause is churning a bit at the moment, and I don't want a conflict there to hold up a this review. The most likely conflict is my own pull request:
#683
I will happily rebase and complete the work once that branch lands (or is deferred again until this branch completes)

A second set of changes that should follow are to update the text that refers to typedefs to perhaps use a term more consistent with the type alias syntax applied here - but I defer to the project editors to suggest such phrasing.

AlisdairM · 2016-04-15T15:57:24Z

This pull request addresses #581

AlisdairM · 2016-04-15T15:59:50Z

Note that I can break this down into a dozen distinct file-specific pull requests if that is preferred; the suggestion in the issue is that a single pull large pull request was the way to go though.

The are no changes to clause 19 and 25, and I deliberately stayed out of clause 29 as that clause is deliberately written using C idioms.

jwakely · 2016-04-15T16:26:11Z

Thanks. I think a single pull request makes more sense. I'll go through this asap and merge.

tkoeppe · 2016-04-15T17:47:32Z

source/containers.tex

+    using const_pointer          = typename allocator_traits<Allocator>::const_pointer;
+    using reference              = value_type&;
+    using const_reference        = const value_type&;
+    using size_type              = @\impdefnc@; // see \ref{container.requirements}


We can get rid of the non-correcting forms here (i.e. use just \impdef) now that the alignment at the ragged edge doesn't matter anymore.

If I understand correctly, you are saying replace '\impdefnc' with '\impdef'?
If so, is that a general rule, or applies only to header synopses and other code snippets?

Correct. "nc" stands for "no (italic) correction", which affects the column alignment. You ought to be able to see the difference (look for how characters (fail to) align on the grid without the correction). But now that the relevant text is at the end of the line, there's nothing left to be aligned, and we don't need to control the italic correction.

That was one of the benefits of changing typedef to using that @zygoloid pointed out in his first email about this subject a few months ago if I recall correctly.

AlisdairM · 2016-04-16T19:05:28Z

Final (I hope!) patch adds the updates for [utility]. I will now wait for this pull request to land before once-again rebasing #683

tkoeppe · 2016-04-19T22:17:57Z

Can you squash the few fixup commits you have into the respective main commits?

AlisdairM · 2016-04-19T22:31:14Z

Squash them all as a single commit, or just the last couple?

tkoeppe · 2016-04-19T23:16:53Z

Just the ones that are fixups - 0f6d327 and 8933e27.

(You may wish to first rebase those commits to the front, then reset (= uncommit the changes), then recommit them as small per-file commits, and then "fixup"-rebase those onto their main commits. git rebase -i and git add --patch are your friends.)

lv-zheng · 2016-05-19T07:40:32Z

typo in source/support.tex line 132: using is misspelt as ussing

AlisdairM · 2016-05-24T14:48:34Z

Fixed the typo (thanks lv-zheng) and force-pushed a single squash-commit of the whole branch. No other changes.

zygoloid · 2016-05-30T22:29:42Z

I want to go ahead with this, but not until after Oulu. Sorry if this requires extra rebasing as a result!

tkoeppe · 2016-05-31T10:59:34Z

@zygoloid: Last standard, you didn't want to make major formatting changes after the CD had gone out (e.g. I remember fixing up the vertical whitespace problems with the old heading styles to be one such change). Will there still be room for changes like this after Oulu? Will you only create the CD after the meeting?

AlisdairM · 2016-06-01T20:29:14Z

If we plan to land this after Oulu, is there anything I can do to land it /before/ papers start landing from the meeting. It will be much easier to update the standard for incoming papers with this in place (and editorial discretion when applying updates) than taking another pass to totally redo the work, at an undetermined time after all Oulu papers have landed again.

I will try to rebase and get another clean version up tonight, regardless.

zygoloid · 2016-06-01T20:35:09Z

If we're going to land this before we land the Oulu motions, we may as well do so now. I think you're right, handling the merge as Oulu motions land is not going to be very difficult. (Sorry for not merging this sooner, I'd missed that the pre-Oulu mailing deadline was 2pm not end-of-day, and was putting together the new working draft in a bit of a rush.)

zygoloid · 2016-06-01T20:39:00Z

source/containers.tex

+    using reference       = typename Container::reference;
+    using const_reference = typename Container::const_reference;
+    using size_type       = typename Container::size_type;
+    using container_type  =          Container;


Maybe remove the whitespace before Container here. Now that we're not aligning anything else after the =, this looks a bit odd.

I like my 2-dimensional code :) But defer to the actual project editor on style choice - will update this tonight.

AlisdairM · 2016-06-01T23:58:37Z

Corrected Richard's issues above, and deployed the \grammarterm{typedef-name}{s} in several other places. Tried to avoid reformatting around long lines, but at least one paragraph was re-wrapped.

Rebased, squashed, and --force pushed again.

zygoloid · 2016-06-07T20:21:25Z

source/iterators.tex

+    using char_type         = charT;
+    using traits_type       = traits;
+    using streambuf_type    = basic_streambuf<charT,traits>;
+    using ostream_type = basic_ostream<charT,traits>;



Please align this.

Rebased again (just to be safe) and aligned the line highlighted above - should land cleanly.

This set of changes replace (almost) all use of 'typedef' in the library with a type alias instead: typedef Original NewName; -> using NewName = Original; Attention was paid to retaining table-like formatting where present, which is worth reviewing in case I made idiosyncratic choices. Clause 29 [atomic] was specifically ignored, as there is a desire for the contained code to look as close to a C compatible header as possible.

Replaced typedef with using as per: [18-30] Replace typedefs with alias-declarations (#704)

This set of changes replace (almost) all use of 'typedef' in the library with a type alias instead: typedef Original NewName; -> using NewName = Original; Attention was paid to retaining table-like formatting where present, which is worth reviewing in case I made idiosyncratic choices. Clause 29 [atomic] was specifically ignored, as there is a desire for the contained code to look as close to a C compatible header as possible.

jwakely self-assigned this Apr 15, 2016

tkoeppe reviewed Apr 15, 2016
View reviewed changes

AlisdairM force-pushed the replace_typedefs_with_alias branch from 912b5f2 to 0f6d327 Compare April 16, 2016 17:54

AlisdairM mentioned this pull request Apr 16, 2016

[allocator.adaptor] consolidate memory utilities #683

Merged

AlisdairM force-pushed the replace_typedefs_with_alias branch from 8933e27 to 9e71133 Compare May 24, 2016 14:46

zygoloid reviewed Jun 1, 2016
View reviewed changes

AlisdairM force-pushed the replace_typedefs_with_alias branch from 9e71133 to 50e43e5 Compare June 1, 2016 23:56

zygoloid reviewed Jun 7, 2016
View reviewed changes

AlisdairM force-pushed the replace_typedefs_with_alias branch from 50e43e5 to f2d8a8e Compare June 7, 2016 22:39

zygoloid merged commit c8f1863 into cplusplus:master Jun 8, 2016

AlisdairM deleted the replace_typedefs_with_alias branch June 8, 2016 14:33

burblebee pushed a commit that referenced this pull request Jun 22, 2016

LWG2684 priority_queue lacking comparator typedef

b82c415

Replaced typedef with using as per: [18-30] Replace typedefs with alias-declarations (#704)

burblebee pushed a commit that referenced this pull request Jun 23, 2016

LWG2684 priority_queue lacking comparator typedef

13c996d

Replaced typedef with using as per: [18-30] Replace typedefs with alias-declarations (#704)

burblebee pushed a commit that referenced this pull request Jun 27, 2016

LWG2684 priority_queue lacking comparator typedef

f2b08e9

Replaced typedef with using as per: [18-30] Replace typedefs with alias-declarations (#704)

burblebee pushed a commit that referenced this pull request Jun 27, 2016

LWG2684 priority_queue lacking comparator typedef

7e68f34

Replaced typedef with using as per: [18-30] Replace typedefs with alias-declarations (#704)

burblebee pushed a commit that referenced this pull request Jun 29, 2016

LWG2684 priority_queue lacking comparator typedef

878442a

Replaced typedef with using as per: [18-30] Replace typedefs with alias-declarations (#704)

zygoloid pushed a commit that referenced this pull request Jul 4, 2016

LWG2684 priority_queue lacking comparator typedef

eca530e

Replaced typedef with using as per: [18-30] Replace typedefs with alias-declarations (#704)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[18-30] Replace typedefs with alias #704

[18-30] Replace typedefs with alias #704

AlisdairM commented Apr 15, 2016

AlisdairM commented Apr 15, 2016

AlisdairM commented Apr 15, 2016

jwakely commented Apr 15, 2016

tkoeppe Apr 15, 2016 •

edited

AlisdairM Apr 16, 2016

tkoeppe Apr 16, 2016

AlisdairM commented Apr 16, 2016 •

edited

tkoeppe commented Apr 19, 2016

AlisdairM commented Apr 19, 2016

tkoeppe commented Apr 19, 2016 •

edited

lv-zheng commented May 19, 2016

AlisdairM commented May 24, 2016 •

edited

zygoloid commented May 30, 2016

tkoeppe commented May 31, 2016 •

edited

AlisdairM commented Jun 1, 2016 •

edited

zygoloid commented Jun 1, 2016

zygoloid Jun 1, 2016

AlisdairM Jun 1, 2016

AlisdairM commented Jun 1, 2016

zygoloid Jun 7, 2016

AlisdairM Jun 7, 2016

[18-30] Replace typedefs with alias #704

[18-30] Replace typedefs with alias #704

Conversation

AlisdairM commented Apr 15, 2016

AlisdairM commented Apr 15, 2016

AlisdairM commented Apr 15, 2016

jwakely commented Apr 15, 2016

tkoeppe Apr 15, 2016 • edited

Choose a reason for hiding this comment

AlisdairM Apr 16, 2016

Choose a reason for hiding this comment

tkoeppe Apr 16, 2016

Choose a reason for hiding this comment

AlisdairM commented Apr 16, 2016 • edited

tkoeppe commented Apr 19, 2016

AlisdairM commented Apr 19, 2016

tkoeppe commented Apr 19, 2016 • edited

lv-zheng commented May 19, 2016

AlisdairM commented May 24, 2016 • edited

zygoloid commented May 30, 2016

tkoeppe commented May 31, 2016 • edited

AlisdairM commented Jun 1, 2016 • edited

zygoloid commented Jun 1, 2016

zygoloid Jun 1, 2016

Choose a reason for hiding this comment

AlisdairM Jun 1, 2016

Choose a reason for hiding this comment

AlisdairM commented Jun 1, 2016

zygoloid Jun 7, 2016

Choose a reason for hiding this comment

AlisdairM Jun 7, 2016

Choose a reason for hiding this comment

tkoeppe Apr 15, 2016 •

edited

AlisdairM commented Apr 16, 2016 •

edited

tkoeppe commented Apr 19, 2016 •

edited

AlisdairM commented May 24, 2016 •

edited

tkoeppe commented May 31, 2016 •

edited

AlisdairM commented Jun 1, 2016 •

edited