Skip to content

Use no-exceptions-friendly macros for try/catch block #419

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

Open
mkruskal-google wants to merge 1 commit into
base: develop
Choose a base branch
from
+3 −2
Open

Use no-exceptions-friendly macros for try/catch block #419

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/pthread/thread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ namespace boost
unsigned thread::physical_concurrency() BOOST_NOEXCEPT
{
#ifdef __linux__
try {
BOOST_TRY {
using namespace std;

ifstream proc_cpuinfo ("/proc/cpuinfo");
Expand Down Expand Up @@ -570,9 +570,10 @@ namespace boost
// Fall back to hardware_concurrency() in case
// /proc/cpuinfo is formatted differently than we expect.
return cores.size() != 0 ? cores.size() : hardware_concurrency();
} catch(...) {
} BOOST_CATCH(...) {
return hardware_concurrency();
}
BOOST_CATCH_END
#elif defined(__APPLE__)
int count;
size_t size=sizeof(count);
Expand Down