libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Fix AccessMode check

This commit is contained in:
Antidote 2013-01-27 18:54:30 -08:00
parent 7898fb6ef0
commit 5392d21653
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/TextStream.cpp
View File

@ -52,7 +52,7 @@ TextStream::TextStream(const std::string& filename, TextMode fileMode, AccessMod
void TextStream::save(const std::string& filename) void TextStream::save(const std::string& filename)
{ {
if (m_accessmode != WriteOnly || m_accessmode != ReadWrite) if (m_accessmode != WriteOnly && m_accessmode != ReadWrite)
throw InvalidOperationException("Stream not open for writing"); throw InvalidOperationException("Stream not open for writing");
if (filename != std::string()) if (filename != std::string())
m_filename = filename; m_filename = filename;
@ -84,7 +84,7 @@ void TextStream::save(const std::string& filename)
std::string TextStream::readLine() std::string TextStream::readLine()
{ {
if (m_accessmode != ReadOnly || m_accessmode != ReadWrite) if (m_accessmode != ReadOnly && m_accessmode != ReadWrite)
throw InvalidOperationException("Stream not open for reading"); throw InvalidOperationException("Stream not open for reading");
if (m_currentLine > m_lines.size()) if (m_currentLine > m_lines.size())
@ -96,7 +96,7 @@ std::string TextStream::readLine()
void TextStream::writeLine(const std::string& str) void TextStream::writeLine(const std::string& str)
{ {
if (m_accessmode != WriteOnly || m_accessmode != ReadWrite) if (m_accessmode != WriteOnly && m_accessmode != ReadWrite)
throw InvalidOperationException("Stream not open for writing"); throw InvalidOperationException("Stream not open for writing");
else if (m_currentLine > m_lines.size()) else if (m_currentLine > m_lines.size())
{ {
@ -110,7 +110,7 @@ void TextStream::writeLine(const std::string& str)
void TextStream::writeLines(std::vector<std::string> strings) void TextStream::writeLines(std::vector<std::string> strings)
{ {
if (m_accessmode != WriteOnly || m_accessmode != ReadWrite) if (m_accessmode != WriteOnly && m_accessmode != ReadWrite)
throw InvalidOperationException("Stream not open for writing"); throw InvalidOperationException("Stream not open for writing");
for (std::string s: strings) for (std::string s: strings)
@ -119,7 +119,7 @@ void TextStream::writeLines(std::vector<std::string> strings)
std::vector<std::string> TextStream::readLines(Uint32 numLines) std::vector<std::string> TextStream::readLines(Uint32 numLines)
{ {
if (m_accessmode != ReadOnly || m_accessmode != ReadWrite) if (m_accessmode != ReadOnly && m_accessmode != ReadWrite)
throw InvalidOperationException("Stream not open for reading"); throw InvalidOperationException("Stream not open for reading");
if (numLines > m_lines.size()) if (numLines > m_lines.size())
@ -136,7 +136,7 @@ std::vector<std::string> TextStream::readLines(Uint32 numLines)
std::string TextStream::readLineAt(Uint32 line) std::string TextStream::readLineAt(Uint32 line)
{ {
if (m_accessmode != ReadOnly || m_accessmode != ReadWrite) if (m_accessmode != ReadOnly && m_accessmode != ReadWrite)
throw InvalidOperationException("Stream not open for reading"); throw InvalidOperationException("Stream not open for reading");
if (line <= 0) if (line <= 0)
throw InvalidOperationException("A line cannot be zero indexed"); throw InvalidOperationException("A line cannot be zero indexed");
@ -148,7 +148,7 @@ std::string TextStream::readLineAt(Uint32 line)
void TextStream::writeLineAt(Uint32 line, const std::string& str) void TextStream::writeLineAt(Uint32 line, const std::string& str)
{ {
if (m_accessmode != WriteOnly || m_accessmode != ReadWrite) if (m_accessmode != WriteOnly && m_accessmode != ReadWrite)
throw InvalidOperationException("Stream not open for reading"); throw InvalidOperationException("Stream not open for reading");
if (line <= 0) if (line <= 0)
throw InvalidOperationException("A line cannot be zero indexed"); throw InvalidOperationException("A line cannot be zero indexed");
@ -159,7 +159,7 @@ void TextStream::writeLineAt(Uint32 line, const std::string& str)
std::vector<std::string> TextStream::readAllLines() std::vector<std::string> TextStream::readAllLines()
{ {
if (m_accessmode != ReadOnly || m_accessmode != ReadWrite) if (m_accessmode != ReadOnly && m_accessmode != ReadWrite)
throw InvalidOperationException("Stream not open for reading"); throw InvalidOperationException("Stream not open for reading");
return m_lines; return m_lines;