mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
core: remove __cplusplus ifdefs
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:
parent
9065bf8622
commit
03b910ee7f
55 changed files with 37 additions and 347 deletions
|
@ -12,6 +12,7 @@
|
|||
|
||||
#include <memory>
|
||||
#include <sqlite3.h>
|
||||
#include <string>
|
||||
#include <time.h>
|
||||
|
||||
struct xml_params;
|
||||
|
@ -22,11 +23,8 @@ typedef union {
|
|||
char allocation[sizeof(struct event) + MAX_EVENT_NAME];
|
||||
} event_allocation_t;
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
/*
|
||||
* Dive info as it is being built up..
|
||||
* C++-only so we can use std::string
|
||||
*/
|
||||
|
||||
struct parser_settings {
|
||||
|
@ -145,7 +143,6 @@ void utf8_string_std(const char *buffer, std::string *res);
|
|||
void add_dive_site(const char *ds_name, struct dive *dive, struct parser_state *state);
|
||||
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
int trimspace(char *buffer);
|
||||
void start_match(const char *type, const char *name, char *buffer);
|
||||
|
@ -164,10 +161,7 @@ int parse_shearwater_cloud_buffer(sqlite3 *handle, const char *url, const char *
|
|||
int parse_cobalt_buffer(sqlite3 *handle, const char *url, const char *buf, int size, struct divelog *log);
|
||||
int parse_divinglog_buffer(sqlite3 *handle, const char *url, const char *buf, int size, struct divelog *log);
|
||||
int parse_dlf_buffer(unsigned char *buffer, size_t size, struct divelog *log);
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#include <string>
|
||||
std::string trimspace(const char *buffer);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue