propagate from branch 'net.randombit.botan' (head 294e2082ce9231d6165276e2f2a4153a0116aca3)

            to branch 'net.randombit.botan.c++0x' (head 0b695fad10f924601e07b009fcd781191fafcb28)

1 files changed, 6 insertions, 3 deletions

diff --git a/src/hash/par_hash/par_hash.h b/src/hash/par_hash/par_hash.h
index 874e491b1..d82a74a19 100644
--- a/src/hash/par_hash/par_hash.h
+++ b/src/hash/par_hash/par_hash.h
@@ -13,8 +13,8 @@
 
 namespace Botan {
 
-/*
-* Parallel
+/**
+* Parallel Hashes
 */
 class BOTAN_DLL Parallel : public HashFunction
    {
@@ -23,7 +23,10 @@ class BOTAN_DLL Parallel : public HashFunction
       std::string name() const;
       HashFunction* clone() const;
 
-      Parallel(const std::vector<HashFunction*>&);
+      /**
+      * @param hashes a set of hashes to compute in parallel
+      */
+      Parallel(const std::vector<HashFunction*>& hashes);
       ~Parallel();
    private:
       void add_data(const byte[], u32bit);