Huge pile of post merge fixups, mtn really fucked that merge

1 files changed, 4 insertions, 3 deletions

diff --git a/src/tls/tls_handshake_state.cpp b/src/tls/tls_handshake_state.cpp
index 1a55305e3..f5a9f899c 100644
--- a/src/tls/tls_handshake_state.cpp
+++ b/src/tls/tls_handshake_state.cpp
@@ -68,7 +68,8 @@ u32bit bitmask_for_handshake_type(Handshake_Type type)
          return 0;
 
       default:
-         throw Internal_Error("Unknown handshake type " + to_string(type));
+         throw Internal_Error("Unknown handshake type " +
+                              std::to_string(type));
       }
 
    return 0;
@@ -123,8 +124,8 @@ void Handshake_State::confirm_transition_to(Handshake_Type handshake_msg)
 
    if(!ok)
       throw Unexpected_Message("Unexpected state transition in handshake, got " +
-                               to_string(handshake_msg) + " mask is " +
-                               to_string(hand_expecting_mask));
+                               std::to_string(handshake_msg) + " mask is " +
+                               std::to_string(hand_expecting_mask));
 
    /* We don't know what to expect next, so force a call to
       set_expected_next; if it doesn't happen, the next transition