generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-19 04:26:55 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #983 from kimgr/clang-wswitch

Browse Source 
Fix #928: Workaround to fix -Wswitch warning
This commit is contained in:
Günter Obiltschnig 2015-10-13 22:21:49 +02:00
commit c61debd881
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Foundation/include/Poco/MemoryStream.h
View File

@ -20,6 +20,7 @@
#define Foundation_MemoryStream_INCLUDED #define Foundation_MemoryStream_INCLUDED
#include "Poco/Bugcheck.h"
#include "Poco/Foundation.h" #include "Poco/Foundation.h"
#include "Poco/StreamUtil.h" #include "Poco/StreamUtil.h"
#include <streambuf> #include <streambuf>
@ -84,20 +85,24 @@ public:
if (this->gptr() == 0) if (this->gptr() == 0)
return fail; return fail;
switch (way) if (way == std::ios_base::beg)
{ {
case std::ios_base::beg:
newoff = 0; newoff = 0;
break; }
case std::ios_base::cur: else if (way == std::ios_base::cur)
{
// cur is not valid if both in and out are specified (Condition 3) // cur is not valid if both in and out are specified (Condition 3)
if ((which & std::ios_base::out) != 0) if ((which & std::ios_base::out) != 0)
return fail; return fail;
newoff = this->gptr() - this->eback(); newoff = this->gptr() - this->eback();
break; }
case std::ios_base::end: else if (way == std::ios_base::end)
{
newoff = this->egptr() - this->eback(); newoff = this->egptr() - this->eback();
break; }
else
{
poco_bugcheck();
} }
if ((newoff + off) < 0 || (this->egptr() - this->eback()) < (newoff + off)) if ((newoff + off) < 0 || (this->egptr() - this->eback()) < (newoff + off))
@ -110,20 +115,24 @@ public:
if (this->pptr() == 0) if (this->pptr() == 0)
return fail; return fail;
switch (way) if (way == std::ios_base::beg)
{ {
case std::ios_base::beg:
newoff = 0; newoff = 0;
break; }
case std::ios_base::cur: else if (way == std::ios_base::cur)
{
// cur is not valid if both in and out are specified (Condition 3) // cur is not valid if both in and out are specified (Condition 3)
if ((which & std::ios_base::in) != 0) if ((which & std::ios_base::in) != 0)
return fail; return fail;
newoff = this->pptr() - this->pbase(); newoff = this->pptr() - this->pbase();
break; }
case std::ios_base::end: else if (way == std::ios_base::end)
{
newoff = this->epptr() - this->pbase(); newoff = this->epptr() - this->pbase();
break; }
else
{
poco_bugcheck();
} }
if (newoff + off < 0 || (this->epptr() - this->pbase()) < newoff + off) if (newoff + off < 0 || (this->epptr() - this->pbase()) < newoff + off)