Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fix for libc++ after the previous commit

Browse Source 
libc++ defines std::iter_swap() with a non-standard exception specification
incompatible with the other other standard libraries and not compiling with
our definition of swap() for wxUniCharRef anyhow, so disable iter_swap()
specialization until https://llvm.org/bugs/show_bug.cgi?id=28559 is fixed.
This commit is contained in:
Vadim Zeitlin
2016-07-15 02:12:55 +02:00
parent 14ec2691f6
commit 90eaa1bbe3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/string.h
View File

@@ -3991,7 +3991,10 @@ namespace std
// iterator::reference being different from "iterator::value_type&", in C++11 // iterator::reference being different from "iterator::value_type&", in C++11
// iter_swap() just calls swap() by default and this doesn't work for us as // iter_swap() just calls swap() by default and this doesn't work for us as
// wxUniCharRef is not the same as "wxUniChar&". // wxUniCharRef is not the same as "wxUniChar&".
#if __cplusplus >= 201103L //
// Unfortunately currently iter_swap() can't be specialized when using libc++,
// see https://llvm.org/bugs/show_bug.cgi?id=28559
#if (__cplusplus >= 201103L) && !defined(_LIBCPP_VERSION)
namespace std namespace std
{ {