Permalink
Browse files

Revert "Base64Decoder drops 0x0d characters on windows"

This reverts commit 79549f8.
  • Loading branch information...
aleks-f committed Dec 21, 2012
1 parent a4e781f commit 9a67596f0057e75a6a0cdc5c3c4e93343d92b12f
@@ -211,11 +211,6 @@
#endif
-#if !defined(POCO_ARCH)
- #error "Unknown or Unsupported Hardware Architecture."
-#endif
-
-
#if defined(_MSC_VER)
#define POCO_COMPILER_MSVC
#elif defined(__clang__)
@@ -244,8 +239,11 @@
#define POCO_COMPILER_IBM_XLC // IBM XL C++
#elif defined (__IBMCPP__) && defined(__COMPILER_VER__)
#define POCO_COMPILER_IBM_XLC_ZOS // IBM z/OS C++
-#else
- #error "Unknown or Unsupported Compiler."
+#endif
+
+
+#if !defined(POCO_ARCH)
+ #error "Unknown Hardware Architecture."
#endif
@@ -171,9 +171,6 @@ Base32DecoderBuf* Base32DecoderIOS::rdbuf()
Base32Decoder::Base32Decoder(std::istream& istr): Base32DecoderIOS(istr), std::istream(&_buf)
{
-#ifdef POCO_OS_FAMILY_WINDOWS
- unsetf(std::ios_base::skipws);
-#endif
}
@@ -147,9 +147,6 @@ Base64DecoderBuf* Base64DecoderIOS::rdbuf()
Base64Decoder::Base64Decoder(std::istream& istr): Base64DecoderIOS(istr), std::istream(&_buf)
{
-#ifdef POCO_OS_FAMILY_WINDOWS
- unsetf(std::ios_base::skipws);
-#endif
}
@@ -37,8 +37,6 @@
#include "Poco/Base32Decoder.h"
#include "Poco/Exception.h"
#include <sstream>
-#include <iterator>
-#include <algorithm>
using Poco::Base32Encoder;
@@ -184,19 +182,6 @@ void Base32Test::testEncodeDecode()
}
-void Base32Test::testDecodeCR()
-{
- std::istringstream input("BU======");
- Poco::Base32Decoder decoder(input);
- std::vector<Poco::UInt8> result;
- typedef std::istream_iterator<Poco::UInt8> istream_iterator_type;
- istream_iterator_type eos;
- std::copy(istream_iterator_type(decoder), eos, std::back_inserter(result));
- assert(1 == result.size());
- assert(0x0d == result[0]);
-}
-
-
void Base32Test::setUp()
{
}
@@ -214,7 +199,6 @@ CppUnit::Test* Base32Test::suite()
CppUnit_addTest(pSuite, Base32Test, testEncoder);
CppUnit_addTest(pSuite, Base32Test, testDecoder);
CppUnit_addTest(pSuite, Base32Test, testEncodeDecode);
- CppUnit_addTest(pSuite, Base32Test, testDecodeCR);
return pSuite;
}
@@ -49,7 +49,6 @@ class Base32Test: public CppUnit::TestCase
void testEncoder();
void testDecoder();
void testEncodeDecode();
- void testDecodeCR();
void setUp();
void tearDown();
@@ -37,8 +37,6 @@
#include "Poco/Base64Decoder.h"
#include "Poco/Exception.h"
#include <sstream>
-#include <iterator>
-#include <algorithm>
using Poco::Base64Encoder;
@@ -179,19 +177,6 @@ void Base64Test::testEncodeDecode()
}
-void Base64Test::testDecodeCR()
-{
- std::istringstream input("DQ==");
- Poco::Base64Decoder decoder(input);
- std::vector<Poco::UInt8> result;
- typedef std::istream_iterator<Poco::UInt8> istream_iterator_type;
- istream_iterator_type eos;
- std::copy(istream_iterator_type(decoder), eos, std::back_inserter(result));
- assert(1 == result.size());
- assert(0x0d == result[0]);
-}
-
-
void Base64Test::setUp()
{
}
@@ -209,7 +194,6 @@ CppUnit::Test* Base64Test::suite()
CppUnit_addTest(pSuite, Base64Test, testEncoder);
CppUnit_addTest(pSuite, Base64Test, testDecoder);
CppUnit_addTest(pSuite, Base64Test, testEncodeDecode);
- CppUnit_addTest(pSuite, Base64Test, testDecodeCR);
return pSuite;
}
@@ -49,7 +49,6 @@ class Base64Test: public CppUnit::TestCase
void testEncoder();
void testDecoder();
void testEncodeDecode();
- void testDecodeCR();
void setUp();
void tearDown();

0 comments on commit 9a67596

Please sign in to comment.