Merge fixups. Add locking to default session manager. Use chrono lib

and unique_ptr.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/asn1/ber_dec.cpp b/src/asn1/ber_dec.cpp
index 4d800d471..21a722551 100644
--- a/src/asn1/ber_dec.cpp
+++ b/src/asn1/ber_dec.cpp
@@ -142,10 +142,10 @@ void BER_Object::assert_is_a(ASN1_Tag type_tag, ASN1_Tag class_tag)
    {
    if(this->type_tag != type_tag || this->class_tag != class_tag)
       throw BER_Decoding_Error("Tag mismatch when decoding got " +
-                               to_string(this->type_tag) + "/" +
-                               to_string(this->class_tag) + " expected " +
-                               to_string(type_tag) + "/" +
-                               to_string(class_tag));
+                               std::to_string(this->type_tag) + "/" +
+                               std::to_string(this->class_tag) + " expected " +
+                               std::to_string(type_tag) + "/" +
+                               std::to_string(class_tag));
    }
 
 /*