diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-05-11 06:17:44 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-05-11 06:17:44 +0000 |
| commit | 6739a891173474b3f295234b2a55c65d7f05e868 (patch) | |
| tree | c782e759e5291476ba6572f45ef19ba3ca551973 /llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp | |
| parent | ea31737fefd6d8bbbc54573e6b3957c1a64dc65d (diff) | |
| download | bcm5719-llvm-6739a891173474b3f295234b2a55c65d7f05e868.tar.gz bcm5719-llvm-6739a891173474b3f295234b2a55c65d7f05e868.zip | |
Fixes for Microsoft Visual Studio 2010, from Steven Watanabe!
llvm-svn: 103457
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp b/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp index 8a4a1b17260..4642310abdf 100644 --- a/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp @@ -2417,7 +2417,7 @@ std::pair<unsigned, const TargetRegisterClass*> TargetLowering:: getRegForInlineAsmConstraint(const std::string &Constraint, EVT VT) const { if (Constraint[0] != '{') - return std::pair<unsigned, const TargetRegisterClass*>(0, 0); + return std::make_pair(0u, static_cast<TargetRegisterClass*>(0)); assert(*(Constraint.end()-1) == '}' && "Not a brace enclosed constraint?"); // Remove the braces from around the name. @@ -2449,7 +2449,7 @@ getRegForInlineAsmConstraint(const std::string &Constraint, } } - return std::pair<unsigned, const TargetRegisterClass*>(0, 0); + return std::make_pair(0u, static_cast<const TargetRegisterClass*>(0)); } //===----------------------------------------------------------------------===// |
