diff options
| -rw-r--r-- | integer.cpp | 2 | ||||
| -rw-r--r-- | pubkey.h | 4 | ||||
| -rw-r--r-- | test.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/integer.cpp b/integer.cpp index 3c94b53..7e8e3f8 100644 --- a/integer.cpp +++ b/integer.cpp @@ -35,7 +35,7 @@ static int DummyAssignIntToInteger = (AssignIntToInteger = FunctionAssignIntToIn #ifdef SSE2_INTRINSICS_AVAILABLE template <class T> -AllocatorBase<T>::pointer AlignedAllocator<T>::allocate(size_type n, const void *) +CPP_TYPENAME AllocatorBase<T>::pointer AlignedAllocator<T>::allocate(size_type n, const void *) { if (n < 4) return new T[n]; @@ -747,13 +747,13 @@ void DL_PublicKey<T>::AssignFrom(const NameValuePairs &source) class OID; //! . -template <class PK, class GP> +template <class PK, class GP, class O = OID> class DL_KeyImpl : public PK { public: typedef GP GroupParameters; - OID GetAlgorithmID() const {return GetGroupParameters().GetAlgorithmID();} + O GetAlgorithmID() const {return GetGroupParameters().GetAlgorithmID();} // void BERDecode(BufferedTransformation &bt) // {PK::BERDecode(bt);} // void DEREncode(BufferedTransformation &bt) const @@ -695,7 +695,7 @@ void InformationDisperseFile(int threshold, int nShares, const char *filename) vector_member_ptrs<FileSink> fileSinks(nShares); string channel; - for (unsigned int i=0; i<nShares; i++) + for (int i=0; i<nShares; i++) { char extension[5] = ".000"; extension[1]='0'+byte(i/100); @@ -719,7 +719,7 @@ void InformationRecoverFile(int threshold, const char *outFilename, char *const vector_member_ptrs<FileSource> fileSources(threshold); SecByteBlock channel(4); - unsigned int i; + int i; for (i=0; i<threshold; i++) { fileSources[i].reset(new FileSource(inFilenames[i], false)); |