diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2019-12-05 15:12:59 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2019-12-05 15:12:59 +0900 |
| commit | b8cf34c691623e4ec329053cbbf68522a855882d (patch) | |
| tree | 34da08632a99677f6b79ecb65e5b655a5b69a67f /boost/timer | |
| parent | 3fdc3e5ee96dca5b11d1694975a65200787eab86 (diff) | |
| download | boost-b8cf34c691623e4ec329053cbbf68522a855882d.tar.gz boost-b8cf34c691623e4ec329053cbbf68522a855882d.tar.bz2 boost-b8cf34c691623e4ec329053cbbf68522a855882d.zip | |
Imported Upstream version 1.67.0upstream/1.67.0
Diffstat (limited to 'boost/timer')
| -rw-r--r-- | boost/timer/config.hpp | 31 | ||||
| -rw-r--r-- | boost/timer/timer.hpp | 1 |
2 files changed, 31 insertions, 1 deletions
diff --git a/boost/timer/config.hpp b/boost/timer/config.hpp index adf223d3e4..0c2174c306 100644 --- a/boost/timer/config.hpp +++ b/boost/timer/config.hpp @@ -47,6 +47,37 @@ // And include the header that does the work: // #include <boost/config/auto_link.hpp> + +// We also need to autolink to the Chrono library; even though +// it's not used in the interface, and no Chrono header is included, +// it's used in the implementation and is necessary in order to link + +#if !defined(BOOST_CHRONO_NO_LIB) + +#if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_CHRONO_DYN_LINK) +# define BOOST_DYN_LINK +#endif + +#define BOOST_LIB_NAME boost_chrono + +#include <boost/config/auto_link.hpp> + +#endif // !defined(BOOST_CHRONO_NO_LIB) + +// Plus, Chrono uses System, so we need to link that too + +#if !defined(BOOST_SYSTEM_NO_LIB) + +#if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_SYSTEM_DYN_LINK) +# define BOOST_DYN_LINK +#endif + +#define BOOST_LIB_NAME boost_system + +#include <boost/config/auto_link.hpp> + +#endif // !defined(BOOST_SYSTEM_NO_LIB) + #endif // auto-linking disabled #endif // BOOST_TIMER_CONFIG_HPP diff --git a/boost/timer/timer.hpp b/boost/timer/timer.hpp index 442bd1dbdc..3c6492086d 100644 --- a/boost/timer/timer.hpp +++ b/boost/timer/timer.hpp @@ -11,7 +11,6 @@ #include <boost/config/warning_disable.hpp> #include <boost/timer/config.hpp> -//#include <boost/chrono/chrono.hpp> #include <boost/cstdint.hpp> #include <string> #include <cstring> |