Squashed commit of the following:

commit f1c193ea483872fee44e2969fc79a9b111a61d3d
Author: proller <proller@github.com>
Date:   Sun May 6 16:28:46 2018 +0300

    Clang5 build fix

commit c0ff4234747858dfd7741c90a5c77e9f8d47cd40
Merge: 852e11b 71814a3
Author: proller <proller@github.com>
Date:   Sun May 6 16:04:26 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix15

commit 852e11b409
Author: proller <proller@github.com>
Date:   Sat May 5 20:15:40 2018 +0300

    Try master

commit 2a5cebb5e5
Author: proller <proller@github.com>
Date:   Sat May 5 19:34:55 2018 +0300

    Try fix contrib/capnproto error with new compilers

commit bbfe581683
Merge: f493474 634ba89
Author: proller <proller@github.com>
Date:   Sat May 5 19:25:01 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix15

commit f49347469d
Author: proller <proller@github.com>
Date:   Sat May 5 15:31:47 2018 +0300

    Build fixes
This commit is contained in:
proller 2018-05-06 16:29:51 +03:00
parent 71814a33d5
commit 81e2467283

View File

@ -1,4 +1,4 @@
#include "lld/Common/Driver.h"
#include "lld/Driver/Driver.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringSwitch.h"
#include "llvm/ADT/Twine.h"