Skip to content
This repository was archived by the owner on Jul 8, 2022. It is now read-only.

Add noreturn#435

Merged
bourtemb merged 3 commits intotango-controls:tango-9-ltsfrom
t-b:add_noreturn
Feb 22, 2018
Merged

Add noreturn#435
bourtemb merged 3 commits intotango-controls:tango-9-ltsfrom
t-b:add_noreturn

Conversation

@t-b
Copy link
Copy Markdown
Collaborator

@t-b t-b commented Feb 14, 2018

No description provided.

Copy link
Copy Markdown
Member

@bourtemb bourtemb left a comment

Choose a reason for hiding this comment

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

@t-b, thank you very much for this PR which will reduce the number of compilation warnings, which is a good thing. We have conflicts to be resolved in cppapi/server/tango_config.h since this file has been modified by several PRs which have now been merged since you worked on this file.
Could you please try to solve these conflicts?

Comment thread cppapi/server/tango_config.h Outdated
#elif ((_MSC_VER >= 1900) && (_MSC_VER < 1910))
#define WIN32_VC14
#elif (_MSC_VER >= 1910)
#define WIN32_VC141
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.

It looks like there is no added value in adding a special case for VC141 for the moment so I would keep it simple for the moment and define WIN32_VC14 if (_MSC_VER >= 1900).

@t-b
Copy link
Copy Markdown
Collaborator Author

t-b commented Feb 20, 2018

@bourtemb Sure. Done.

Comment thread cppapi/server/tango_config.h Outdated
#define HAS_THREAD
#define HAS_TYPE_TRAITS
#define HAS_VARIADIC_TEMPLATE
#define HAS_ATTRIBUTE_SPECIFIERS
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.

According to the comment on line 142, shouldn't HAS_ATTRIBUTE_SPECIFIERS be defined for GCC >= 4.8 instead of >4.3?

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.

@t-b , this is probably the reason why Travis CI tests failed on Debian 7, where the compiler is gcc 4.7.2.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

@bourtemb Yes you are totally right. Looks like my conflict resolution messed that up again. Fixed.

t-b added 3 commits February 21, 2018 12:02
This makes it possible to write code like

std::string func()
{
  //

 Tango::Except::throw_exception(...);
}

without getting a compiler warning.
Copy link
Copy Markdown
Member

@bourtemb bourtemb left a comment

Choose a reason for hiding this comment

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

Thank you very much @t-b for this contribution and for having taken the time to solve the conflicts.

@bourtemb bourtemb merged commit b0cb972 into tango-controls:tango-9-lts Feb 22, 2018
@t-b t-b deleted the add_noreturn branch February 22, 2018 10:05
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants