diff options
| author | lloyd <[email protected]> | 2008-10-12 05:58:23 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2008-10-12 05:58:23 +0000 |
| commit | 109cb25ffbb58ab2dcceef7777eee4c6b60a7982 (patch) | |
| tree | ca4557bc0a2e77d2b747f04c0c8fb52ef02c4518 /src/cert/cvc/freestore.h | |
| parent | 8efcb908cca5d9aac801221a74c8c1e849066207 (diff) | |
Rename the TR1 choice macros to BOTAN_USE_STD_TR1 and BOTAN_USE_BOOST_TR1.
If neither is defined when build.h is included, choose Boost.
Reorganize build.h so it is easier to find things, in particular move all
of the interesting toggles to the top of the file and all of the long
lists of modules and feature test macros to the end.
Diffstat (limited to 'src/cert/cvc/freestore.h')
| -rw-r--r-- | src/cert/cvc/freestore.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/cert/cvc/freestore.h b/src/cert/cvc/freestore.h index f83d1e867..abcd1e3ae 100644 --- a/src/cert/cvc/freestore.h +++ b/src/cert/cvc/freestore.h @@ -6,12 +6,14 @@ #ifndef BOTAN_FREESTORE_H__ #define BOTAN_FREESTORE_H__ -#if defined(BOTAN_USE_TR1_SHARED_PTR) +#include <botan/build.h> + +#if defined(BOTAN_USE_STD_TR1) #include <tr1/memory> -#elif defined(BOTAN_USE_BOOST_TR1_SHARED_PTR) +#elif defined(BOTAN_USE_BOOST_TR1) #include <boost/tr1/memory.hpp> #else - #error "Please choose a shared_ptr implementation" + #error "Please choose a TR1 implementation in build.h" #endif namespace Botan { |