aboutsummaryrefslogtreecommitdiffstats
path: root/src/libstate
diff options
context:
space:
mode:
authorlloyd <[email protected]>2009-12-23 01:09:09 +0000
committerlloyd <[email protected]>2009-12-23 01:09:09 +0000
commite4bc193fd6232da46a3676f1e21e7a14bf5b1a6f (patch)
treed4640ca3c55e092ff4e743bc51ff9fd7fccd83d6 /src/libstate
parentd7a893e9506e739d261a75d99743d0dc75803a79 (diff)
Avoid MSVC warning 4800 about implicit conversion from T to bool. Mostly
because it makes the code slightly more explicit.
Diffstat (limited to 'src/libstate')
-rw-r--r--src/libstate/lookup.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstate/lookup.cpp b/src/libstate/lookup.cpp
index 3b49116f6..090c25fca 100644
--- a/src/libstate/lookup.cpp
+++ b/src/libstate/lookup.cpp
@@ -71,7 +71,7 @@ HashFunction* get_hash(const std::string& algo_spec)
bool have_hash(const std::string& algo_spec)
{
Algorithm_Factory& af = global_state().algorithm_factory();
- return af.prototype_hash_function(algo_spec);
+ return (af.prototype_hash_function(algo_spec) != 0);
}
/**
@@ -80,7 +80,7 @@ bool have_hash(const std::string& algo_spec)
const MessageAuthenticationCode* retrieve_mac(const std::string& algo_spec)
{
Algorithm_Factory& af = global_state().algorithm_factory();
- return af.prototype_mac(algo_spec);
+ return (af.prototype_mac(algo_spec) != 0);
}
/**
@@ -89,7 +89,7 @@ const MessageAuthenticationCode* retrieve_mac(const std::string& algo_spec)
MessageAuthenticationCode* get_mac(const std::string& algo_spec)
{
Algorithm_Factory& af = global_state().algorithm_factory();
- return af.make_mac(algo_spec);
+ return (af.make_mac(algo_spec) != 0);
}
/**
@@ -98,7 +98,7 @@ MessageAuthenticationCode* get_mac(const std::string& algo_spec)
bool have_mac(const std::string& algo_spec)
{
Algorithm_Factory& af = global_state().algorithm_factory();
- return af.prototype_mac(algo_spec);
+ return (af.prototype_mac(algo_spec) != 0);
}
/**