1 files changed, 6 insertions, 19 deletions
diff --git a/CPP/Common/StdInStream.cpp b/CPP/Common/StdInStream.cpp
index 442191e..0799c2c 100755..100644
--- a/CPP/Common/StdInStream.cpp
+++ b/CPP/Common/StdInStream.cpp
@@ -8,12 +8,6 @@
 #include "StringConvert.h"
 #include "UTFConvert.h"
 
-#ifdef _MSC_VER
-// "was declared deprecated" disabling
-#pragma warning(disable : 4996 )
-#endif
-
-static const char kIllegalChar = '\0';
 static const char kNewLineChar = '\n';
 
 static const char *kEOFMessage = "Unexpected end of input stream";
@@ -26,7 +20,7 @@ extern int g_CodePage;
 
 CStdInStream g_StdIn(stdin);
 
-bool CStdInStream::Open(LPCTSTR fileName)
+bool CStdInStream::Open(LPCTSTR fileName) throw()
 {
   Close();
   _stream = _tfopen(fileName, kFileOpenMode);
@@ -34,7 +28,7 @@ bool CStdInStream::Open(LPCTSTR fileName)
   return _streamIsOpen;
 }
 
-bool CStdInStream::Close()
+bool CStdInStream::Close() throw()
 {
   if (!_streamIsOpen)
     return true;
@@ -42,11 +36,6 @@ bool CStdInStream::Close()
   return !_streamIsOpen;
 }
 
-CStdInStream::~CStdInStream()
-{
-  Close();
-}
-
 AString CStdInStream::ScanStringUntilNewLine(bool allowEOF)
 {
   AString s;
@@ -59,8 +48,8 @@ AString CStdInStream::ScanStringUntilNewLine(bool allowEOF)
         break;
       throw kEOFMessage;
     }
-    char c = char(intChar);
-    if (c == kIllegalChar)
+    char c = (char)intChar;
+    if (c == 0)
       throw kIllegalCharMessage;
     if (c == kNewLineChar)
       break;
@@ -88,10 +77,10 @@ void CStdInStream::ReadToString(AString &resultString)
   resultString.Empty();
   int c;
   while ((c = GetChar()) != EOF)
-    resultString += char(c);
+    resultString += (char)c;
 }
 
-bool CStdInStream::Eof()
+bool CStdInStream::Eof() throw()
 {
   return (feof(_stream) != 0);
 }
@@ -103,5 +92,3 @@ int CStdInStream::GetChar()
     throw kReadErrorMessage;
   return c;
 }
-
-