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/FL_Cube/test_i.h | |
| parent | 87e4cdb2c157eb359d394c40115e0e6a91c68920 (diff) | |
| parent | 7f58353152673a611a86843b1db6f9453675d087 (diff) | |
| download | ATCD-37a525baec16f7caaa2252394041051c949f301d.tar.gz | |
Fixed merge conflicts
Diffstat (limited to 'TAO/tests/FL_Cube/test_i.h')
| -rw-r--r-- | TAO/tests/FL_Cube/test_i.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/TAO/tests/FL_Cube/test_i.h b/TAO/tests/FL_Cube/test_i.h index 8ae8098f7a6..62ea39f6dbc 100644 --- a/TAO/tests/FL_Cube/test_i.h +++ b/TAO/tests/FL_Cube/test_i.h @@ -28,9 +28,9 @@ public: private: /// from the Fl_Gl_Window... - virtual void draw (void); + virtual void draw (); - virtual void draw_cube (void); + virtual void draw_cube (); /// The angles... CORBA::Long x_angle_; @@ -60,7 +60,7 @@ public: // = The Simple_Server methods. void set_x_angle (CORBA::Long x); void set_y_angle (CORBA::Long y); - void shutdown (void); + void shutdown (); private: /// The ORB |