summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArgyrios Kyrtzidis <akyrtzi@gmail.com>2016-02-12 04:36:48 +0000
committerArgyrios Kyrtzidis <akyrtzi@gmail.com>2016-02-12 04:36:48 +0000
commit23299677148746d3d2f3048616ad58773096e700 (patch)
tree36c34c9786d1a97ea1ce02a88f856db2679bb81e
parentbbbbec0b54c55d21404efc41450fbd5f9a96029e (diff)
downloadbcm5719-llvm-23299677148746d3d2f3048616ad58773096e700.tar.gz
bcm5719-llvm-23299677148746d3d2f3048616ad58773096e700.zip
[ADT] OptionSet: ifdef out some code that seems to be crashing MSVC.
llvm-svn: 260654
-rw-r--r--llvm/include/llvm/ADT/OptionSet.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/llvm/include/llvm/ADT/OptionSet.h b/llvm/include/llvm/ADT/OptionSet.h
index fa984848beb..6981ccba47e 100644
--- a/llvm/include/llvm/ADT/OptionSet.h
+++ b/llvm/include/llvm/ADT/OptionSet.h
@@ -116,6 +116,8 @@ public:
}
private:
+#ifndef _MSC_VER
+ // This is crashing MSVC.
template <typename T>
static auto _checkResultTypeOperatorOr(T t) -> decltype(t | t) { return T(); }
@@ -124,6 +126,7 @@ private:
static_assert(!std::is_same<decltype(_checkResultTypeOperatorOr(Flags())),
Flags>::value,
"operator| should produce an OptionSet");
+#endif
};
}
OpenPOWER on IntegriCloud