mirror of
https://github.com/scylladb/scylladb.git
synced 2026-05-29 11:10:40 +00:00
Merge branch "Some fixes for clang++ trunk" from Avi
"Fix minor issues found while building with clang trunk." * 'clang' of https://github.com/avikivity/scylla: seastarx: don't make seastar namespace inline seastarx: add missing make_shared forward declaration tests: fix call to seastar::sleep() dht: fix bad to_sstring() call
This commit is contained in:
@@ -130,7 +130,7 @@ murmur3_partitioner::bias(uint64_t n) const {
|
||||
}
|
||||
|
||||
sstring murmur3_partitioner::to_sstring(const token& t) const {
|
||||
return ::to_sstring<sstring>(long_token(t));
|
||||
return seastar::to_sstring<sstring>(long_token(t));
|
||||
}
|
||||
|
||||
dht::token murmur3_partitioner::from_sstring(const sstring& t) const {
|
||||
|
||||
@@ -28,6 +28,9 @@ namespace seastar {
|
||||
template <typename T>
|
||||
class shared_ptr;
|
||||
|
||||
template <typename T>
|
||||
shared_ptr<T> make_shared(T&&);
|
||||
|
||||
template <typename T, typename... A>
|
||||
shared_ptr<T> make_shared(A&&... a);
|
||||
|
||||
|
||||
3
stdx.hh
3
stdx.hh
@@ -23,4 +23,5 @@
|
||||
#pragma once
|
||||
|
||||
namespace std { namespace experimental {} }
|
||||
inline namespace seastar { namespace stdx = std::experimental; }
|
||||
namespace seastar { namespace stdx = std::experimental; }
|
||||
using namespace seastar;
|
||||
|
||||
@@ -556,7 +556,7 @@ int main(int argc, char** argv) {
|
||||
|
||||
std::cout << "Config: rows: " << cfg.n_rows << ", value size: " << cfg.value_size << "\n";
|
||||
|
||||
::sleep(1s).get(); // wait for system table flushes to quiesce
|
||||
sleep(1s).get(); // wait for system table flushes to quiesce
|
||||
|
||||
bool cancel = false;
|
||||
engine().at_exit([&] {
|
||||
|
||||
Reference in New Issue
Block a user