Skip to content

ICC fixes - #737

Merged
deanberris merged 1 commit into
cpp-netlib:masterfrom
BlueBrain:master
Oct 17, 2017
Merged

ICC fixes#737
deanberris merged 1 commit into
cpp-netlib:masterfrom
BlueBrain:master

Conversation

@eile

@eile eile commented Mar 1, 2017

Copy link
Copy Markdown

No description provided.

@deanberris deanberris left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some changes seem unnecessary and unrelated.

if (boost::empty(content_type_headers)) {
typedef typename char_<Tag>::type char_type;
static char_type content_type[] = "x-application/octet-stream";
static char_type* content_type = "x-application/octet-stream";

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you need to make this change?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the same as #738

if (boost::empty(content_type_headers)) {
typedef typename char_<Tag>::type char_type;
static char_type content_type[] = "x-application/octet-stream";
static char_type* content_type = "x-application/octet-stream";

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

@eile

eile commented Mar 1, 2017

Copy link
Copy Markdown
Author

This is #734 and #738 for master

@dnachbaur

Copy link
Copy Markdown

#734 is already merged into master (was #729 on 0.13).

@eile eile changed the title Expose OS-chosen address and port from async_server ICC fixes Mar 6, 2017
@eile

eile commented Mar 6, 2017

Copy link
Copy Markdown
Author

Corrected to only ICC fixes.

@anonimal

Copy link
Copy Markdown

@deanberris @glynos status?

@deanberris

Copy link
Copy Markdown
Member

LGTM

I'm not sure this is actually a valid change to make -- I don't understand why ICC isn't able to just initialise the character array with a literal, as that's valid C++. However, if this is something that's actively blocking adoption, then I suppose merging it is fine.

@deanberris
deanberris merged commit b17bc59 into cpp-netlib:master Oct 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants