summaryrefslogtreecommitdiffstats
path: root/document
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-05-06 09:54:24 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2017-05-06 20:02:26 +0000
commit1435931cd6b6239b921649ead1aa1c1c9c9d2f99 (patch)
treeaf813209c4fbc4745b2eb55e31eff8ecd3a2c666 /document
parent11a234cf71fb7b2e96553c87c6a17ce680668374 (diff)
Due to c++17 eval order in gcc 7 we need to be more careful.
From gcc 7 release notes. "The C++17 evaluation order requirements can be selected in other modes with the -fstrong-eval-order flag, or disabled in C++17 mode with -fno-strong-eval-order."
Diffstat (limited to 'document')
-rw-r--r--document/src/vespa/document/repo/documenttyperepo.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/document/src/vespa/document/repo/documenttyperepo.cpp b/document/src/vespa/document/repo/documenttyperepo.cpp
index 338cbf3bcc4..78d668a4886 100644
--- a/document/src/vespa/document/repo/documenttyperepo.cpp
+++ b/document/src/vespa/document/repo/documenttyperepo.cpp
@@ -384,7 +384,8 @@ void addDefaultDocument(DocumentTypeMap &type_map) {
AnnotationType::UP(new AnnotationType(*annotation_types[i])));
}
- type_map[data_types->doc_type->getId()] = data_types.release();
+ uint32_t typeId = data_types->doc_type->getId();
+ type_map[typeId] = data_types.release();
}
const DataTypeRepo &lookupRepo(int32_t id, const DocumentTypeMap &type_map) {