Skip to content

Commit 05f1ea7

Browse files
committed
ECKIT-635: fix fam hash table
1 parent 424213f commit 05f1ea7

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

src/eckit/io/fam/FamHashTable.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515

1616
#include "eckit/io/fam/FamHashTable.h"
1717

18-
#include "detail/FamHashNode.h"
18+
#include <string>
1919

20+
#include "eckit/exception/Exceptions.h"
2021
#include "eckit/io/fam/FamObject.h"
2122
#include "eckit/io/fam/FamObjectName.h"
23+
#include "eckit/io/fam/FamProperty.h"
2224
#include "eckit/io/fam/FamRegionName.h"
23-
24-
// #include "detail/FamSessionDetail.h"
25-
// #include "eckit/exception/Exceptions.h"
25+
// #include "eckit/io/fam/detail/FamHashNode.h"
2626

2727
namespace eckit {
2828

src/eckit/io/fam/FamHashTable.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,16 @@
1919

2020
#pragma once
2121

22-
#include "eckit/io/fam/FamObject.h"
23-
#include "eckit/io/fam/FamRegion.h"
24-
// #include "eckit/io/fam/FamRegionName.h"
25-
// #include "eckit/io/fam/FamVector.h"
2622
#include <array>
23+
#include <cstddef>
24+
#include <functional>
25+
#include <optional>
2726
#include <string>
2827

2928
#include "eckit/io/fam/FamMapIterator.h"
29+
#include "eckit/io/fam/FamObject.h"
30+
#include "eckit/io/fam/FamProperty.h"
31+
#include "eckit/io/fam/FamRegion.h"
3032
#include "eckit/types/FixedString.h"
3133

3234
namespace eckit {
@@ -87,7 +89,7 @@ class FamHashTable {
8789
// using local_iterator = local_iterator;
8890
// using const_local_iterator = const_local_iterator;
8991

90-
using node_type = FamList;
92+
using node_type = std::optional<FamList>;
9193

9294
public: // methods
9395

0 commit comments

Comments
 (0)