Refs #18687. Fix warnings on windows

Signed-off-by: Ricardo González Moreno <[email protected]>
eProsima · Jul 4, 2023 · 17ed0fc · 17ed0fc
1 parent 3bd3b91
commit 17ed0fc
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/include/fastcdr/xcdr/MemberId.hpp b/include/fastcdr/xcdr/MemberId.hpp
@@ -17,12 +17,14 @@
 
 #include <cstdint>
 
+#include "../fastcdr_dll.h"
+
 namespace eprosima {
 namespace fastcdr {
 
 class Cdr;
 
-class MemberId
+class Cdr_DllAPI MemberId
 {
 public:
 

diff --git a/include/fastcdr/xcdr/optional.hpp b/include/fastcdr/xcdr/optional.hpp
@@ -18,6 +18,7 @@
 #include <new>
 #include <type_traits>
 
+#include "../fastcdr_dll.h"
 #include "../exceptions/BadParamException.h"
 
 namespace eprosima {
@@ -80,7 +81,7 @@ struct nullopt_t
 static constexpr nullopt_t nullopt {0};
 
 template<class T>
-class optional
+class Cdr_DllAPI optional
 {
 public:
 
@@ -140,7 +141,7 @@ class optional
  }
  }
 
- T& value()&
+ T& value() &
  {
  return storage_.engaged_ ? storage_.val_ : throw exception::BadParamException("value not set");
  }

diff --git a/src/cpp/Cdr.cpp b/src/cpp/Cdr.cpp
@@ -144,7 +144,7 @@ Cdr& Cdr::read_encapsulation()
 
 
  // If it is a different endianness, make changes.
- const bool endianness = encapsulation & 0x1_8u;
+ const uint8_t endianness = encapsulation & 0x1_8u;
  if (m_endianness != endianness)
  {
  m_swapBytes = !m_swapBytes;
@@ -3102,6 +3102,7 @@ Cdr& Cdr::xcdr1_begin_serialize_member(
  Cdr::XCdrHeaderSelection header_selection)
 {
  static_cast<void>(current_state);
+ static_cast<void>(is_present);
  assert(is_present);
  assert(MEMBER_ID_INVALID != member_id);
  assert(MEMBER_ID_INVALID == next_member_id_ || member_id == next_member_id_);

diff --git a/test/xcdr/basic_types.cpp b/test/xcdr/basic_types.cpp
@@ -4565,7 +4565,7 @@ TEST_P(XCdrBasicTypesTest, longlong_align_4)
 TEST_P(XCdrBasicTypesTest, ulonglong_align_1)
 {
  const uint8_t align_value {0xAB};
- constexpr uint64_t ulonglong_value {0xCDCDCDCDCDCDCDDCll};
+ constexpr uint64_t ulonglong_value {0xCDCDCDCDCDCDCDDCull};
  constexpr uint8_t ival {0xCD};
  constexpr uint8_t fval {0xDC};
 
@@ -4682,7 +4682,7 @@ TEST_P(XCdrBasicTypesTest, ulonglong_align_2)
  const uint16_t align_value {0xABBA};
  constexpr uint8_t iava {0xAB};
  constexpr uint8_t fava {0xBA};
- constexpr uint64_t ulonglong_value {0xCDCDCDCDCDCDCDDCll};
+ constexpr uint64_t ulonglong_value {0xCDCDCDCDCDCDCDDCull};
  constexpr uint8_t ival {0xCD};
  constexpr uint8_t fval {0xDC};
 
@@ -4799,7 +4799,7 @@ TEST_P(XCdrBasicTypesTest, ulonglong_align_4)
  const uint32_t align_value {0xABABABBA};
  constexpr uint8_t iava {0xAB};
  constexpr uint8_t fava {0xBA};
- constexpr uint64_t ulonglong_value {0xCDCDCDCDCDCDCDDCll};
+ constexpr uint64_t ulonglong_value {0xCDCDCDCDCDCDCDDCull};
  constexpr uint8_t ival {0xCD};
  constexpr uint8_t fval {0xDC};
 

diff --git a/test/xcdr/optional.cpp b/test/xcdr/optional.cpp
@@ -4132,7 +4132,7 @@ TEST_P(XCdrOptionalTest, ulonglong_align_2_optional)
  const uint16_t align_value {0xABBA};
  constexpr uint8_t iava {0xAB};
  constexpr uint8_t fava {0xBA};
- constexpr uint64_t ulonglong_value {0xCDCDCDCDCDCDCDDCll};
+ constexpr uint64_t ulonglong_value {0xCDCDCDCDCDCDCDDCull};
  constexpr uint8_t ival {0xCD};
  constexpr uint8_t fval {0xDC};
 
@@ -4253,7 +4253,7 @@ TEST_P(XCdrOptionalTest, ulonglong_align_4_optional)
  const uint32_t align_value {0xABABABBA};
  constexpr uint8_t iava {0xAB};
  constexpr uint8_t fava {0xBA};
- constexpr uint64_t ulonglong_value {0xCDCDCDCDCDCDCDDCll};
+ constexpr uint64_t ulonglong_value {0xCDCDCDCDCDCDCDDCull};
  constexpr uint8_t ival {0xCD};
  constexpr uint8_t fval {0xDC};