diff options
| author | lloyd <[email protected]> | 2010-03-21 23:30:14 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-03-21 23:30:14 +0000 |
| commit | f8a77dd91e8b3aed644c2c206ff9b8822fb3ae02 (patch) | |
| tree | 315cbc118a8ba2afda674154e7c65e8900a00cb8 /src/rng | |
| parent | 572c106e868821da13447ca7349523ef4a90ec2c (diff) | |
| parent | 634f3d27f7faad1dc558821382f71ecc2194637d (diff) | |
propagate from branch 'net.randombit.botan' (head 96d0a1885774b624812fd143d541c8bcda319217)
to branch 'net.randombit.botan.c++0x' (head e14368ab9d7976f3e111c6bc0adf24eebeb7c114)
Diffstat (limited to 'src/rng')
| -rw-r--r-- | src/rng/hmac_rng/hmac_rng.cpp | 5 | ||||
| -rw-r--r-- | src/rng/randpool/randpool.cpp | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/rng/hmac_rng/hmac_rng.cpp b/src/rng/hmac_rng/hmac_rng.cpp index 51d10f641..6234a61e7 100644 --- a/src/rng/hmac_rng/hmac_rng.cpp +++ b/src/rng/hmac_rng/hmac_rng.cpp @@ -8,7 +8,6 @@ #include <botan/hmac_rng.h> #include <botan/get_byte.h> #include <botan/internal/xor_buf.h> -#include <botan/internal/stl_util.h> #include <algorithm> namespace Botan { @@ -218,8 +217,8 @@ HMAC_RNG::~HMAC_RNG() delete extractor; delete prf; - std::for_each(entropy_sources.begin(), entropy_sources.end(), - del_fun<EntropySource>()); + for(auto i = entropy_sources.begin(); i != entropy_sources.end(); ++i) + delete *i; counter = 0; } diff --git a/src/rng/randpool/randpool.cpp b/src/rng/randpool/randpool.cpp index 9a4d77e55..c58378b32 100644 --- a/src/rng/randpool/randpool.cpp +++ b/src/rng/randpool/randpool.cpp @@ -8,8 +8,8 @@ #include <botan/randpool.h> #include <botan/get_byte.h> #include <botan/internal/xor_buf.h> -#include <botan/internal/stl_util.h> #include <algorithm> +#include <chrono> namespace Botan { @@ -202,8 +202,8 @@ Randpool::~Randpool() delete cipher; delete mac; - std::for_each(entropy_sources.begin(), entropy_sources.end(), - del_fun<EntropySource>()); + for(auto i = entropy_sources.begin(); i != entropy_sources.end(); ++i) + delete *i; } } |