diff options
author | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
---|---|---|
committer | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
commit | c7722a492017dbd8a5fb3bb216062eb62129daf5 (patch) | |
tree | 2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /tools/preproc/c_file.cpp | |
parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) |
fixing merge conflicts
Diffstat (limited to 'tools/preproc/c_file.cpp')
-rw-r--r-- | tools/preproc/c_file.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/preproc/c_file.cpp b/tools/preproc/c_file.cpp index 5bfdee086..24b3453e8 100644 --- a/tools/preproc/c_file.cpp +++ b/tools/preproc/c_file.cpp @@ -139,6 +139,7 @@ bool CFile::ConsumeNewline() { m_pos += 2; m_lineNum++; + std::putchar('\n'); return true; } @@ -146,6 +147,7 @@ bool CFile::ConsumeNewline() { m_pos++; m_lineNum++; + std::putchar('\n'); return true; } |