Permalink
Browse files

Merge remote-tracking branch 'origin/Base32Encoding' into develop

  • Loading branch information...
2 parents 37f74f9 + 0db2b8d commit 08ae9aee184bc923a9afbd90c45a4b84d1eb4976 @aleks-f aleks-f committed Nov 16, 2012
Showing with 1,146 additions and 3 deletions.
  1. +16 −0 Foundation/Foundation_CE_vs90.vcproj
  2. +4 −0 Foundation/Foundation_vs100.vcxproj
  3. +12 −0 Foundation/Foundation_vs100.vcxproj.filters
  4. +4 −0 Foundation/Foundation_vs110.vcxproj
  5. +12 −0 Foundation/Foundation_vs110.vcxproj.filters
  6. +12 −0 Foundation/Foundation_vs71.vcproj
  7. +16 −0 Foundation/Foundation_vs80.vcproj
  8. +16 −0 Foundation/Foundation_vs90.vcproj
  9. +4 −0 Foundation/Foundation_x64_vs100.vcxproj
  10. +12 −0 Foundation/Foundation_x64_vs100.vcxproj.filters
  11. +4 −0 Foundation/Foundation_x64_vs110.vcxproj
  12. +12 −0 Foundation/Foundation_x64_vs110.vcxproj.filters
  13. +16 −0 Foundation/Foundation_x64_vs90.vcproj
  14. +2 −1 Foundation/Makefile
  15. +126 −0 Foundation/include/Poco/Base32Decoder.h
  16. +132 −0 Foundation/include/Poco/Base32Encoder.h
  17. +182 −0 Foundation/src/Base32Decoder.cpp
  18. +224 −0 Foundation/src/Base32Encoder.cpp
  19. +2 −2 Foundation/testsuite/Makefile-Driver
  20. +8 −0 Foundation/testsuite/TestSuite_CE_vs90.vcproj
  21. +2 −0 Foundation/testsuite/TestSuite_vs100.vcxproj
  22. +6 −0 Foundation/testsuite/TestSuite_vs100.vcxproj.filters
  23. +2 −0 Foundation/testsuite/TestSuite_vs110.vcxproj
  24. +6 −0 Foundation/testsuite/TestSuite_vs110.vcxproj.filters
  25. +6 −0 Foundation/testsuite/TestSuite_vs71.vcproj
  26. +8 −0 Foundation/testsuite/TestSuite_vs80.vcproj
  27. +8 −0 Foundation/testsuite/TestSuite_vs90.vcproj
  28. +2 −0 Foundation/testsuite/TestSuite_x64_vs100.vcxproj
  29. +6 −0 Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters
  30. +2 −0 Foundation/testsuite/TestSuite_x64_vs110.vcxproj
  31. +6 −0 Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters
  32. +8 −0 Foundation/testsuite/TestSuite_x64_vs90.vcproj
  33. +204 −0 Foundation/testsuite/src/Base32Test.cpp
  34. +62 −0 Foundation/testsuite/src/Base32Test.h
  35. +2 −0 Foundation/testsuite/src/StreamsTestSuite.cpp
@@ -554,6 +554,14 @@
Name="Source Files"
>
<File
+ RelativePath=".\src\Base32Decoder.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Base32Encoder.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\Base64Decoder.cpp"
>
</File>
@@ -734,6 +742,14 @@
Name="Header Files"
>
<File
+ RelativePath=".\include\Poco\Base32Decoder.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Poco\Base32Encoder.h"
+ >
+ </File>
+ <File
RelativePath=".\include\Poco\Base64Decoder.h"
>
</File>
@@ -290,6 +290,8 @@
<ItemGroup>
<ClCompile Include="src\Ascii.cpp" />
<ClCompile Include="src\AtomicCounter.cpp" />
+ <ClCompile Include="src\Base32Decoder.cpp" />
+ <ClCompile Include="src\Base32Encoder.cpp" />
<ClCompile Include="src\Bugcheck.cpp" />
<ClCompile Include="src\ByteOrder.cpp" />
<ClCompile Include="src\Checksum.cpp" />
@@ -977,6 +979,8 @@
<ClInclude Include="include\Poco\AtomicCounter.h" />
<ClInclude Include="include\Poco\AutoPtr.h" />
<ClInclude Include="include\Poco\AutoReleasePool.h" />
+ <ClInclude Include="include\Poco\Base32Decoder.h" />
+ <ClInclude Include="include\Poco\Base32Encoder.h" />
<ClInclude Include="include\Poco\Buffer.h" />
<ClInclude Include="include\Poco\Bugcheck.h" />
<ClInclude Include="include\Poco\ByteOrder.h" />
@@ -888,6 +888,12 @@
<ClCompile Include="src\Error.cpp">
<Filter>Core\Source Files</Filter>
</ClCompile>
+ <ClCompile Include="src\Base32Decoder.cpp">
+ <Filter>Streams\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="src\Base32Encoder.cpp">
+ <Filter>Streams\Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="include\Poco\Any.h">
@@ -1838,6 +1844,12 @@
<ClInclude Include="include\Poco\Error.h">
<Filter>Core\Header Files</Filter>
</ClInclude>
+ <ClInclude Include="include\Poco\Base32Decoder.h">
+ <Filter>Streams\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="include\Poco\Base32Encoder.h">
+ <Filter>Streams\Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="src\pocomsg.rc">
@@ -390,6 +390,8 @@
<ClCompile Include="src\Var.cpp" />
<ClCompile Include="src\VarHolder.cpp" />
<ClCompile Include="src\Void.cpp" />
+ <ClCompile Include="src\Base32Decoder.cpp" />
+ <ClCompile Include="src\Base32Encoder.cpp" />
<ClCompile Include="src\Base64Decoder.cpp" />
<ClCompile Include="src\Base64Encoder.cpp" />
<ClCompile Include="src\BinaryReader.cpp" />
@@ -1041,6 +1043,8 @@
<ClInclude Include="include\Poco\UTFString.h" />
<ClInclude Include="include\Poco\Version.h" />
<ClInclude Include="include\Poco\Void.h" />
+ <ClInclude Include="include\Poco\Base32Decoder.h" />
+ <ClInclude Include="include\Poco\Base32Encoder.h" />
<ClInclude Include="include\Poco\Base64Decoder.h" />
<ClInclude Include="include\Poco\Base64Encoder.h" />
<ClInclude Include="include\Poco\BinaryReader.h" />
@@ -270,6 +270,12 @@
<ClCompile Include="src\Void.cpp">
<Filter>Core\Source Files</Filter>
</ClCompile>
+ <ClCompile Include="src\Base32Decoder.cpp">
+ <Filter>Streams\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="src\Base32Encoder.cpp">
+ <Filter>Streams\Source Files</Filter>
+ </ClCompile>
<ClCompile Include="src\Base64Decoder.cpp">
<Filter>Streams\Source Files</Filter>
</ClCompile>
@@ -1046,6 +1052,12 @@
<ClInclude Include="include\Poco\Void.h">
<Filter>Core\Header Files</Filter>
</ClInclude>
+ <ClInclude Include="include\Poco\Base32Decoder.h">
+ <Filter>Streams\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="include\Poco\Base32Encoder.h">
+ <Filter>Streams\Header Files</Filter>
+ </ClInclude>
<ClInclude Include="include\Poco\Base64Decoder.h">
<Filter>Streams\Header Files</Filter>
</ClInclude>
@@ -952,6 +952,12 @@
Name="Source Files"
Filter="">
<File
+ RelativePath=".\src\Base32Decoder.cpp">
+ </File>
+ <File
+ RelativePath=".\src\Base32Encoder.cpp">
+ </File>
+ <File
RelativePath=".\src\Base64Decoder.cpp">
</File>
<File
@@ -1085,6 +1091,12 @@
Name="Header Files"
Filter="">
<File
+ RelativePath=".\include\Poco\Base32Decoder.h">
+ </File>
+ <File
+ RelativePath=".\include\Poco\Base32Encoder.h">
+ </File>
+ <File
RelativePath=".\include\Poco\Base64Decoder.h">
</File>
<File
@@ -1268,6 +1268,14 @@
Name="Source Files"
>
<File
+ RelativePath=".\src\Base32Decoder.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Base32Encoder.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\Base64Decoder.cpp"
>
</File>
@@ -1448,6 +1456,14 @@
Name="Header Files"
>
<File
+ RelativePath=".\include\Poco\Base32Decoder.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Poco\Base32Encoder.h"
+ >
+ </File>
+ <File
RelativePath=".\include\Poco\Base64Decoder.h"
>
</File>
@@ -1265,6 +1265,14 @@
Name="Source Files"
>
<File
+ RelativePath=".\src\Base32Decoder.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Base32Encoder.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\Base64Decoder.cpp"
>
</File>
@@ -1445,6 +1453,14 @@
Name="Header Files"
>
<File
+ RelativePath=".\include\Poco\Base32Decoder.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Poco\Base32Encoder.h"
+ >
+ </File>
+ <File
RelativePath=".\include\Poco\Base64Decoder.h"
>
</File>
@@ -390,6 +390,8 @@
<ClCompile Include="src\Var.cpp" />
<ClCompile Include="src\VarHolder.cpp" />
<ClCompile Include="src\Void.cpp" />
+ <ClCompile Include="src\Base32Decoder.cpp" />
+ <ClCompile Include="src\Base32Encoder.cpp" />
<ClCompile Include="src\Base64Decoder.cpp" />
<ClCompile Include="src\Base64Encoder.cpp" />
<ClCompile Include="src\BinaryReader.cpp" />
@@ -1038,6 +1040,8 @@
<ClInclude Include="include\Poco\UTF32Encoding.h" />
<ClInclude Include="include\Poco\Version.h" />
<ClInclude Include="include\Poco\Void.h" />
+ <ClInclude Include="include\Poco\Base32Decoder.h" />
+ <ClInclude Include="include\Poco\Base32Encoder.h" />
<ClInclude Include="include\Poco\Base64Decoder.h" />
<ClInclude Include="include\Poco\Base64Encoder.h" />
<ClInclude Include="include\Poco\BinaryReader.h" />
@@ -270,6 +270,12 @@
<ClCompile Include="src\Void.cpp">
<Filter>Core\Source Files</Filter>
</ClCompile>
+ <ClCompile Include="src\Base32Decoder.cpp">
+ <Filter>Streams\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="src\Base32Encoder.cpp">
+ <Filter>Streams\Source Files</Filter>
+ </ClCompile>
<ClCompile Include="src\Base64Decoder.cpp">
<Filter>Streams\Source Files</Filter>
</ClCompile>
@@ -1046,6 +1052,12 @@
<ClInclude Include="include\Poco\Void.h">
<Filter>Core\Header Files</Filter>
</ClInclude>
+ <ClInclude Include="include\Poco\Base32Decoder.h">
+ <Filter>Streams\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="include\Poco\Base32Encoder.h">
+ <Filter>Streams\Header Files</Filter>
+ </ClInclude>
<ClInclude Include="include\Poco\Base64Decoder.h">
<Filter>Streams\Header Files</Filter>
</ClInclude>
@@ -396,6 +396,8 @@
<ClCompile Include="src\Var.cpp" />
<ClCompile Include="src\VarHolder.cpp" />
<ClCompile Include="src\Void.cpp" />
+ <ClCompile Include="src\Base32Decoder.cpp" />
+ <ClCompile Include="src\Base32Encoder.cpp" />
<ClCompile Include="src\Base64Decoder.cpp" />
<ClCompile Include="src\Base64Encoder.cpp" />
<ClCompile Include="src\BinaryReader.cpp" />
@@ -1044,6 +1046,8 @@
<ClInclude Include="include\Poco\UTF32Encoding.h" />
<ClInclude Include="include\Poco\Version.h" />
<ClInclude Include="include\Poco\Void.h" />
+ <ClInclude Include="include\Poco\Base32Decoder.h" />
+ <ClInclude Include="include\Poco\Base32Encoder.h" />
<ClInclude Include="include\Poco\Base64Decoder.h" />
<ClInclude Include="include\Poco\Base64Encoder.h" />
<ClInclude Include="include\Poco\BinaryReader.h" />
@@ -270,6 +270,12 @@
<ClCompile Include="src\Void.cpp">
<Filter>Core\Source Files</Filter>
</ClCompile>
+ <ClCompile Include="src\Base32Decoder.cpp">
+ <Filter>Streams\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="src\Base32Encoder.cpp">
+ <Filter>Streams\Source Files</Filter>
+ </ClCompile>
<ClCompile Include="src\Base64Decoder.cpp">
<Filter>Streams\Source Files</Filter>
</ClCompile>
@@ -1046,6 +1052,12 @@
<ClInclude Include="include\Poco\Void.h">
<Filter>Core\Header Files</Filter>
</ClInclude>
+ <ClInclude Include="include\Poco\Base32Decoder.h">
+ <Filter>Streams\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="include\Poco\Base32Encoder.h">
+ <Filter>Streams\Header Files</Filter>
+ </ClInclude>
<ClInclude Include="include\Poco\Base64Decoder.h">
<Filter>Streams\Header Files</Filter>
</ClInclude>
@@ -1267,6 +1267,14 @@
Name="Source Files"
>
<File
+ RelativePath=".\src\Base32Decoder.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Base32Encoder.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\Base64Decoder.cpp"
>
</File>
@@ -1443,6 +1451,14 @@
Name="Header Files"
>
<File
+ RelativePath=".\include\Poco\Base32Decoder.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\Poco\Base32Encoder.h"
+ >
+ </File>
+ <File
RelativePath=".\include\Poco\Base64Decoder.h"
>
</File>
View
@@ -8,7 +8,8 @@
include $(POCO_BASE)/build/rules/global
-objects = ArchiveStrategy Ascii ASCIIEncoding AsyncChannel Base64Decoder Base64Encoder \
+objects = ArchiveStrategy Ascii ASCIIEncoding AsyncChannel \
+ Base32Decoder Base32Encoder Base64Decoder Base64Encoder \
BinaryReader BinaryWriter Bugcheck ByteOrder Channel Checksum Configurable ConsoleChannel \
CountingStream DateTime LocalDateTime DateTimeFormat DateTimeFormatter DateTimeParser \
Debugger DeflatingStream DigestEngine DigestStream DirectoryIterator DirectoryWatcher \
Oops, something went wrong.

0 comments on commit 08ae9ae

Please sign in to comment.