diff options
| author | Jack Lloyd <[email protected]> | 2019-03-01 10:40:24 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2019-03-01 10:40:24 -0500 |
| commit | b999c51e42b394bdcab38cd1c3b5d46c3adaba64 (patch) | |
| tree | 104661598393ea2ef5fbef6179bb821b1283e9ec /src | |
| parent | 89b1838943e37b8f11b77f336691c9c6d250587b (diff) | |
Fix MSVC and avoid deprecated function call
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/base/scan_name.h | 2 | ||||
| -rw-r--r-- | src/tests/unit_ecdh.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/base/scan_name.h b/src/lib/base/scan_name.h index 6194392f3..4028ce9ab 100644 --- a/src/lib/base/scan_name.h +++ b/src/lib/base/scan_name.h @@ -38,7 +38,7 @@ class BOTAN_PUBLIC_API(2,0) SCAN_Name final */ const std::string& to_string() const { return m_orig_algo_spec; } - const std::string& BOTAN_DEPRECATED("Use SCAN_Name::to_string") as_string() const + BOTAN_DEPRECATED("Use SCAN_Name::to_string") const std::string& as_string() const { return this->to_string(); } diff --git a/src/tests/unit_ecdh.cpp b/src/tests/unit_ecdh.cpp index f7fc475b7..6e601f3d9 100644 --- a/src/tests/unit_ecdh.cpp +++ b/src/tests/unit_ecdh.cpp @@ -54,7 +54,7 @@ class ECDH_Unit_Tests final : public Test if(!result.test_eq("same derived key", alice_key.bits_of(), bob_key.bits_of())) { - result.test_note("Keys where " + alice_key.as_string() + " and " + bob_key.as_string()); + result.test_note("Keys where " + alice_key.to_string() + " and " + bob_key.to_string()); } } catch(Botan::Lookup_Error& e) |