Merge fixups

5 files changed, 10 insertions, 83 deletions

diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 6eeb837ed..2f71c7a18 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -1,6 +1,6 @@
 macro_name GCC
 
-binary_name g++-4.5.1
+binary_name g++-4.5.2
 
 compile_option "-c "
 output_to_option "-o "
diff --git a/src/cert/cvc/asn1_eac_tm.cpp b/src/cert/cvc/asn1_eac_tm.cpp
index 91ccdac63..ec5ac429e 100644
--- a/src/cert/cvc/asn1_eac_tm.cpp
+++ b/src/cert/cvc/asn1_eac_tm.cpp
@@ -278,21 +278,6 @@ void EAC_Time::decode_from(BER_Decoder& source)
 
    }
 
-u32bit EAC_Time::get_year() const
-   {
-   return year;
-   }
-
-u32bit EAC_Time::get_month() const
-   {
-   return month;
-   }
-
-u32bit EAC_Time::get_day() const
-   {
-   return day;
-   }
-
 /*
 * make the value an octet string for encoding
 */
@@ -305,62 +290,4 @@ SecureVector<byte> EAC_Time::encoded_eac_time() const
    return result;
    }
 
-<<<<<<< variant A
-ASN1_Ced::ASN1_Ced(std::string const& str) :
-   EAC_Time(str, ASN1_Tag(37))
-   {}
-
-ASN1_Ced::ASN1_Ced(u64bit val) :
-   EAC_Time(val, ASN1_Tag(37))
-   {}
-
-ASN1_Ced::ASN1_Ced(EAC_Time const& other) :
-   EAC_Time(other.get_year(),
-            other.get_month(),
-            other.get_day(),
-            ASN1_Tag(37))
-   {}
-
-ASN1_Cex::ASN1_Cex(std::string const& str) :
-   EAC_Time(str, ASN1_Tag(36))
-   {}
-
-ASN1_Cex::ASN1_Cex(u64bit val) :
-   EAC_Time(val, ASN1_Tag(36))
-   {}
-
-ASN1_Cex::ASN1_Cex(EAC_Time const& other) :
-   EAC_Time(other.get_year(),
-            other.get_month(),
-            other.get_day(),
-            ASN1_Tag(36))
-   {}
-
->>>>>>> variant B
-####### Ancestor
-ASN1_Ced::ASN1_Ced(std::string const& str)
-   : EAC_Time(str, ASN1_Tag(37))
-   {}
-
-ASN1_Ced::ASN1_Ced(u64bit val)
-   : EAC_Time(val, ASN1_Tag(37))
-   {}
-
-ASN1_Ced::ASN1_Ced(EAC_Time const& other)
-   : EAC_Time(other.get_year(), other.get_month(), other.get_day(), ASN1_Tag(37))
-   {}
-
-ASN1_Cex::ASN1_Cex(std::string const& str)
-   : EAC_Time(str, ASN1_Tag(36))
-   {}
-
-ASN1_Cex::ASN1_Cex(u64bit val)
-   : EAC_Time(val, ASN1_Tag(36))
-   {}
-
-ASN1_Cex::ASN1_Cex(EAC_Time const& other)
-   : EAC_Time(other.get_year(), other.get_month(), other.get_day(), ASN1_Tag(36))
-   {}
-
-======= end
 }
diff --git a/src/cert/cvc/cvc_self.cpp b/src/cert/cvc/cvc_self.cpp
index 5b665fa33..4b6c5af8c 100644
--- a/src/cert/cvc/cvc_self.cpp
+++ b/src/cert/cvc/cvc_self.cpp
@@ -232,7 +232,7 @@ EAC1_1_CVC link_cvca(EAC1_1_CVC const& signer,
    AlgorithmIdentifier sig_algo = signer.signature_algorithm();
    std::string padding_and_hash = padding_and_hash_from_oid(sig_algo.oid);
    PK_Signer pk_signer(*priv_key, padding_and_hash);
-   std::unique_ptr<Public_Key> pk = signee.subject_public_key();
+   std::unique_ptr<Public_Key> pk(signee.subject_public_key());
    ECDSA_PublicKey* subj_pk = dynamic_cast<ECDSA_PublicKey*>(pk.get());
    subj_pk->set_parameter_encoding(EC_DOMPAR_ENC_EXPLICIT);
 
@@ -272,9 +272,9 @@ EAC1_1_CVC sign_request(EAC1_1_CVC const& signer_cert,
    ASN1_Chr chr(chr_str);
    std::string padding_and_hash = padding_and_hash_from_oid(signee.signature_algorithm().oid);
    PK_Signer pk_signer(*priv_key, padding_and_hash);
-   std::unique_ptr<Public_Key> pk = signee.subject_public_key();
+   std::unique_ptr<Public_Key> pk(signee.subject_public_key());
    ECDSA_PublicKey*  subj_pk = dynamic_cast<ECDSA_PublicKey*>(pk.get());
-   std::unique_ptr<Public_Key> signer_pk = signer_cert.subject_public_key();
+   std::unique_ptr<Public_Key> signer_pk(signer_cert.subject_public_key());
 
    // for the case that the domain parameters are not set...
    // (we use those from the signer because they must fit)
diff --git a/src/cert/cvc/eac_asn_obj.h b/src/cert/cvc/eac_asn_obj.h
index dc4f82578..54a9f1517 100644
--- a/src/cert/cvc/eac_asn_obj.h
+++ b/src/cert/cvc/eac_asn_obj.h
@@ -116,7 +116,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(const std::string& str = "") :
          EAC_Time(str, ASN1_Tag(37)) {}
 
       /**
@@ -129,7 +129,7 @@ class BOTAN_DLL ASN1_Ced : public EAC_Time
       * Copy constructor (for general EAC_Time objects).
       * @param other the object to copy from
       */
-      ASN1_Ced(EAC_Time const& other) :
+      ASN1_Ced(const EAC_Time& other) :
          EAC_Time(other.get_year(), other.get_month(), other.get_day(),
                   ASN1_Tag(37))
          {}
@@ -147,13 +147,13 @@ 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(const std::string& str = "") :
          EAC_Time(str, ASN1_Tag(36)) {}
 
       ASN1_Cex(const std::chrono::system_clock::time_point& time) :
          EAC_Time(time, ASN1_Tag(36)) {}
 
-      ASN1_Cex(EAC_Time const& other) :
+      ASN1_Cex(const EAC_Time& other) :
          EAC_Time(other.get_year(), other.get_month(), other.get_day(),
                   ASN1_Tag(36))
          {}
diff --git a/src/hash/keccak/keccak.cpp b/src/hash/keccak/keccak.cpp
index 922167b61..107055509 100644
--- a/src/hash/keccak/keccak.cpp
+++ b/src/hash/keccak/keccak.cpp
@@ -112,12 +112,12 @@ Keccak_1600::Keccak_1600(size_t output_bits) :
    if(output_bits != 224 && output_bits != 256 &&
       output_bits != 384 && output_bits != 512)
       throw Invalid_Argument("Keccak_1600: Invalid output length " +
-                             to_string(output_bits));
+                             std::to_string(output_bits));
    }
 
 std::string Keccak_1600::name() const
    {
-   return "Keccak-1600(" + to_string(output_bits) + ")";
+   return "Keccak-1600(" + std::to_string(output_bits) + ")";
    }
 
 HashFunction* Keccak_1600::clone() const