express: slight Datagram constructor cleanup

This commit is contained in:
rdb 2018-08-19 14:21:23 +02:00
parent ba345d590f
commit 74442e41f1
2 changed files with 9 additions and 29 deletions

View File

@ -11,30 +11,11 @@
* @date 2000-06-06
*/
/**
* Constructs an empty datagram.
*/
INLINE Datagram::
Datagram() :
#ifdef STDFLOAT_DOUBLE
_stdfloat_double(true)
#else
_stdfloat_double(false)
#endif
{
}
/**
* Constructs a datagram from an existing block of data.
*/
INLINE Datagram::
Datagram(const void *data, size_t size) :
#ifdef STDFLOAT_DOUBLE
_stdfloat_double(true)
#else
_stdfloat_double(false)
#endif
{
Datagram(const void *data, size_t size) {
append_data(data, size);
}
@ -43,13 +24,7 @@ Datagram(const void *data, size_t size) :
*/
INLINE Datagram::
Datagram(vector_uchar data) :
_data(std::move(data)),
#ifdef STDFLOAT_DOUBLE
_stdfloat_double(true)
#else
_stdfloat_double(false)
#endif
{
_data(std::move(data)) {
}
/**

View File

@ -37,7 +37,7 @@
*/
class EXPCL_PANDA_EXPRESS Datagram : public TypedObject {
PUBLISHED:
INLINE Datagram();
INLINE Datagram() = default;
INLINE Datagram(const void *data, size_t size);
INLINE explicit Datagram(vector_uchar data);
Datagram(const Datagram &copy) = default;
@ -114,7 +114,12 @@ PUBLISHED:
private:
PTA_uchar _data;
bool _stdfloat_double;
#ifdef STDFLOAT_DOUBLE
bool _stdfloat_double = true;
#else
bool _stdfloat_double = false;
#endif
public: