generic-library/g3log
1
0
Fork 0
mirror of https://github.com/KjellKod/g3log.git synced 2024-12-12 10:23:50 +01:00
Code Issues Projects Releases Wiki Activity

Fixed for windows

Browse Source
This commit is contained in:
Kjell Hedstrom 2015-08-31 23:45:47 -06:00
parent a8d89b67c8
commit 055c4ec2ca
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeLists.txt
View File

@ -122,17 +122,18 @@ endif()
# ==========================================================================
# INCLUDE (${g3log_SOURCE_DIR}/CPackLists.txt)
MESSAGE("\n\n
*******************************************************************
Please do 'make clean-cmake' before next cmake generation.
It is a good idea to purge your build directory of CMake
generated cache files
*******************************************************************
")
add_custom_target(clean-cmake
COMMAND ${CMAKE_COMMAND} -P ${g3log_SOURCE_DIR}/CleanAll.cmake
)
IF (NOT MSVC)
MESSAGE("\n\n
*******************************************************************
Please do 'make clean-cmake' before next cmake generation.
It is a good idea to purge your build directory of CMake
generated cache files
*******************************************************************
")
add_custom_target(clean-cmake
COMMAND ${CMAKE_COMMAND} -P ${g3log_SOURCE_DIR}/CleanAll.cmake
)
ENDIF()

11
example/main_fatal_choice.cpp
View File

@ -18,6 +18,11 @@
#include <thread>
#include <exception>
#ifndef _MSC_VER
#define NOEXCEPT noexcept
#else
#define NOEXCEPT throw()
#endif
namespace
{
@ -116,7 +121,7 @@ namespace
using deathfunc = void (*) (void);
void Death_x10000(deathfunc func, std::string funcname) noexcept {
void Death_x10000(deathfunc func, std::string funcname) NOEXCEPT {
LOG(DEBUG) << " trigger exit";
std::vector<std::future<void>> asyncs;
asyncs.reserve(10000);
@ -132,7 +137,7 @@ namespace
}
void Throw() noexcept {
void Throw() NOEXCEPT {
LOG(DEBUG) << " trigger exit";
std::future<int> empty;
empty.get();
@ -141,7 +146,7 @@ namespace
}
void SegFaultAttempt_x10000() noexcept {
void SegFaultAttempt_x10000() NOEXCEPT {
deathfunc f = []{Throw(); *(char*)0 = 0; char* ptr = 0; *ptr = 1; AccessViolation();};
Death_x10000(f, "throw uncaught exception... and then some sigsegv calls");
}