Skip to content

Commit 8180185

Browse files
committed
[C++ Wrapper] Fix forward definition of the Aeron class and reorder constructor arguments.
1 parent 0079777 commit 8180185

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

aeron-client/src/main/cpp_wrapper/Aeron.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ class Aeron
778778
aeron_counter_constants_t counter_constants = {};
779779
aeron_counter_constants(counter, &counter_constants);
780780
return std::make_shared<Counter>(
781-
counter, m_self.lock(), m_countersReader, counter_constants.registration_id);
781+
m_self.lock(), m_countersReader, counter, counter_constants.registration_id);
782782
}
783783
}
784784

aeron-client/src/main/cpp_wrapper/Counter.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919

2020
#include <cstdint>
2121
#include <memory>
22-
#include <atomic>
2322

24-
#include "util/Index.h"
2523
#include "concurrent/AtomicCounter.h"
2624
#include "concurrent/CountersReader.h"
2725

@@ -30,16 +28,17 @@ namespace aeron
3028

3129
using namespace aeron::concurrent;
3230

31+
class Aeron;
3332
class ClientConductor;
3433

3534
class Counter : public AtomicCounter
3635
{
3736
public:
3837
/// @cond HIDDEN_SYMBOLS
3938
Counter(
40-
aeron_counter_t *counter,
4139
const std::shared_ptr<Aeron> &aeronRef,
4240
CountersReader &reader,
41+
aeron_counter_t *counter,
4342
std::int64_t registrationId) :
4443
AtomicCounter(counter),
4544
m_aeronRef(aeronRef),

0 commit comments

Comments
 (0)