Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorPhil Nash2014-01-08 17:17:31 +0000
committerPhil Nash2014-01-08 17:17:31 +0000
commit7eb5acc18357056bd3b0a94cb09f620e448cfbc7 (patch)
treebc32adcaa6a0f4987b17f13d704b435b1b603a49 /include
parent46a1fc76159df9e19ead8bac6299fafceab65a13 (diff)
downloadcatch3-7eb5acc18357056bd3b0a94cb09f620e448cfbc7.tar.gz
build 25
- fix for #231
Diffstat (limited to 'include')
-rw-r--r--include/internal/catch_debugger.hpp7
-rw-r--r--include/internal/catch_version.hpp2
2 files changed, 5 insertions, 4 deletions
diff --git a/include/internal/catch_debugger.hpp b/include/internal/catch_debugger.hpp
index f3ad100f..49c485ff 100644
--- a/include/internal/catch_debugger.hpp
+++ b/include/internal/catch_debugger.hpp
@@ -30,7 +30,6 @@
// running under the debugger or has a debugger attached post facto).
bool isDebuggerActive(){
- int junk;
int mib[4];
struct kinfo_proc info;
size_t size;
@@ -51,8 +50,10 @@
// Call sysctl.
size = sizeof(info);
- junk = sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, NULL, 0);
- assert(junk == 0);
+ if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, NULL, 0) != 0 ) {
+ std::cerr << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl;
+ return false;
+ }
// We're being debugged if the P_TRACED flag is set.
diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp
index 67390ce8..2fcf72d1 100644
--- a/include/internal/catch_version.hpp
+++ b/include/internal/catch_version.hpp
@@ -13,7 +13,7 @@
namespace Catch {
// These numbers are maintained by a script
- Version libraryVersion( 1, 0, 24, "master" );
+ Version libraryVersion( 1, 0, 25, "master" );
}
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED