summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2017-10-24 17:29:11 +0000
committerDavid Blaikie <dblaikie@gmail.com>2017-10-24 17:29:11 +0000
commitaedf1537c67b0fe0a496f1052829ca10c3e58d69 (patch)
tree1060a61c421ef4a54dee5b5218c15ddff6681b6f
parent797ccba543bf9b8f77a807064086fcfc8b913ee2 (diff)
downloadbcm5719-llvm-aedf1537c67b0fe0a496f1052829ca10c3e58d69.tar.gz
bcm5719-llvm-aedf1537c67b0fe0a496f1052829ca10c3e58d69.zip
SmallVector.h:capacity_in_bytes Don't mark header functions as file-scope static
This creates ODR violations if the function is called from another inline function in a header and also creates binary bloat from duplicate definitions. llvm-svn: 316472
-rw-r--r--llvm/include/llvm/ADT/SmallVector.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/include/llvm/ADT/SmallVector.h b/llvm/include/llvm/ADT/SmallVector.h
index b3c2d836d16..a9ac98d1ad4 100644
--- a/llvm/include/llvm/ADT/SmallVector.h
+++ b/llvm/include/llvm/ADT/SmallVector.h
@@ -927,8 +927,8 @@ public:
}
};
-template<typename T, unsigned N>
-static inline size_t capacity_in_bytes(const SmallVector<T, N> &X) {
+template <typename T, unsigned N>
+inline size_t capacity_in_bytes(const SmallVector<T, N> &X) {
return X.capacity_in_bytes();
}
OpenPOWER on IntegriCloud