aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-12-02 12:58:21 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2015-12-02 12:58:25 +0100
commit0dd194c917db4dcc19731b6c1ae6fd1a1395c1f7 (patch)
tree37bb3df9913cfffe2caa69d1c732e4d026777619 /src
parent8e598dc4ea1da92d34c8d964060d1d72f4465370 (diff)
parent1812de90915d002206148e7beae67d79d7a90e54 (diff)
Merge pull request #7146
1812de9 Name union to prevent compiler warning (Pavel Janík)
Diffstat (limited to 'src')
-rw-r--r--src/prevector.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/prevector.h b/src/prevector.h
index 3e80ef5d33..8992e305b3 100644
--- a/src/prevector.h
+++ b/src/prevector.h
@@ -140,7 +140,7 @@ public:
private:
size_type _size;
- union {
+ union direct_or_indirect {
char direct[sizeof(T) * N];
struct {
size_type capacity;