Skip to content

Commit 957f50e

Browse files
authored
Merge pull request #5 from arangodb/bugfix/clang19-build
Fixes for clang 19 build
2 parents 7e3cdce + 5fd8e55 commit 957f50e

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
master
22
-------------------------
33

4+
* Fix for clang 19 build
45

56
1.3 (2023-05-02)
67
-------------------------

core/utils/memory.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ struct maker<Class, false> {
524524
static ptr make(Args&&... args) { \
525525
using type = std::enable_if_t<std::is_base_of_v<class_name, Type>, Type>; \
526526
using maker_t = irs::memory::maker<type>; \
527-
return maker_t::template make(std::forward<Args>(args)...); \
527+
return maker_t::make(std::forward<Args>(args)...); \
528528
} \
529529
template<typename Class, bool> \
530530
friend struct irs::memory::maker

external/openfst/fst/bi-table.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ class VectorHashBiTable {
325325
}
326326

327327
VectorHashBiTable(const VectorHashBiTable<I, T, S, FP, H, HS> &table)
328-
: selector_(table.s_),
328+
: selector_(table.selector_),
329329
fp_(table.fp_),
330330
h_(table.h_),
331331
id2entry_(table.id2entry_),

external/openfst/fst/fst.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,8 +688,8 @@ class FstImpl {
688688
properties_.store(impl.properties_.load(std::memory_order_relaxed),
689689
std::memory_order_relaxed);
690690
type_ = impl.type_;
691-
isymbols_ = impl.isymbols_ ? impl.isymbols_->Copy() : nullptr;
692-
osymbols_ = impl.osymbols_ ? impl.osymbols_->Copy() : nullptr;
691+
isymbols_ = impl.isymbols_ ? impl.isymbols_->Copy() : std::unique_ptr<FstImpl>();
692+
osymbols_ = impl.osymbols_ ? impl.osymbols_->Copy() : std::unique_ptr<FstImpl>();
693693
return *this;
694694
}
695695

0 commit comments

Comments
 (0)