Post-merge fixes

5 files changed, 7 insertions, 8 deletions

diff --git a/configure.py b/configure.py
index 39120d22a..9a566f716 100755
--- a/configure.py
+++ b/configure.py
@@ -1018,8 +1018,7 @@ def choose_modules_to_use(modules, archinfo, options):
             cannot_use_because(modname, 'incompatible CPU')
         elif not module.compatible_os(options.os):
             cannot_use_because(modname, 'incompatible OS')
-        elif not module.compatible_compiler(options.compiler,
-                                            options.with_tr1):
+        elif not module.compatible_compiler(options.compiler):
             cannot_use_because(modname, 'incompatible compiler')
 
         else:
diff --git a/src/cert/x509/x509opt.cpp b/src/cert/x509/x509opt.cpp
index fda889224..8d235ad5d 100644
--- a/src/cert/x509/x509opt.cpp
+++ b/src/cert/x509/x509opt.cpp
@@ -78,7 +78,7 @@ void X509_Cert_Options::sanity_check() const
 * Initialize the certificate options
 */
 X509_Cert_Options::X509_Cert_Options(const std::string& initial_opts,
-                                     u32bit expiration_time_in_seconds)
+                                     u32bit expiration_time)
    {
    is_CA = false;
    path_limit = 0;
diff --git a/src/filters/modes/cfb/cfb.cpp b/src/filters/modes/cfb/cfb.cpp
index e7737e673..ff1714b81 100644
--- a/src/filters/modes/cfb/cfb.cpp
+++ b/src/filters/modes/cfb/cfb.cpp
@@ -103,7 +103,7 @@ CFB_Decryption::CFB_Decryption(BlockCipher* ciph, u32bit fback_bits)
 
    if(feedback == 0 || fback_bits % 8 != 0 || feedback > cipher->BLOCK_SIZE)
       throw Invalid_Argument("CFB_Decryption: Invalid feedback size " +
-                             to_string(fback_bits));
+                             std::to_string(fback_bits));
    }
 
 /*
@@ -123,7 +123,7 @@ CFB_Decryption::CFB_Decryption(BlockCipher* ciph,
 
    if(feedback == 0 || fback_bits % 8 != 0 || feedback > cipher->BLOCK_SIZE)
       throw Invalid_Argument("CFB_Decryption: Invalid feedback size " +
-                             to_string(fback_bits));
+                             std::to_string(fback_bits));
 
    set_key(key);
    set_iv(iv);
diff --git a/src/filters/pipe.h b/src/filters/pipe.h
index 19cdd3229..a927e1a0f 100644
--- a/src/filters/pipe.h
+++ b/src/filters/pipe.h
@@ -33,7 +33,7 @@ class BOTAN_DLL Pipe : public DataSource
          {
          Invalid_Message_Number(const std::string& where, message_id msg) :
             Invalid_Argument("Pipe::" + where + ": Invalid message number " +
-                             to_string(msg))
+                             std::to_string(msg))
             {}
          };
 
diff --git a/src/utils/exceptn.h b/src/utils/exceptn.h
index 86efebc7c..39b18cb0b 100644
--- a/src/utils/exceptn.h
+++ b/src/utils/exceptn.h
@@ -56,7 +56,7 @@ struct BOTAN_DLL Invalid_Key_Length : public Invalid_Argument
    {
    Invalid_Key_Length(const std::string& name, u32bit length) :
       Invalid_Argument(name + " cannot accept a key of length " +
-                       to_string(length))
+                       std::to_string(length))
       {}
    };
 
@@ -78,7 +78,7 @@ struct BOTAN_DLL Invalid_Block_Size : public Invalid_Argument
 struct BOTAN_DLL Invalid_IV_Length : public Invalid_Argument
    {
    Invalid_IV_Length(const std::string& mode, u32bit bad_len) :
-      Invalid_Argument("IV length " + to_string(bad_len) +
+      Invalid_Argument("IV length " + std::to_string(bad_len) +
                        " is invalid for " + mode)
       {}
    };