Skip to content
This repository has been archived by the owner on Dec 20, 2019. It is now read-only.

Commit

Permalink
Build LLVM Windows x64 using CMake + VS2015 or VS2017.
Browse files Browse the repository at this point in the history
  • Loading branch information
lateralusX committed May 28, 2018
1 parent 0b3cb8a commit 384caa9
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions include/llvm/CodeGen/PBQP/CostAllocator.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ class CostPool {
!std::is_same<PoolEntry*,
typename std::remove_const<CostKeyT>::type>::value,
bool>::type
operator()(const PoolEntry* a, const CostKeyT &b) {
operator()(const PoolEntry* a, const CostKeyT &b) const {
return compare(a->getCost(), b);
}
bool operator()(const PoolEntry* a, const PoolEntry* b) {
bool operator()(const PoolEntry* a, const PoolEntry* b) const {
return compare(a->getCost(), b->getCost());
}
private:
Expand Down
4 changes: 2 additions & 2 deletions include/llvm/CodeGen/PBQP/Math.h
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class Vector {

class VectorComparator {
public:
bool operator()(const Vector &A, const Vector &B) {
bool operator()(const Vector &A, const Vector &B) const {
if (A.Length < B.Length)
return true;
if (B.Length < A.Length)
Expand Down Expand Up @@ -386,7 +386,7 @@ class Matrix {

class MatrixComparator {
public:
bool operator()(const Matrix &A, const Matrix &B) {
bool operator()(const Matrix &A, const Matrix &B) const {
if (A.Rows < B.Rows)
return true;
if (B.Rows < A.Rows)
Expand Down
4 changes: 2 additions & 2 deletions include/llvm/Support/Compiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
#define LLVM_MSC_PREREQ(version) 0
#endif

#ifndef _MSC_VER
#if !defined(_MSC_VER) || (defined(_MSC_VER) && _MSC_VER >= 1910)
#define LLVM_NOEXCEPT noexcept
#else
#define LLVM_NOEXCEPT
Expand Down Expand Up @@ -117,7 +117,7 @@
#define LLVM_DELETED_FUNCTION
#endif

#if __has_feature(cxx_constexpr) || defined(__GXX_EXPERIMENTAL_CXX0X__)
#if __has_feature(cxx_constexpr) || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_MSC_VER) && _MSC_VER >= 1900)
# define LLVM_CONSTEXPR constexpr
#else
# define LLVM_CONSTEXPR
Expand Down
2 changes: 1 addition & 1 deletion tools/llvm-readobj/Error.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class _readobj_error_category : public std::error_category {
};
} // namespace

const char *_readobj_error_category::name() const {
const char *_readobj_error_category::name() const LLVM_NOEXCEPT {
return "llvm.readobj";
}

Expand Down
2 changes: 1 addition & 1 deletion tools/obj2yaml/Error.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class _obj2yaml_error_category : public std::error_category {
};
} // namespace

const char *_obj2yaml_error_category::name() const { return "obj2yaml"; }
const char *_obj2yaml_error_category::name() const LLVM_NOEXCEPT { return "obj2yaml"; }

std::string _obj2yaml_error_category::message(int ev) const {
switch (static_cast<obj2yaml_error>(ev)) {
Expand Down

0 comments on commit 384caa9

Please sign in to comment.