diff options
| author | Matthias Melcher <github@matthiasm.com> | 2025-04-15 14:47:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-15 14:47:24 +0200 |
| commit | fc91880faf7968432710e439e77ef067759d16fc (patch) | |
| tree | f941b5ebbc70e8380775098a225001c2379b6e0f /fluid/io/Code_Writer.h | |
| parent | 63db80c07888e5f4dcaff3579a0d174b7df5424d (diff) | |
Reactivating Mergeback functionality. (#1226)
Reactivated code.
Various fixes.
New documentation.
Diffstat (limited to 'fluid/io/Code_Writer.h')
| -rw-r--r-- | fluid/io/Code_Writer.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fluid/io/Code_Writer.h b/fluid/io/Code_Writer.h index ca23ca0a2..c199197ec 100644 --- a/fluid/io/Code_Writer.h +++ b/fluid/io/Code_Writer.h @@ -17,6 +17,8 @@ #ifndef FLUID_IO_CODE_WRITER_H #define FLUID_IO_CODE_WRITER_H +#include "proj/mergeback.h" + #include <FL/fl_attr.h> #include <stdarg.h> @@ -114,7 +116,7 @@ public: int write_code(const char *cfile, const char *hfile, bool to_codeview=false); void write_public(int state); // writes pubic:/private: as needed - void tag(int type, unsigned short uid); + void tag(proj::Mergeback::Tag prev_type, proj::Mergeback::Tag next_type, unsigned short uid); static unsigned long block_crc(const void *data, int n=-1, unsigned long in_crc=0, bool *inout_line_start=nullptr); }; |