niklas/rmw_cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace __attribute__((unused)) with static_cast<void>

Browse source 
Signed-off-by: Hunter L. Allen <hunterlallen@protonmail.com>
This commit is contained in:
Hunter L. Allen 2019-06-17 20:41:13 -04:00 • committed by eboasson
parent 7acc5f3222
commit eb4aec84ca
2 changed files with 80 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

40
rmw_cyclonedds_cpp/src/serdata.cpp
View file

@ -85,7 +85,7 @@ void *create_response_type_support (const void *untyped_members, const char *typ
static uint32_t serdata_rmw_size (const struct ddsi_serdata *dcmn)
{
const struct serdata_rmw *d = static_cast<const struct serdata_rmw *> (dcmn);
return d->data.size ();
return static_cast<uint32_t>(d->data.size());
}
static void serdata_rmw_free (struct ddsi_serdata *dcmn)
@ -120,8 +120,9 @@ static struct ddsi_serdata *serdata_rmw_from_ser (const struct ddsi_sertopic *to
return d;
}
static struct ddsi_serdata *serdata_rmw_from_keyhash (const struct ddsi_sertopic *topic, const struct nn_keyhash *keyhash __attribute__ ((unused)))
static struct ddsi_serdata *serdata_rmw_from_keyhash (const struct ddsi_sertopic *topic, const struct nn_keyhash *keyhash)
{
static_cast<void>(keyhash); // unused
/* there is no key field, so from_keyhash is trivial */
return rmw_serdata_new (topic, SDK_KEY);
}
@ -200,14 +201,17 @@ static struct ddsi_serdata *serdata_rmw_to_ser_ref (const struct ddsi_serdata *d
return ddsi_serdata_ref (d);
}
static void serdata_rmw_to_ser_unref (struct ddsi_serdata *dcmn, const ddsrt_iovec_t *ref __attribute__ ((unused)))
static void serdata_rmw_to_ser_unref (struct ddsi_serdata *dcmn, const ddsrt_iovec_t *ref)
{
static_cast<void>(ref); // unused
struct serdata_rmw *d = static_cast<struct serdata_rmw *> (dcmn);
ddsi_serdata_unref (d);
}
static bool serdata_rmw_to_sample (const struct ddsi_serdata *dcmn, void *sample, void **bufptr __attribute__ ((unused)), void *buflim __attribute__ ((unused)))
static bool serdata_rmw_to_sample (const struct ddsi_serdata *dcmn, void *sample, void **bufptr, void *buflim)
{
static_cast<void>(bufptr); // unused
static_cast<void>(buflim); // unused
const struct serdata_rmw *d = static_cast<const struct serdata_rmw *> (dcmn);
const struct sertopic_rmw *topic = static_cast<const struct sertopic_rmw *> (d->topic);
assert (bufptr == NULL);
@ -241,14 +245,21 @@ static bool serdata_rmw_to_sample (const struct ddsi_serdata *dcmn, void *sample
return false;
}
static bool serdata_rmw_topicless_to_sample (const struct ddsi_sertopic *topic __attribute__ ((unused)), const struct ddsi_serdata *dcmn __attribute__ ((unused)), void *sample __attribute__ ((unused)), void **bufptr __attribute__ ((unused)), void *buflim __attribute__ ((unused)))
static bool serdata_rmw_topicless_to_sample (const struct ddsi_sertopic *topic, const struct ddsi_serdata *dcmn, void *sample, void **bufptr, void *buflim)
{
static_cast<void>(topic);
static_cast<void>(dcmn);
static_cast<void>(sample);
static_cast<void>(bufptr);
static_cast<void>(buflim);
/* ROS2 doesn't do keys in a meaningful way yet */
return true;
}
static bool serdata_rmw_eqkey (const struct ddsi_serdata *a __attribute__ ((unused)), const struct ddsi_serdata *b __attribute__ ((unused)))
static bool serdata_rmw_eqkey (const struct ddsi_serdata *a, const struct ddsi_serdata *b)
{
static_cast<void>(a);
static_cast<void>(b);
/* ROS2 doesn't do keys in a meaningful way yet */
return true;
}
@ -274,20 +285,31 @@ static void sertopic_rmw_free (struct ddsi_sertopic *tpcmn)
delete tp;
}
static void sertopic_rmw_zero_samples (const struct ddsi_sertopic *d __attribute__ ((unused)), void *samples __attribute__ ((unused)), size_t count __attribute__ ((unused)))
static void sertopic_rmw_zero_samples (const struct ddsi_sertopic *d, void *samples, size_t count)
{
static_cast<void>(d);
static_cast<void>(samples);
static_cast<void>(count);
/* Not using code paths that rely on the samples getting zero'd out */
}
static void sertopic_rmw_realloc_samples (void **ptrs __attribute__ ((unused)), const struct ddsi_sertopic *d __attribute__ ((unused)), void *old __attribute__ ((unused)), size_t oldcount __attribute__ ((unused)), size_t count __attribute__ ((unused)))
static void sertopic_rmw_realloc_samples (void **ptrs, const struct ddsi_sertopic *d, void *old, size_t oldcount, size_t count)
{
static_cast<void>(ptrs);
static_cast<void>(d);
static_cast<void>(old);
static_cast<void>(oldcount);
static_cast<void>(count);
/* Not using code paths that rely on this (loans, dispose, unregister with instance handle,
content filters) */
abort ();
}
static void sertopic_rmw_free_samples (const struct ddsi_sertopic *d __attribute__ ((unused)), void **ptrs __attribute__ ((unused)), size_t count __attribute__ ((unused)), dds_free_op_t op)
static void sertopic_rmw_free_samples (const struct ddsi_sertopic *d, void **ptrs, size_t count, dds_free_op_t op)
{
static_cast<void>(d); // unused
static_cast<void>(ptrs); // unused
static_cast<void>(count); // unused
/* Not using code paths that rely on this (dispose, unregister with instance handle, content
filters) */
assert (!(op & DDS_FREE_ALL_BIT));