summaryrefslogtreecommitdiff
path: root/include/llvm/Analysis
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2014-03-07 14:42:25 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2014-03-07 14:42:25 +0000
commitc1dafe8dc3cd9851e22585c0137d39843b62b9fa (patch)
tree10203c5ffcf6d468e854f595ef39382b4a094e45 /include/llvm/Analysis
parent122a970111b8ec66ae330f2c218ae951dddaf75b (diff)
downloadllvm-c1dafe8dc3cd9851e22585c0137d39843b62b9fa.tar.gz
llvm-c1dafe8dc3cd9851e22585c0137d39843b62b9fa.tar.bz2
llvm-c1dafe8dc3cd9851e22585c0137d39843b62b9fa.tar.xz
[C++11] Replace LLVM-style type traits with C++11 standard ones.
No functionality change. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@203242 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm/Analysis')
-rw-r--r--include/llvm/Analysis/RegionInfo.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/include/llvm/Analysis/RegionInfo.h b/include/llvm/Analysis/RegionInfo.h
index c45a206341..4d55408a47 100644
--- a/include/llvm/Analysis/RegionInfo.h
+++ b/include/llvm/Analysis/RegionInfo.h
@@ -496,13 +496,11 @@ public:
//@{
template <bool IsConst>
class block_iterator_wrapper
- : public df_iterator<typename conditional<IsConst,
- const BasicBlock,
- BasicBlock>::type*> {
- typedef df_iterator<typename conditional<IsConst,
- const BasicBlock,
- BasicBlock>::type*>
- super;
+ : public df_iterator<typename std::conditional<IsConst, const BasicBlock,
+ BasicBlock>::type *> {
+ typedef df_iterator<typename std::conditional<IsConst, const BasicBlock,
+ BasicBlock>::type *> super;
+
public:
typedef block_iterator_wrapper<IsConst> Self;
typedef typename super::pointer pointer;