Skip to content

Commit 400aa3e

Browse files
committed
Fixed some more compiler warnings
These showed up after a clean rebuild, mostly complaining about documentation comments not matching the function signature.
1 parent e2821f8 commit 400aa3e

6 files changed

Lines changed: 10 additions & 18 deletions

File tree

include/cascade/cascade_interface.hpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ class CriticalDataPathObserver : public derecho::DeserializationContext {
4949
* @param[in] value The value of the K/V pair
5050
* @param[in] cascade_ctxt The cascade context to be used later
5151
* @param[in] is_trigger True for critical data path of `p2p_send`; otherwise, the critical data path of `ordered_send`.
52-
*
53-
* @return void
5452
*/
5553
virtual void operator()(const uint32_t subgroup_idx,
5654
const uint32_t shard_idx,
@@ -111,8 +109,6 @@ class ICascadeStore {
111109
*
112110
* @param[in] value The K/V pair value
113111
* @param[in] as_trigger The object will NOT be used to update the K/V state.
114-
*
115-
* @return void
116112
*/
117113
virtual void put_and_forget(const VT& value, bool as_trigger) const = 0;
118114

@@ -149,7 +145,7 @@ class ICascadeStore {
149145
* If `stable == false`, we only return the data reflecting the latest locally delivered atomic
150146
* broadcast. Otherwise, stable data will be returned, meaning that the persisted states returned
151147
* is safe: they will survive after whole system recovery.
152-
* @param[in] exact
148+
* @param[in] exact
153149
* The exact match flag: this function try to return the value of that key at the 'ver'. If such a
154150
* value does not exists and exact is true, it will throw an exception. If such a value does not
155151
* exists and exact is false, it will return the latest state of the value for 'key' before 'ver'.
@@ -272,7 +268,7 @@ class ICascadeStore {
272268
* @param[in] key The key
273269
* @param[in] ver Version, if `ver == CURRENT_VERSION`, get the latest value.
274270
* @param[in] stable
275-
* @param[in] exact
271+
* @param[in] exact
276272
* The exact match flag: this function try to return the value of that key at the 'ver'. If such a
277273
* value does not exists and exact is true, it will throw an exception. If such a value does not
278274
* exists and exact is false, it will return the latest state of the value for 'key' before 'ver'.
@@ -427,7 +423,7 @@ VT create_null_object_cb(const KT& key = *IK);
427423
* We use both the concepts of null and valid object in Cascade. A null object precisely means 'no data'; while a
428424
* valid object literarily means an object is 'valid'. Technically, a null object has a valid key while invalid
429425
* object does not.
430-
*
426+
*
431427
* @tparam KT The key type.
432428
* @tparam VT The value type.
433429
*/
@@ -489,7 +485,7 @@ class IKeepVersion {
489485

490486
/**
491487
* @brief The version getter
492-
*
488+
*
493489
* Get the version
494490
*
495491
* @return The K/V object's version.

include/cascade/detail/prefix_registry.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ class PrefixRegistry {
115115
*
116116
* @param path - the full path.
117117
* @param collector - the lambda function to collect values for all prefixes of a string.
118-
*
119-
* @return
120118
*/
121119
void collect_values_for_prefixes(const std::string& path,
122120
const std::function<void(const std::string& prefix,const std::shared_ptr<T>& value)>& collector) const;

include/cascade/service.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -863,8 +863,6 @@ namespace cascade {
863863
* @param[in] object the object to write.
864864
* @param[in] subgroup_index the subgroup index of CascadeType
865865
* @param[in] nodes_and_futures map from node ids to futures.
866-
*
867-
* @return an array of void futures, which length is nodes.size()
868866
*/
869867
template <typename SubgroupType>
870868
void collective_trigger_put(const typename SubgroupType::ObjectType& object,

include/cascade/utils.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ class OpenLoopLatencyCollectorClient {
8585
* @param id The event id for corresponding event.
8686
* @param use_local_ts Using loca timestamp.
8787
*
88-
* @return N/A
8988
*/
9089
virtual void ack(uint32_t type, uint32_t id, bool use_local_ts = false) = 0;
9190

src/applications/tests/cascade_as_subgroup_classes/cli_example.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ static std::vector<std::string> tokenize(std::string& line) {
3232
}
3333

3434
static void client_help() {
35-
static const char* HELP_STR =
35+
static const char* HELP_STR =
3636
"(v/p/t)put <object_id> <contents>\n"
3737
" - Put an object\n"
3838
"(v/p)get <object_id> [-t timestamp_in_us | -v version_number]\n"
@@ -67,7 +67,7 @@ static void client_put(derecho::ExternalGroupClient<VCS,PCS,TCS>& group,
6767
}
6868

6969
uint64_t key = std::stoll(tokens[1]);
70-
70+
7171
//TODO: the previous_version should be used to enforce version check. INVALID_VERSION disables the feature.
7272
ObjectWithUInt64Key o(key,Blob(reinterpret_cast<const uint8_t*>(tokens[2].c_str()),tokens[2].size()));
7373

@@ -95,7 +95,7 @@ static void client_trigger_put(derecho::ExternalGroupClient<VCS,PCS,TCS>& group,
9595
}
9696

9797
uint64_t key = std::stoll(tokens[1]);
98-
98+
9999
ObjectWithUInt64Key o(key,Blob(reinterpret_cast<const uint8_t*>(tokens[2].c_str()),tokens[2].size()));
100100

101101
ExternalClientCaller<TCS,std::remove_reference<decltype(group)>::type>& vcs_ec = group.get_subgroup_caller<TCS>();
@@ -203,7 +203,7 @@ static void client_remove(derecho::ExternalGroupClient<VCS,PCS,TCS>& group,
203203
}
204204

205205
uint64_t key = std::stoll(tokens[1]);
206-
206+
207207
if (is_persistent) {
208208
ExternalClientCaller<PCS,std::remove_reference<decltype(group)>::type>& pcs_ec = group.get_subgroup_caller<PCS>();
209209
auto result = pcs_ec.p2p_send<RPC_NAME(remove)>(member,key);
@@ -300,6 +300,7 @@ class PerfCDPO : public CriticalDataPathObserver<CascadeType> {
300300
// @overload
301301
void operator () (const uint32_t sgidx,
302302
const uint32_t shidx,
303+
const derecho::node_id_t sender_id,
303304
const typename CascadeType::KeyType& key,
304305
const typename CascadeType::ObjectType& value,
305306
ICascadeContext* cascade_context,

src/udl_zoo/mproc/object_commit_protocol.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ObjectCommitRequestHeader {
4242
/**
4343
* @brief The version assigned to this put operation.
4444
*/
45-
version_t version;
45+
persistent::version_t version;
4646
/**
4747
* @brief Control flags for the request
4848
* - `flags & OBJECT_COMMIT_REQUEST_MEMORY_MASK` tells memory type: inline or shared memory

0 commit comments

Comments
 (0)