projects / platform / upstream / qtbase.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1977855) | patch
Fix compilation with ICC on Windows
authorThiago Macieira <thiago.macieira@intel.com>
Fri, 21 Aug 2015 20:58:39 +0000 (13:58 -0700)
committerThiago Macieira <thiago.macieira@intel.com>
Tue, 25 Aug 2015 01:08:42 +0000 (01:08 +0000)
commitad080fa3113b4898cb9f9437df9d42627fbc3638
treebcc179d937c10ad151adcf3b42aae67e6c039f59tree | snapshot
parent1977855f3115ab9ad1642b522840ff3424a5f2fecommit | diff
Fix compilation with ICC on Windows

Unlike MSVC, ICC *does* support constexpr, but on Windows it will not
define __GNUC__, so we ended up in the multi-line alternative. That is
not permitted in C++11, only in C++14.

qalgorithms.h(659): error: statement may not appear in a constexpr function

Change-Id: I7de033f80b0e4431b7f1ffff13fc96245ee9a846
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
src/corelib/tools/qalgorithms.h diff | blob | history
Domain: UI Framework / Qt;