diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-12-12 16:02:27 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-12-12 16:02:27 +0100 |
| commit | 37a525baec16f7caaa2252394041051c949f301d (patch) | |
| tree | d02343e8d3b24655b082b117d63879ff83e89e7f /TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp | |
| parent | 87e4cdb2c157eb359d394c40115e0e6a91c68920 (diff) | |
| parent | 7f58353152673a611a86843b1db6f9453675d087 (diff) | |
| download | ATCD-37a525baec16f7caaa2252394041051c949f301d.tar.gz | |
Fixed merge conflicts
Diffstat (limited to 'TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp')
| -rw-r--r-- | TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp b/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp index fb6095fd925..b3826ed29f9 100644 --- a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp +++ b/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp @@ -17,13 +17,13 @@ Stopwatch_display::Stopwatch_display (Widget &parent) 0); } -Stopwatch_display::~Stopwatch_display (void) +Stopwatch_display::~Stopwatch_display () { //No-op } void -Stopwatch_display::manage (void) +Stopwatch_display::manage () { XtManageChild (this->frame_); XtManageChild (this->label_); |