diff options
| author | Martin Michlmayr <tbm@cyrius.com> | 2019-02-05 08:27:25 -0500 |
|---|---|---|
| committer | Martin Michlmayr <tbm@cyrius.com> | 2019-02-05 08:27:25 -0500 |
| commit | 0bbb976ee3064ff59b319e30fd97e31020259760 (patch) | |
| tree | 5d13986511c18d911b0d1b2dc498b0f81d3a3b0e /src/utils.h | |
| parent | 9de94d4adb7a566af38814f9d37e26c559b68b4f (diff) | |
| parent | 7a5871d3b53e66ee261bea4b41512e99269b18b1 (diff) | |
| download | ledger-0bbb976ee3064ff59b319e30fd97e31020259760.tar.gz ledger-0bbb976ee3064ff59b319e30fd97e31020259760.tar.bz2 ledger-0bbb976ee3064ff59b319e30fd97e31020259760.zip | |
Merge branch 'next' into release/3.1.2
Diffstat (limited to 'src/utils.h')
| -rw-r--r-- | src/utils.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/utils.h b/src/utils.h index b21dff7a..c9146dd7 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2018, John Wiegley. All rights reserved. + * Copyright (c) 2003-2019, John Wiegley. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -44,7 +44,11 @@ #ifndef _UTILS_H #define _UTILS_H +#if (BOOST_VERSION >= 106600) +#include <boost/uuid/detail/sha1.hpp> +#else #include <boost/uuid/sha1.hpp> +#endif /** * @name Default values @@ -496,10 +500,6 @@ inline T& downcast(U& object) { path resolve_path(const path& pathname); -#ifdef HAVE_REALPATH -extern "C" char * realpath(const char *, char resolved_path[]); -#endif - inline const string& either_or(const string& first, const string& second) { return first.empty() ? second : first; |