eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 00:49:19 +02:00
Code Issues 121 Wiki Activity

Resolve conflict

Browse Source
This commit is contained in:
Christopher Kwiatkowski
2026-05-04 11:47:38 +02:00
committed by GitHub
parent d75301f3c7
commit 112c714f79
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utilities/parser.cpp
View File

@@ -229,12 +229,8 @@ std::string cParser::readTokenFromStream(bool ToLower, const char *Break)
while (token.empty() && mStream->peek() != EOF) {
<<<<<<< HEAD
while (mStream->peek() != EOF) { // idk why but with mStream->get(c) not all cars are loaded
c = static_cast<char>(mStream->get());
=======
while (mStream->get(c)) {
>>>>>>> parent of 3a42a8c1 (Revert "Reduce string creations and deletions")
if (c == '\n') {
++mLine;
}