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

nayuki · nayuki · commit fde135793549 · 2023-01-22T23:36:49.000Z
diff --git a/cpp/AdaptiveArithmeticCompress.cpp b/cpp/AdaptiveArithmeticCompress.cpp
@@ -18,6 +18,7 @@
 #include <fstream>
 #include <iostream>
 #include <stdexcept>
+#include <string>
 #include "ArithmeticCoder.hpp"
 #include "BitIoStream.hpp"
 #include "FrequencyTable.hpp"
@@ -45,7 +46,7 @@ int main(int argc, char *argv[]) {
 		while (true) {
 			// Read and encode one byte
 			int symbol = in.get();
-			if (symbol == EOF)
+			if (symbol == std::char_traits<char>::eof())
 				break;
 			if (!(0 <= symbol && symbol <= 255))
 				throw std::logic_error("Assertion error");
diff --git a/cpp/ArithmeticCompress.cpp b/cpp/ArithmeticCompress.cpp
@@ -17,6 +17,7 @@
 #include <fstream>
 #include <iostream>
 #include <stdexcept>
+#include <string>
 #include <vector>
 #include "ArithmeticCoder.hpp"
 #include "BitIoStream.hpp"
@@ -40,7 +41,7 @@ int main(int argc, char *argv[]) {
 	freqs.increment(256);  // EOF symbol gets a frequency of 1
 	while (true) {
 		int b = in.get();
-		if (b == EOF)
+		if (b == std::char_traits<char>::eof())
 			break;
 		if (b < 0 || b > 255)
 			throw std::logic_error("Assertion error");
@@ -65,7 +66,7 @@ int main(int argc, char *argv[]) {
 		while (true) {
 			// Read and encode one byte
 			int symbol = in.get();
-			if (symbol == EOF)
+			if (symbol == std::char_traits<char>::eof())
 				break;
 			if (!(0 <= symbol && symbol <= 255))
 				throw std::logic_error("Assertion error");
diff --git a/cpp/BitIoStream.cpp b/cpp/BitIoStream.cpp
@@ -8,6 +8,7 @@
 
 #include <limits>
 #include <stdexcept>
+#include <string>
 #include "BitIoStream.hpp"
 
 
@@ -18,11 +19,11 @@ BitInputStream::BitInputStream(std::istream &in) :
 	
 	
 int BitInputStream::read() {
-	if (currentByte == EOF)
+	if (currentByte == std::char_traits<char>::eof())
 		return -1;
 	if (numBitsRemaining == 0) {
 		currentByte = input.get();  // Note: istream.get() returns int, not char
-		if (currentByte == EOF)
+		if (currentByte == std::char_traits<char>::eof())
 			return -1;
 		if (!(0 <= currentByte && currentByte <= 255))
 			throw std::logic_error("Assertion error");
diff --git a/cpp/PpmCompress.cpp b/cpp/PpmCompress.cpp
@@ -17,6 +17,7 @@
 #include <fstream>
 #include <iostream>
 #include <stdexcept>
+#include <string>
 #include <vector>
 #include "ArithmeticCoder.hpp"
 #include "BitIoStream.hpp"
@@ -69,7 +70,7 @@ static void compress(std::ifstream &in, BitOutputStream &out) {
 	while (true) {
 		// Read and encode one byte
 		int symbol = in.get();
-		if (symbol == EOF)
+		if (symbol == std::char_traits<char>::eof())
 			break;
 		if (!(0 <= symbol && symbol <= 255))
 			throw std::logic_error("Assertion error");
