Skip to content

Commit 5d375f1

Browse files
authored
Merge pull request #1034 from Nobu19800/bugs/outportconsumerlog
OutPortConsumerのrtclogを派生クラスに移動させる
2 parents bcf0b51 + 5c68d82 commit 5d375f1

File tree

4 files changed

+29
-9
lines changed

4 files changed

+29
-9
lines changed

src/ext/transport/SSMTransport/SSMInPort.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,16 @@ namespace RTC
260260
*/
261261
void unsubscribeInterface(const SDOPackage::NVList& properties) override;
262262

263+
protected:
264+
/*!
265+
* @if jp
266+
* @brief ロガーストリーム
267+
* @else
268+
* @brief Logger stream
269+
* @endif
270+
*/
271+
mutable Logger rtclog;
272+
263273
private:
264274
/*!
265275
* @if jp

src/lib/rtm/OutPortConsumer.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -359,14 +359,6 @@ namespace RTC
359359
virtual void unsubscribeInterface(const SDOPackage::NVList& properties) = 0;
360360

361361
protected:
362-
/*!
363-
* @if jp
364-
* @brief ロガーストリーム
365-
* @else
366-
* @brief Logger stream
367-
* @endif
368-
*/
369-
mutable Logger rtclog;
370362

371363
/*!
372364
* @if jp

src/lib/rtm/OutPortCorbaCdrConsumer.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,15 @@ namespace RTC
256256
* @endif
257257
*/
258258
void unsubscribeInterface(const SDOPackage::NVList& properties) override;
259-
259+
protected:
260+
/*!
261+
* @if jp
262+
* @brief ロガーストリーム
263+
* @else
264+
* @brief Logger stream
265+
* @endif
266+
*/
267+
mutable Logger rtclog;
260268
private:
261269
/*!
262270
* @if jp

src/lib/rtm/OutPortDSConsumer.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,16 @@ namespace RTC
255255
*/
256256
void unsubscribeInterface(const SDOPackage::NVList& properties) override;
257257

258+
protected:
259+
/*!
260+
* @if jp
261+
* @brief ロガーストリーム
262+
* @else
263+
* @brief Logger stream
264+
* @endif
265+
*/
266+
mutable Logger rtclog;
267+
258268
private:
259269
/*!
260270
* @if jp

0 commit comments

Comments
 (0)