tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use Windows line feeds in generated files on Windows.

Browse Source 
GitOrigin-RevId: 53010ee7d1a3b88bedc3c0a5fd6914d31bb33c09
This commit is contained in:
levlam 2018-09-01 17:00:28 +03:00
parent 91365f20b5
commit 642f5ed81a
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
td/generate/tl_json_converter.cpp
View File

@ -209,7 +209,17 @@ void gen_json_converter_file(const tl::simple::Schema &schema, const std::string
CHECK(!sb.is_error());
buf.resize(sb.as_cslice().size());
#if TD_WINDOWS
string new_file_content;
for (auto c : buf) {
if (c == '\n') {
new_file_content += '\r';
}
new_file_content += c;
}
#else
auto new_file_content = std::move(buf);
#endif
if (new_file_content != old_file_content.as_slice()) {
write_file(file_name, new_file_content).ensure();
}

13
tdtl/td/tl/tl_string_outputer.cpp
View File

@ -13,8 +13,19 @@ void tl_string_outputer::append(const std::string &str) {
result += str;
}
const std::string &tl_string_outputer::get_result() const {
std::string tl_string_outputer::get_result() const {
#if defined(_WIN32)
std::string fixed_result;
for (std::size_t i = 0; i < result.size(); i++) {
if (result[i] == '\n') {
fixed_result += '\r';
}
fixed_result += result[i];
}
return fixed_result;
#else
return result;
#endif
}
} // namespace tl

2
tdtl/td/tl/tl_string_outputer.h
View File

@ -19,7 +19,7 @@ class tl_string_outputer : public tl_outputer {
public:
virtual void append(const std::string &str);
const std::string &get_result() const;
std::string get_result() const;
};
} // namespace tl