Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
GenFit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eic_tools
GenFit
Commits
3c8c8eb3
Unverified
Commit
3c8c8eb3
authored
7 years ago
by
Nils Braun
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #72 from GenFit/feature/c++17-preparations
Dynamic throw specifications are deprecated and removed in C++17
parents
95b67463
c019b0fe
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/include/Exception.h
+2
-2
2 additions, 2 deletions
core/include/Exception.h
core/src/Exception.cc
+2
-2
2 additions, 2 deletions
core/src/Exception.cc
with
4 additions
and
4 deletions
core/include/Exception.h
+
2
−
2
View file @
3c8c8eb3
...
@@ -55,7 +55,7 @@ class Exception : public std::exception {
...
@@ -55,7 +55,7 @@ class Exception : public std::exception {
* @param file sourcefile in which the exception is created. Can be set through __FILE__ macro.
* @param file sourcefile in which the exception is created. Can be set through __FILE__ macro.
*/
*/
Exception
(
std
::
string
excString
,
int
line
,
std
::
string
file
);
Exception
(
std
::
string
excString
,
int
line
,
std
::
string
file
);
virtual
~
Exception
()
throw
()
;
virtual
~
Exception
()
noexcept
;
//! Set fatal flag.
//! Set fatal flag.
void
setFatal
(
bool
b
=
true
){
fatal_
=
b
;}
void
setFatal
(
bool
b
=
true
){
fatal_
=
b
;}
...
@@ -70,7 +70,7 @@ class Exception : public std::exception {
...
@@ -70,7 +70,7 @@ class Exception : public std::exception {
void
info
();
void
info
();
//! Standard error message handling for exceptions. use like "std::cerr << e.what();"
//! Standard error message handling for exceptions. use like "std::cerr << e.what();"
virtual
const
char
*
what
()
const
throw
()
;
virtual
const
char
*
what
()
const
noexcept
;
std
::
string
getExcString
(){
return
excString_
;}
std
::
string
getExcString
(){
return
excString_
;}
...
...
This diff is collapsed.
Click to expand it.
core/src/Exception.cc
+
2
−
2
View file @
3c8c8eb3
...
@@ -34,7 +34,7 @@ Exception::Exception(std::string excString, int line, std::string file) :
...
@@ -34,7 +34,7 @@ Exception::Exception(std::string excString, int line, std::string file) :
errorMessage_
=
ErrMsgStream
.
str
();
errorMessage_
=
ErrMsgStream
.
str
();
}
}
Exception
::~
Exception
()
throw
()
{
Exception
::~
Exception
()
noexcept
{
}
}
void
Exception
::
setNumbers
(
std
::
string
_numbersLabel
,
void
Exception
::
setNumbers
(
std
::
string
_numbersLabel
,
...
@@ -49,7 +49,7 @@ void Exception::setMatrices(std::string _matricesLabel,
...
@@ -49,7 +49,7 @@ void Exception::setMatrices(std::string _matricesLabel,
matrices_
=
_matrices
;
matrices_
=
_matrices
;
}
}
const
char
*
Exception
::
what
()
const
throw
()
{
const
char
*
Exception
::
what
()
const
noexcept
{
return
errorMessage_
.
c_str
();
return
errorMessage_
.
c_str
();
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment