diff options
| author | Jertzukka <Jertzukka@gmail.com> | 2024-05-18 04:46:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-18 03:46:39 +0200 |
| commit | 114624b3a57374d69e4e4c7c2dd9d9f8ac308489 (patch) | |
| tree | 4aa67f18d6b2b792051e378031ceba2eabd018a3 /src/Main/StringFormatter.h | |
| parent | 55c3a8dc58d74bbdd4c39585eff14985838d9896 (diff) | |
| download | VeraCrypt-114624b3a57374d69e4e4c7c2dd9d9f8ac308489.tar.gz VeraCrypt-114624b3a57374d69e4e4c7c2dd9d9f8ac308489.zip | |
Prepare for changes in wxWidgets 3.3 (#1343)
* Move from deprecated wxScopedPtr to std::unique_ptr
wxScopedPtr was included previously through some header hierarchy which as of 3.3 is
no longer the case causing it to break. But instead of including a header for a deprecated
function explicitly, just move to std::unique_ptr as recommended by upstream.
* Convert to explicit conversions from wxString
As of https://github.com/wxWidgets/wxWidgets/pull/23449/commits/35c35c235e9c29b40002131602e050dca8d65b8c
wxWidgets defaults to STL classes, which has a side-effect that
some implicit conversions break. This patch converts those conversions
to explicit in anticipation of wxWidgets 3.3 release.
Diffstat (limited to 'src/Main/StringFormatter.h')
| -rw-r--r-- | src/Main/StringFormatter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Main/StringFormatter.h b/src/Main/StringFormatter.h index 33a47a35..97c39ae2 100644 --- a/src/Main/StringFormatter.h +++ b/src/Main/StringFormatter.h @@ -52,7 +52,7 @@ namespace VeraCrypt StringFormatter (const wxString &format, StringFormatterArg arg0 = StringFormatterArg(), StringFormatterArg arg1 = StringFormatterArg(), StringFormatterArg arg2 = StringFormatterArg(), StringFormatterArg arg3 = StringFormatterArg(), StringFormatterArg arg4 = StringFormatterArg(), StringFormatterArg arg5 = StringFormatterArg(), StringFormatterArg arg6 = StringFormatterArg(), StringFormatterArg arg7 = StringFormatterArg(), StringFormatterArg arg8 = StringFormatterArg(), StringFormatterArg arg9 = StringFormatterArg()); virtual ~StringFormatter (); - operator wstring () const { return wstring (FormattedString); } + explicit operator wstring () const { return wstring (FormattedString); } operator wxString () const { return FormattedString; } operator StringFormatterArg () const { return FormattedString; } |