mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: remove __cplusplus ifdefs

Browse source 
Since all source files are now C++, this is redundant.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-04 17:55:50 +02:00 • committed by bstoeger
parent 9065bf8622
commit 03b910ee7f
55 changed files with 37 additions and 347 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/equipment.h
View file

@ -4,9 +4,11 @@
#include "gas.h"
#ifdef __cplusplus
#include <memory>
#include <string>
#include <vector>
extern "C" {
#endif
struct dive;
@ -107,13 +109,8 @@ extern void add_cylinder(struct cylinder_table *, int idx, cylinder_t cyl);
void get_gas_string(struct gasmix gasmix, char *text, int len);
const char *gasname(struct gasmix gasmix);
#ifdef __cplusplus
}
#include <memory>
#include <string>
#include <vector>
struct ws_info {
std::string name;
weight_t weight;
@ -135,6 +132,4 @@ extern std::pair<volume_t, pressure_t> get_tank_info_data(const std::vector<tank
extern void add_cylinder_description(const cylinder_type_t &);
extern void reset_tank_info_table(std::vector<tank_info> &table);
#endif
#endif // EQUIPMENT_H