aboutsummaryrefslogtreecommitdiffstats
path: root/src/algo_factory
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-05-25 13:35:03 +0000
committerlloyd <[email protected]>2010-05-25 13:35:03 +0000
commit0eecae9f21172c0a74ad62acaf77148c94a25be7 (patch)
treed0de8bd10b92a648a6700f59c68eed9cac81ba64 /src/algo_factory
parent2295ef9e8d97065ad2920f5039878728e52a144f (diff)
parent211d835a356f55e037ff8035017d79c458f13615 (diff)
propagate from branch 'net.randombit.botan' (head 879d1fc83844976a01b9e3188c4f0b5ddb237f0e)
to branch 'net.randombit.botan.c++0x' (head 4a0af13da3b0e21d6275cd6ec0c835d6bf757c8d)
Diffstat (limited to 'src/algo_factory')
-rw-r--r--src/algo_factory/algo_factory.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/algo_factory/algo_factory.cpp b/src/algo_factory/algo_factory.cpp
index 07a072f22..5f3e752bd 100644
--- a/src/algo_factory/algo_factory.cpp
+++ b/src/algo_factory/algo_factory.cpp
@@ -1,6 +1,6 @@
/*
* Algorithm Factory
-* (C) 2008 Jack Lloyd
+* (C) 2008-2010 Jack Lloyd
*
* Distributed under the terms of the Botan license
*/
@@ -26,22 +26,26 @@ namespace {
* Template functions for the factory prototype/search algorithm
*/
template<typename T>
-T* engine_get_algo(Engine* engine, const SCAN_Name& request,
- Algorithm_Factory& af)
+T* engine_get_algo(Engine*,
+ const SCAN_Name&,
+ Algorithm_Factory&)
{ return 0; }
template<>
-BlockCipher* engine_get_algo(Engine* engine, const SCAN_Name& request,
+BlockCipher* engine_get_algo(Engine* engine,
+ const SCAN_Name& request,
Algorithm_Factory& af)
{ return engine->find_block_cipher(request, af); }
template<>
-StreamCipher* engine_get_algo(Engine* engine, const SCAN_Name& request,
+StreamCipher* engine_get_algo(Engine* engine,
+ const SCAN_Name& request,
Algorithm_Factory& af)
{ return engine->find_stream_cipher(request, af); }
template<>
-HashFunction* engine_get_algo(Engine* engine, const SCAN_Name& request,
+HashFunction* engine_get_algo(Engine* engine,
+ const SCAN_Name& request,
Algorithm_Factory& af)
{ return engine->find_hash(request, af); }