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

Merge branch 'master' into include-file-path-only

Browse Source
This commit is contained in:
SchoenleAndi 2016-12-04 19:17:39 +01:00
commit b1088d06ab
7 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -25,7 +25,9 @@ before_install:
sudo apt-get install python-software-properties;
sudo apt-get update;
sudo apt-get install gcc-5 g++-5;
sudo add-apt-repository --yes ppa:kalakris/cmake;
sudo apt-get install software-properties-common;
sudo add-apt-repository -y ppa:george-edison55/cmake-3.x;
sudo apt-get update;
sudo apt-get update -qq;
sudo apt-get install cmake;
fi

2
CMakeLists.txt
View File

@ -46,7 +46,7 @@
#
# ============================================================================
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 3.1)
ENABLE_LANGUAGE(CXX)
set(CMAKE_BUILD_TYPE Release)

5
example/main_contract.cpp
View File

@ -30,6 +30,11 @@ namespace example_fatal
}
} // example fatal
#ifdef CHANGE_G3LOG_DEBUG_TO_DBUG
#undef DEBUG
#define DEBUG DBUG
#endif
int main(int argc, char **argv)
{
double pi_d = 3.1415926535897932384626433832795;

5
example/main_fatal_choice.cpp
View File

@ -24,6 +24,11 @@
#define NOEXCEPT throw()
#endif
#ifdef CHANGE_G3LOG_DEBUG_TO_DBUG
#undef DEBUG
#define DEBUG DBUG
#endif
namespace
{
#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__))

5
example/main_sigsegv.cpp
View File

@ -22,6 +22,11 @@ namespace
#endif
}
#ifdef CHANGE_G3LOG_DEBUG_TO_DBUG
#undef DEBUG
#define DEBUG DBUG
#endif
namespace example_fatal
{
// on Ubunti this caused get a compiler warning with gcc4.6

14
src/g3log/logcapture.hpp
View File

@ -16,6 +16,9 @@
#include <sstream>
#include <cstdarg>
#include <csignal>
#ifdef _MSC_VER
# include <sal.h>
#endif
/**
* Simple struct for capturing log/fatal entries. At destruction the captured message is
@ -49,8 +52,17 @@ struct LogCapture {
// Ref: http://www.unixwiz.net/techtips/gnu-c-attributes.html
#ifndef __GNUC__
#define __attribute__(x) // Disable 'attributes' if compiler does not support 'em
#endif
#ifdef _MSC_VER
# if _MSC_VER >= 1400
# define G3LOG_FORMAT_STRING _Printf_format_string_
# else
# define G3LOG_FORMAT_STRING __format_string
# endif
#else
# define G3LOG_FORMAT_STRING
#endif
void capturef(const char *printf_like_message, ...) __attribute__((format(printf, 2, 3))); // 2,3 ref: http://www.codemaestro.com/reviews/18
void capturef(G3LOG_FORMAT_STRING const char *printf_like_message, ...) __attribute__((format(printf, 2, 3))); // 2,3 ref: http://www.codemaestro.com/reviews/18
/// prettifying API for this completely open struct

5
test_unit/testing_helpers.h
View File

@ -135,6 +135,9 @@ private:
};
} // testing_helpers
#ifdef CHANGE_G3LOG_DEBUG_TO_DBUG
#undef DEBUG
#define DEBUG DBUG
#endif