Commit Graph

544 Commits

Author SHA1 Message Date
Andreas Schönle
cc2bd60ecb Merge branch 'master' into windows-time-fix 2016-12-06 17:15:37 +01:00
Kjell Hedström
e6f9178d42 Merge pull request #138 from AbberiorInstruments/include-file-path-only
Include file path only
2016-12-06 09:15:05 -07:00
Andreas Schönle
8d01c2224d reverted file parameter to std::string reference, adjusted formatting 2016-12-06 17:13:27 +01:00
Kjell Hedström
dc06cfb683 Merge pull request #139 from AbberiorInstruments/add-levels-only
Add levels only
2016-12-06 08:49:21 -07:00
Andreas Schönle
f018f3e92f Fixed formatting 2016-12-06 14:34:23 +01:00
Andreas Schönle
793ddbd42e changed to copying the file path upon message creation 2016-12-06 14:07:01 +01:00
Andreas Schönle
4bd1870a76 effectively remove feature - it is almost useless. Keep the change to the unit test avoiding premature exit when fatal signal handling is not enabled in the library 2016-12-06 13:55:47 +01:00
Andreas Schönle
c8e9dc367c Merge branch 'master' into arm-fix 2016-12-06 12:01:16 +01:00
Andreas Schönle
7ece784109 Merge branch 'master' into windows-time-fix 2016-12-06 12:00:30 +01:00
Andreas Schönle
cb3e2b1336 Merge branch 'master' into include-file-path-only 2016-12-06 12:00:01 +01:00
Andreas Schönle
b43848c527 Merge branch 'master' into add-levels-only 2016-12-06 11:59:21 +01:00
Kjell Hedström
d9413181d3 Merge pull request #136 from KjellKod/KjellKod-Travis-test
Update .travis.yml
2016-12-05 23:55:17 -07:00
Kjell Hedström
1a27d6379f thanks to: https://github.com/PacificBiosciences/pbbam/blob/master/.travis.yml 2016-12-05 23:49:32 -07:00
Kjell Hedström
8cc59bece2 more sudo 2016-12-05 23:31:46 -07:00
Kjell Hedström
fc1f531d1d sudo change reverted 2016-12-05 23:29:43 -07:00
Kjell Hedström
c70fd4f978 space removed 2016-12-05 23:26:14 -07:00
Kjell Hedström
10150e7633 key-space issues, fixed1 2016-12-05 23:23:16 -07:00
Kjell Hedström
aed15716ad test3 2016-12-05 23:16:48 -07:00
Kjell Hedström
296b91d857 test2 2016-12-05 23:10:28 -07:00
Andreas Schönle
f1f2167864 Update API.markdown
Added description of addLogLevel function
2016-12-05 11:21:40 +01:00
SchoenleAndi
7d1481724c restore needs a flag to remove custom levels (at least the tests need to be able to do it)
addLogLevel again resets the log level to the passed enable_state as even requesting the level before adding it would otherwise lead to unexpectedly not setting a "new" level to the passed state. We now assume setLogLevel is not called before addLogLevel without considering this behavior.
2016-12-05 11:12:28 +01:00
SchoenleAndi
a98b91fc5c ensure that raise(SIGTERM) is not called in test if g3log was compiled without fatal signal handler 2016-12-05 10:48:52 +01:00
SchoenleAndi
a1748ce66b addLogLevel now plays nice with having called setLogLevel before. 2016-12-05 10:17:38 +01:00
SchoenleAndi
bb163ea376 Merge branch 'master' into windows-time-fix 2016-12-04 19:20:22 +01:00
SchoenleAndi
9436660109 Merge branch 'master' into arm-fix 2016-12-04 19:18:50 +01:00
SchoenleAndi
b1088d06ab Merge branch 'master' into include-file-path-only 2016-12-04 19:17:39 +01:00
SchoenleAndi
323ca8e7ce Merge branch 'master' into add-levels-only 2016-12-04 19:15:51 +01:00
Kjell Hedström
0624e8c655 Update .travis.yml
Ref: discussion at https://github.com/travis-ci/travis-ci/issues/4631
2016-12-04 08:32:45 -07:00
SchoenleAndi
069085c451 fix timing inaccuracy on windows 2016-12-04 16:09:23 +01:00
Kjell Hedström
d15fcb3776 Update .travis.yml
Dummy trigger to travis
2016-12-04 07:17:21 -07:00
Kjell Hedström
426e77943e Merge pull request #126 from dasmysh/master
Updated cmake version to correct string compare behaviour.
2016-12-04 07:15:54 -07:00
Kjell Hedström
1ba64d5e09 Merge pull request #134 from KjellKod/KjellKod-trigger-travis-1
trigger travis
2016-12-02 10:22:25 -07:00
Kjell Hedström
5a0e730d0c assume yes for interactive check 2016-12-02 10:16:46 -07:00
Kjell Hedström
0fd9cb8408 trigger travis
test
2016-12-02 10:13:02 -07:00
Kjell Hedström
0fdccaf823 Update .travis.yml
Upgrade travis cmake version
2016-12-02 10:10:01 -07:00
SchoenleAndi
e93031c6d0 compiles on arm 2016-12-02 17:01:16 +01:00
Kjell Hedström
813e3da1f9 Merge pull request #129 from AbberiorInstruments/msvc-format-specifier
MSVC printf format specifier
2016-10-20 13:37:16 -06:00
Kjell Hedström
570a85b997 Merge pull request #128 from AbberiorInstruments/DBUG-vs-DEBUG
Fix compilation errors when CHANGE_G3LOG_DEBUG_TO_DBUG is enabled-
2016-10-20 13:35:17 -06:00
SchoenleAndi
1dafdaf2a4 msfc fromat specifiers added 2016-10-19 13:41:48 +02:00
SchoenleAndi
c39e77c27e DBUG-vs-DEBUG in main_ programs fixed 2016-10-19 13:39:24 +02:00
SchoenleAndi
940d11a61d DBUG vs DEBUG fixed in unit test, too 2016-10-19 13:36:19 +02:00
SchoenleAndi
c467851423 save include fil full path as const char * in LogMessage 2016-10-19 13:21:52 +02:00
SchoenleAndi
09ede1bf1f add loglevels to upstream master only 2016-10-19 13:17:46 +02:00
Sebastian Maisch
e7af386de2 Updated cmake version to correct string compare behaviour. 2016-10-17 19:49:56 +02:00
Kjell Hedström
ba81287ca5 bugfix time formatting (#119)
* bugfix time formatting

* fixit
2016-08-30 18:34:13 -06:00
Lynn
1bae2e6a68 Typo fix (Vaulue → Value) (#120)
* typo fix (Vaulue → Value)

* typo fix (Vaulue → Value)
2016-08-30 11:10:58 -06:00
Kjell Hedstrom
e0fb4fd24e fixit 2016-08-25 00:51:21 -06:00
Kjell Hedstrom
26f76cd103 bugfix time formatting 2016-08-25 00:49:17 -06:00
Kjell Hedström
1496d7aa40 Update API.markdown (#115) 2016-08-18 00:49:49 -06:00
Kjell Hedström
7d6bf2fac5 Update README.markdown (#114)
* Update README.markdown

* Update README.markdown

* Update README.markdown

* Update README.markdown

* Update README.markdown
2016-08-18 00:37:28 -06:00