Commitaa595b9

committed

Merge branch 'feature/supervised-aql-value' of github.com:arangodb/arangodb into feature/supervised-aql-item-block

2 parentsa0f2740 +f735927 commitaa595b9Copy full SHA for aa595b9

File tree

-9

lines changed

-9

lines changed

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@`
`25`	`25`	`#pragma once`
`26`	`26`
`27`	`27`	`#include"Aql/AqlValueFwd.h"`
`28`		`-#include"Aql/RegisterId.h"`
`29`		`-#include"Aql/RegIdFlatSet.h"`
`30`	`28`	`#include"Basics/Endian.h"`
`31`	`29`	`#include"Basics/ResourceUsage.h"`
`32`	`30`	`#include"IResearch/Misc.h"`
`@@ -582,9 +580,6 @@ static_assert(std::is_trivially_destructible_v<AqlValue>);`
`582`	`580`	`static_assert(std::is_standard_layout_v<AqlValue>);`
`583`	`581`	`static_assert(sizeof(AqlValue) ==16);`
`584`	`582`
`585`		`-booloperator==(AqlValueconst& a, AqlValueconst& b)noexcept;`
`586`		`-booloperator!=(AqlValueconst& a, AqlValueconst& b)noexcept;`
`587`		`-`
`588`	`583`	`classAqlValueGuard {`
`589`	`584`	`public:`
`590`	`585`	`AqlValueGuard() =delete;`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,15 +42,13 @@ inline DocumentData makeDocDataFromSlice(Slice s) {`
`42`	`42`	`inlinevoidexpectEqualBothWays(AqlValueconst& a, AqlValueconst& b) {`
`43`	`43`	`std::equal_to<AqlValue> eq;`
`44`	`44`	`EXPECT_TRUE(eq(a, b));`
`45`		`-EXPECT_TRUE(a == b);`
`46`		`-EXPECT_FALSE(a != b);`
	`45`	`+EXPECT_TRUE(eq(b, a));// Verify symmetry`
`47`	`46`	`}`
`48`	`47`
`49`	`48`	`inlinevoidexpectNotEqualBothWays(AqlValueconst& a, AqlValueconst& b) {`
`50`	`49`	`std::equal_to<AqlValue> eq;`
`51`	`50`	`EXPECT_FALSE(eq(a, b));`
`52`		`-EXPECT_FALSE(a == b);`
`53`		`-EXPECT_TRUE(a != b);`
	`51`	`+EXPECT_FALSE(eq(b, a));// Verify symmetry`
`54`	`52`	`}`
`55`	`53`	`}// namespace`
`56`	`54`

Comments

(0)