diff options
Diffstat (limited to 'fluid/io/Code_Writer.cxx')
| -rw-r--r-- | fluid/io/Code_Writer.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fluid/io/Code_Writer.cxx b/fluid/io/Code_Writer.cxx index 9460a6ac0..f451d187e 100644 --- a/fluid/io/Code_Writer.cxx +++ b/fluid/io/Code_Writer.cxx @@ -27,14 +27,12 @@ #include <zlib.h> -#include <string> #include <stdio.h> #include <stdlib.h> #include <string.h> using namespace fld; using namespace fld::io; -using namespace fld::proj; // ---- Fd_Id_Map implementation ---- @@ -915,9 +913,9 @@ Code_Writer::~Code_Writer() \param[in] type FD_TAG_GENERIC, FD_TAG_CODE, FD_TAG_MENU_CALLBACK, or FD_TAG_WIDGET_CALLBACK \param[in] uid the unique id of the current type */ -void Code_Writer::tag(proj::Mergeback::Tag prev_type, proj::Mergeback::Tag next_type, unsigned short uid) { +void Code_Writer::tag(Mergeback::Tag prev_type, Mergeback::Tag next_type, unsigned short uid) { if (proj_.write_mergeback_data) { - Mergeback::print_tag(code_file, prev_type, next_type, uid, (uint32_t)block_crc_); + ::Mergeback::print_tag(code_file, prev_type, next_type, uid, (uint32_t)block_crc_); } block_crc_ = crc32(0, 0, 0); } |