Commit fde1357

committed

Changed the C EOF constant to the C++ EOF constant function.

1 parent 7a93396 commit fde1357Copy full SHA for fde1357

File tree

+10

-6

lines changed

+10

-6

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`#include <fstream>`
`19`	`19`	`#include <iostream>`
`20`	`20`	`#include <stdexcept>`
	`21`	`+#include <string>`
`21`	`22`	`#include "ArithmeticCoder.hpp"`
`22`	`23`	`#include "BitIoStream.hpp"`
`23`	`24`	`#include "FrequencyTable.hpp"`
`@@ -45,7 +46,7 @@ int main(int argc, char *argv[]) {`
`45`	`46`	`while (true) {`
`46`	`47`	`// Read and encode one byte`
`47`	`48`	`int symbol = in.get();`
`48`		`- if (symbol == EOF)`
	`49`	`+ if (symbol == std::char_traits<char>::eof())`
`49`	`50`	`break;`
`50`	`51`	`if (!(0 <= symbol && symbol <= 255))`
`51`	`52`	`throw std::logic_error("Assertion error");`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`#include <fstream>`
`18`	`18`	`#include <iostream>`
`19`	`19`	`#include <stdexcept>`
	`20`	`+#include <string>`
`20`	`21`	`#include <vector>`
`21`	`22`	`#include "ArithmeticCoder.hpp"`
`22`	`23`	`#include "BitIoStream.hpp"`
`@@ -40,7 +41,7 @@ int main(int argc, char *argv[]) {`
`40`	`41`	`freqs.increment(256); // EOF symbol gets a frequency of 1`
`41`	`42`	`while (true) {`
`42`	`43`	`int b = in.get();`
`43`		`- if (b == EOF)`
	`44`	`+ if (b == std::char_traits<char>::eof())`
`44`	`45`	`break;`
`45`	`46`	`if (b < 0 \|\| b > 255)`
`46`	`47`	`throw std::logic_error("Assertion error");`
`@@ -65,7 +66,7 @@ int main(int argc, char *argv[]) {`
`65`	`66`	`while (true) {`
`66`	`67`	`// Read and encode one byte`
`67`	`68`	`int symbol = in.get();`
`68`		`- if (symbol == EOF)`
	`69`	`+ if (symbol == std::char_traits<char>::eof())`
`69`	`70`	`break;`
`70`	`71`	`if (!(0 <= symbol && symbol <= 255))`
`71`	`72`	`throw std::logic_error("Assertion error");`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`
`9`	`9`	`#include <limits>`
`10`	`10`	`#include <stdexcept>`
	`11`	`+#include <string>`
`11`	`12`	`#include "BitIoStream.hpp"`
`12`	`13`
`13`	`14`
`@@ -18,11 +19,11 @@ BitInputStream::BitInputStream(std::istream &in) :`
`18`	`19`
`19`	`20`
`20`	`21`	`int BitInputStream::read() {`
`21`		`- if (currentByte == EOF)`
	`22`	`+ if (currentByte == std::char_traits<char>::eof())`
`22`	`23`	`return -1;`
`23`	`24`	`if (numBitsRemaining == 0) {`
`24`	`25`	`currentByte = input.get(); // Note: istream.get() returns int, not char`
`25`		`- if (currentByte == EOF)`
	`26`	`+ if (currentByte == std::char_traits<char>::eof())`
`26`	`27`	`return -1;`
`27`	`28`	`if (!(0 <= currentByte && currentByte <= 255))`
`28`	`29`	`throw std::logic_error("Assertion error");`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`#include <fstream>`
`18`	`18`	`#include <iostream>`
`19`	`19`	`#include <stdexcept>`
	`20`	`+#include <string>`
`20`	`21`	`#include <vector>`
`21`	`22`	`#include "ArithmeticCoder.hpp"`
`22`	`23`	`#include "BitIoStream.hpp"`
`@@ -69,7 +70,7 @@ static void compress(std::ifstream &in, BitOutputStream &out) {`
`69`	`70`	`while (true) {`
`70`	`71`	`// Read and encode one byte`
`71`	`72`	`int symbol = in.get();`
`72`		`- if (symbol == EOF)`
	`73`	`+ if (symbol == std::char_traits<char>::eof())`
`73`	`74`	`break;`
`74`	`75`	`if (!(0 <= symbol && symbol <= 255))`
`75`	`76`	`throw std::logic_error("Assertion error");`

Comments

(0)