Skip to content

Commit 6cf4901

Browse files
tmontgomerytmontgomery
committed
[C++]: removed sbe specific typedefs from tests and examples.
1 parent 6806dfa commit 6cf4901

File tree

5 files changed

+174
-189
lines changed

5 files changed

+174
-189
lines changed

‎sbe-samples/src/main/cpp/OtfExample.cpp‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ class ExampleTokenListener
302302
}
303303
};
304304

305-
static const sbe_uint32_t SERIAL_NUMBER = 1234;
306-
static const sbe_uint16_t MODEL_YEAR = 2013;
305+
static const std::uint32_t SERIAL_NUMBER = 1234;
306+
static const std::uint16_t MODEL_YEAR = 2013;
307307
static const BooleanType::Value AVAILABLE = BooleanType::T;
308308
static const Model::Value CODE = Model::A;
309309
static const bool CRUISE_CONTROL = true;
@@ -323,31 +323,31 @@ static const size_t PERFORMANCE_FIGURES_COUNT = 2;
323323
static const size_t FUEL_FIGURES_COUNT = 3;
324324
static const size_t ACCELERATION_COUNT = 3;
325325

326-
static const sbe_uint16_t fuel1Speed = 30;
327-
static const sbe_float_t fuel1Mpg = 35.9f;
328-
static const sbe_uint16_t fuel2Speed = 55;
329-
static const sbe_float_t fuel2Mpg = 49.0f;
330-
static const sbe_uint16_t fuel3Speed = 75;
331-
static const sbe_float_t fuel3Mpg = 40.0f;
332-
333-
static const sbe_uint8_t perf1Octane = 95;
334-
static const sbe_uint16_t perf1aMph = 30;
335-
static const sbe_float_t perf1aSeconds = 4.0f;
336-
static const sbe_uint16_t perf1bMph = 60;
337-
static const sbe_float_t perf1bSeconds = 7.5f;
338-
static const sbe_uint16_t perf1cMph = 100;
339-
static const sbe_float_t perf1cSeconds = 12.2f;
340-
341-
static const sbe_uint8_t perf2Octane = 99;
342-
static const sbe_uint16_t perf2aMph = 30;
343-
static const sbe_float_t perf2aSeconds = 3.8f;
344-
static const sbe_uint16_t perf2bMph = 60;
345-
static const sbe_float_t perf2bSeconds = 7.1f;
346-
static const sbe_uint16_t perf2cMph = 100;
347-
static const sbe_float_t perf2cSeconds = 11.8f;
348-
349-
static const sbe_uint16_t engineCapacity = 2000;
350-
static const sbe_uint8_t engineNumCylinders = 4;
326+
static const std::uint16_t fuel1Speed = 30;
327+
static const float fuel1Mpg = 35.9f;
328+
static const std::uint16_t fuel2Speed = 55;
329+
static const float fuel2Mpg = 49.0f;
330+
static const std::uint16_t fuel3Speed = 75;
331+
static const float fuel3Mpg = 40.0f;
332+
333+
static const std::uint8_t perf1Octane = 95;
334+
static const std::uint16_t perf1aMph = 30;
335+
static const float perf1aSeconds = 4.0f;
336+
static const std::uint16_t perf1bMph = 60;
337+
static const float perf1bSeconds = 7.5f;
338+
static const std::uint16_t perf1cMph = 100;
339+
static const float perf1cSeconds = 12.2f;
340+
341+
static const std::uint8_t perf2Octane = 99;
342+
static const std::uint16_t perf2aMph = 30;
343+
static const float perf2aSeconds = 3.8f;
344+
static const std::uint16_t perf2bMph = 60;
345+
static const float perf2bSeconds = 7.1f;
346+
static const std::uint16_t perf2cMph = 100;
347+
static const float perf2cSeconds = 11.8f;
348+
349+
static const std::uint16_t engineCapacity = 2000;
350+
static const std::uint8_t engineNumCylinders = 4;
351351

352352
std::uint64_t encodeHdrAndCar(char *buffer, std::uint64_t length)
353353
{

‎sbe-tool/src/main/cpp/sbe/sbe.h‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,6 @@
2626
#include <cstdint>
2727
#include <limits>
2828

29-
/*
30-
* Types used by C++ codecs
31-
*/
32-
typedef char sbe_char_t;
33-
typedef std::int8_t sbe_int8_t;
34-
typedef std::int16_t sbe_int16_t;
35-
typedef std::int32_t sbe_int32_t;
36-
typedef std::int64_t sbe_int64_t;
37-
typedef std::uint8_t sbe_uint8_t;
38-
typedef std::uint16_t sbe_uint16_t;
39-
typedef std::uint32_t sbe_uint32_t;
40-
typedef std::uint64_t sbe_uint64_t;
41-
typedef float sbe_float_t;
42-
typedef double sbe_double_t;
43-
4429
namespace sbe {
4530

4631
/*

‎sbe-tool/src/test/cpp/CodeGenTest.cpp‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ using namespace code::generation::test;
2424

2525
static const std::size_t BUFFER_LEN = 2048;
2626

27-
static const sbe_uint32_t SERIAL_NUMBER = 1234;
28-
static const sbe_uint16_t MODEL_YEAR = 2013;
27+
static const std::uint32_t SERIAL_NUMBER = 1234;
28+
static const std::uint16_t MODEL_YEAR = 2013;
2929
static const BooleanType::Value AVAILABLE = BooleanType::T;
3030
static const Model::Value CODE = Model::A;
3131
static const bool CRUISE_CONTROL = true;
@@ -58,31 +58,31 @@ static const std::uint8_t ACCELERATION_COUNT = 3;
5858
static const std::uint64_t expectedHeaderSize = 8;
5959
static const std::uint64_t expectedCarSize = 191;
6060

61-
static const sbe_uint16_t fuel1Speed = 30;
62-
static const sbe_float_t fuel1Mpg = 35.9f;
63-
static const sbe_uint16_t fuel2Speed = 55;
64-
static const sbe_float_t fuel2Mpg = 49.0f;
65-
static const sbe_uint16_t fuel3Speed = 75;
66-
static const sbe_float_t fuel3Mpg = 40.0f;
67-
68-
static const sbe_uint8_t perf1Octane = 95;
69-
static const sbe_uint16_t perf1aMph = 30;
70-
static const sbe_float_t perf1aSeconds = 4.0f;
71-
static const sbe_uint16_t perf1bMph = 60;
72-
static const sbe_float_t perf1bSeconds = 7.5f;
73-
static const sbe_uint16_t perf1cMph = 100;
74-
static const sbe_float_t perf1cSeconds = 12.2f;
75-
76-
static const sbe_uint8_t perf2Octane = 99;
77-
static const sbe_uint16_t perf2aMph = 30;
78-
static const sbe_float_t perf2aSeconds = 3.8f;
79-
static const sbe_uint16_t perf2bMph = 60;
80-
static const sbe_float_t perf2bSeconds = 7.1f;
81-
static const sbe_uint16_t perf2cMph = 100;
82-
static const sbe_float_t perf2cSeconds = 11.8f;
83-
84-
static const sbe_uint16_t engineCapacity = 2000;
85-
static const sbe_uint8_t engineNumCylinders = 4;
61+
static const std::uint16_t fuel1Speed = 30;
62+
static const float fuel1Mpg = 35.9f;
63+
static const std::uint16_t fuel2Speed = 55;
64+
static const float fuel2Mpg = 49.0f;
65+
static const std::uint16_t fuel3Speed = 75;
66+
static const float fuel3Mpg = 40.0f;
67+
68+
static const std::uint8_t perf1Octane = 95;
69+
static const std::uint16_t perf1aMph = 30;
70+
static const float perf1aSeconds = 4.0f;
71+
static const std::uint16_t perf1bMph = 60;
72+
static const float perf1bSeconds = 7.5f;
73+
static const std::uint16_t perf1cMph = 100;
74+
static const float perf1cSeconds = 12.2f;
75+
76+
static const std::uint8_t perf2Octane = 99;
77+
static const std::uint16_t perf2aMph = 30;
78+
static const float perf2aSeconds = 3.8f;
79+
static const std::uint16_t perf2bMph = 60;
80+
static const float perf2bSeconds = 7.1f;
81+
static const std::uint16_t perf2cMph = 100;
82+
static const float perf2cSeconds = 11.8f;
83+
84+
static const std::uint16_t engineCapacity = 2000;
85+
static const std::uint8_t engineNumCylinders = 4;
8686

8787
class CodeGenTest : public testing::Test
8888
{

0 commit comments

Comments
 (0)