mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-20 03:23:01 +02:00
Fix compiler error in Attributes.cpp
``` Compiling Attributes.cpp ... ../../../Attributes.cpp: In member function 'std::__1::pair<unsigned int, llvm::Optional<unsigned int> > llvm::AttributeSet::getAllocSizeArgs() const': ../../../Attributes.cpp:542:69: error: operands to ?: have different types 'std::__1::pair<unsigned int, llvm::Optional<unsigned int> >' and 'std::__1::pair<int, int>' return SetNode ? SetNode->getAllocSizeArgs() : std::make_pair(0, 0); ^ ../../../Attributes.cpp:543:1: error: control reaches end of non-void function [-Werror=return-type] } ^ ``` Differential Revision: https://reviews.llvm.org/D31981 llvm-svn: 300143
This commit is contained in:
parent
57ada34a3f
commit
309240414d
@ -539,7 +539,8 @@ uint64_t AttributeSet::getDereferenceableOrNullBytes() const {
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::pair<unsigned, Optional<unsigned>> AttributeSet::getAllocSizeArgs() const {
|
std::pair<unsigned, Optional<unsigned>> AttributeSet::getAllocSizeArgs() const {
|
||||||
return SetNode ? SetNode->getAllocSizeArgs() : std::make_pair(0, 0);
|
return SetNode ? SetNode->getAllocSizeArgs()
|
||||||
|
: std::pair<unsigned, Optional<unsigned>>(0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string AttributeSet::getAsString(bool InAttrGrp) const {
|
std::string AttributeSet::getAsString(bool InAttrGrp) const {
|
||||||
|
Loading…
Reference in New Issue
Block a user