Commit Graph

511 Commits

Author SHA1 Message Date
baic
411b8e249c force /utf-8 for MSVC compiler 2017-02-13 16:25:30 +08:00
Kjell Hedström
5660732d82 Merge pull request #147 from KjellKod/OSX_std_get_timespec
Update time.cpp
2017-01-08 14:07:02 -07:00
Kjell Hedström
c71349ac3d Update time.cpp 2017-01-08 14:01:38 -07:00
Kjell Hedström
a04b17abb5 Merge pull request #144 from rickyzhang82/pr-fix-output-format
Fix message newline issue
2016-12-23 09:13:19 -07:00
Ricky Zhang
d747de2840
Add back ugly tab
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2016-12-22 19:33:29 -05:00
Kjell Hedström
5bc693e099 Merge pull request #145 from rickyzhang82/pr-add-cmake-package
Add CMake package support
2016-12-22 10:24:37 -07:00
Ricky Zhang
601f6af1fd
Add CMake package support
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2016-12-22 11:30:18 -05:00
Ricky Zhang
fc615b4ac0
Fix message newline issue
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2016-12-22 11:23:25 -05:00
Kjell Hedström
3ed2ed2674 Merge pull request #141 from KjellKod/Build-CMake-flags
Inherit C++ flags from build environment
2016-12-21 15:44:47 -07:00
Kjell Hedström
ab5b408f40 Merge pull request #137 from AbberiorInstruments/windows-time-fix
fix timing inaccuracy on windows
2016-12-21 15:38:44 -07:00
Andreas Schönle
2ebb9c2346 Merge branch 'master' into windows-time-fix 2016-12-19 17:03:23 +01:00
Andreas Schönle
294a015175 Merge pull request #1 from AbberiorInstruments/KjellKod-clean-up-timing
merged pull request #1
2016-12-19 16:43:45 +01:00
Kjell Hedström
6cdefee897 Inherit C++ flags from build environment
As suggested in : http://stackoverflow.com/questions/36765217/how-to-create-cmake-recipes-in-yocto
2016-12-14 21:36:52 -07:00
Kjell Hedström
34aa4ff8d6 Update time.cpp
removed ifdef's and using Andreas' implementation of  get_time
2016-12-09 23:26:20 -07:00
Kjell Hedström
6bf8afddfa Merge pull request #133 from AbberiorInstruments/arm-fix
compiles on arm
2016-12-09 23:02:21 -07:00
Kjell Hedström
b7adc0e77d fix formatting to get the branch merged 2016-12-09 23:02:04 -07:00
Andreas Schönle
03734dd29c alternative, better fix as proposed by Kjell 2016-12-06 17:36:17 +01:00
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