diff options
| author | Michael Stahl <mstahl@redhat.com> | 2018-01-19 21:23:51 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-01-22 20:08:05 +0100 |
| commit | 61c88ae6945c241f5f2aeb844eeca0776b487132 (patch) | |
| tree | e36c2dcfd7917a779e17e840071a836bcb944184 /desktop | |
| parent | 0b1f8cb4a7eca3ab5b55c1866ef2761398d1ae95 (diff) | |
gbuild: always compile as C++17 with MSVC 2017
The current update MSVC 2017.5 supports fancy new C++ features, but
unfortunately in its default C++14 mode it falls over and dies with
an internal compiler error as soon as it sees the WeakImplHelper
variadic template.
In order to work around the ICE, build everything as C++17,
which somehow doesn't crash.
This causes loads of deprecation warnings about obsolete std::this
and badly designed std::that, almost all of them from boost headers,
which are well known for following every best practice in the C++ book.
Liberally sprinkle macros around to suppress the warnings for now,
like we already do with the other million warnings from boost headers.
Change-Id: Ia6b6ef5e457b5fe3c8cfe361ba5da39376bb7c4c
Reviewed-on: https://gerrit.libreoffice.org/48225
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/sofficemain.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 657614962489..e27b48d8b93a 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -92,6 +92,9 @@ static bool dumpCallback(const wchar_t* path, const wchar_t* id, std::string ini_path = CrashReporter::getIniFileName(); std::ofstream minidump_file(ini_path, std::ios_base::app); // TODO: moggi: can we avoid this conversion +#ifdef _MSC_VER +#pragma warning (disable: 4996) +#endif std::wstring_convert<std::codecvt_utf8<wchar_t>> conv1; std::string aPath = conv1.to_bytes(std::wstring(path)) + conv1.to_bytes(std::wstring(id)) + ".dmp"; minidump_file << "DumpFile=" << aPath << "\n"; |