From d875ad4ebe35af6dda4b3950d61bc1698081858c Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 1 Sep 2010 17:19:18 +0200
Subject: [PATCH] botan: make it compile with g++ 4.6
---
src/libs/3rdparty/botan/build/botan/asn1_oid.h | 2 +-
src/libs/3rdparty/botan/build/botan/cvc_gen_cert.h | 1 +
src/libs/3rdparty/botan/build/botan/eac_asn_obj.h | 8 ++++----
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/libs/3rdparty/botan/build/botan/asn1_oid.h b/src/libs/3rdparty/botan/build/botan/asn1_oid.h
index e6d077beeac..05e4f3098de 100644
--- a/src/libs/3rdparty/botan/build/botan/asn1_oid.h
+++ b/src/libs/3rdparty/botan/build/botan/asn1_oid.h
@@ -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;
};
diff --git a/src/libs/3rdparty/botan/build/botan/cvc_gen_cert.h b/src/libs/3rdparty/botan/build/botan/cvc_gen_cert.h
index 4a788026ccc..d6042d91a57 100644
--- a/src/libs/3rdparty/botan/build/botan/cvc_gen_cert.h
+++ b/src/libs/3rdparty/botan/build/botan/cvc_gen_cert.h
@@ -15,6 +15,7 @@
#include <botan/pubkey.h>
#include <botan/ecdsa_sig.h>
#include <string>
+#include <memory>
#include <assert.h>
namespace Botan {
diff --git a/src/libs/3rdparty/botan/build/botan/eac_asn_obj.h b/src/libs/3rdparty/botan/build/botan/eac_asn_obj.h
index 3e70f6b7434..a4759d5e826 100644
--- a/src/libs/3rdparty/botan/build/botan/eac_asn_obj.h
+++ b/src/libs/3rdparty/botan/build/botan/eac_asn_obj.h
@@ -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());
};
/*
--
GitLab