feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

botan: make it compile with g++ 4.6

Browse Source
This commit is contained in:
hjk
2010-09-01 17:19:18 +02:00
parent d5ff2bb55f
commit d875ad4ebe
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/3rdparty/botan/build/botan/asn1_oid.h vendored
View File

@@ -63,7 +63,7 @@ class BOTAN_DLL OID : public ASN1_Object
* Construct an OID from a string.
* @param str a string in the form "a.b.c" etc., where a,b,c are numbers
*/
OID(const std::string& str = "");
OID(const std::string& str = std::string());
private:
std::vector<u32bit> id;
};

1
src/libs/3rdparty/botan/build/botan/cvc_gen_cert.h vendored
View File

@@ -15,6 +15,7 @@
#include <botan/pubkey.h>
#include <botan/ecdsa_sig.h>
#include <string>
#include <memory>
#include <assert.h>
namespace Botan {

8
src/libs/3rdparty/botan/build/botan/eac_asn_obj.h vendored
View File

@@ -115,7 +115,7 @@ class BOTAN_DLL ASN1_Ced : public EAC_Time
* @param str a string in the format "yyyy mm dd",
* e.g. "2007 08 01"
*/
ASN1_Ced(std::string const& str = "");
ASN1_Ced(std::string const& str = std::string());
/**
* Construct a CED from a timer value.
@@ -146,7 +146,7 @@ class BOTAN_DLL ASN1_Cex : public EAC_Time
* @param str a string in the format "yyyy mm dd",
* e.g. "2007 08 01"
*/
ASN1_Cex(std::string const& str="");
ASN1_Cex(std::string const& str=std::string());
/**
* Construct a CED from a timer value.
@@ -207,7 +207,7 @@ class BOTAN_DLL ASN1_Car : public ASN1_EAC_String
* Create a CAR with the specified content.
* @param str the CAR value
*/
ASN1_Car(std::string const& str = "");
ASN1_Car(std::string const& str = std::string());
};
/**
@@ -220,7 +220,7 @@ class BOTAN_DLL ASN1_Chr : public ASN1_EAC_String
* Create a CHR with the specified content.
* @param str the CHR value
*/
ASN1_Chr(std::string const& str = "");
ASN1_Chr(std::string const& str = std::string());
};
/*