Resolve conflicts

All "confilcts" were actually diffs - not sure why git flew off the
handle.

Crypto/CMakeLists.txt

@@ -1,8 +1,4 @@
 set(LIBNAME "PocoCrypto")
-<<<<<<< HEAD
-set(LIBNAME "${LIBNAME}${LIB_EXT}")
-=======
->>>>>>> develop
 
 aux_source_directory(src SRCS)
 add_definitions(-D_USRDLL -DCrypto_EXPORTS)
@@ -12,21 +8,12 @@ add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} )
 set_target_properties( ${LIBNAME} PROPERTIES VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} )
 
 #if(CMAKE_SYSTEM MATCHES "Windows")
-<<<<<<< HEAD
-#    target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT} ${LIB_EAY_RELEASE} ${OPENSSL_LIBRARIES}  )
-#ELSE()
-#    target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} )
-#ENDIF()
-
-target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT} ${OPENSSL_LIBRARIES}  )
-=======
 #    target_link_libraries( ${LIBNAME} PocoFoundation ${LIB_EAY_RELEASE} ${OPENSSL_LIBRARIES}  )
 #ELSE()
 #    target_link_libraries( ${LIBNAME} PocoFoundation ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} )
 #ENDIF()
 
 target_link_libraries( ${LIBNAME} PocoFoundation ${OPENSSL_LIBRARIES}  )
->>>>>>> develop
 
 install(
     DIRECTORY include/Poco

Crypto/Crypto_vs110.vcxproj

@@ -1,8 +1,5 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?>
-<?xml version="1.0" encoding="UTF-8"?>
+
-=======
-<?xml version="1.0" encoding="utf-8"?>
->>>>>>> develop
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="debug_shared|Win32">
@@ -36,109 +33,37 @@
     <RootNamespace>Crypto</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-<<<<<<< HEAD
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;" Label="Configuration">
-=======
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
->>>>>>> develop
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-<<<<<<< HEAD
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;" Label="Configuration">
-=======
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
->>>>>>> develop
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-<<<<<<< HEAD
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;" Label="Configuration">
-=======
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
->>>>>>> develop
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-<<<<<<< HEAD
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;" Label="Configuration">
-=======
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
->>>>>>> develop
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-<<<<<<< HEAD
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;" Label="Configuration">
-=======
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
->>>>>>> develop
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-<<<<<<< HEAD
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;" Label="Configuration">
-=======
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
->>>>>>> develop
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-<<<<<<< HEAD
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
-  <ImportGroup Label="ExtensionSettings"/>
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;" Label="PropertySheets">
-    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;" Label="PropertySheets">
-    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;" Label="PropertySheets">
-    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;" Label="PropertySheets">
-    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;" Label="PropertySheets">
-    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;" Label="PropertySheets">
-    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros"/>
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">..\bin\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">true</LinkIncremental>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">..\bin\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">false</LinkIncremental>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">..\lib\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">obj\$(Configuration)\</IntDir>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">..\lib\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">obj\$(Configuration)\</IntDir>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">..\lib\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">obj\$(Configuration)\</IntDir>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">..\lib\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">obj\$(Configuration)\</IntDir>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">PocoCryptod</TargetName>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">PocoCryptomdd</TargetName>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">PocoCryptomtd</TargetName>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">PocoCrypto</TargetName>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">PocoCryptomd</TargetName>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">PocoCryptomt</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">
-=======
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
@@ -213,7 +138,6 @@
     <LibraryPath>C:\OpenSSL\lib\VC;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
->>>>>>> develop
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -226,11 +150,7 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-<<<<<<< HEAD
       <PrecompiledHeader />
-=======
-      <PrecompiledHeader />
->>>>>>> develop
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
@@ -248,11 +168,7 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-<<<<<<< HEAD
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">
-=======
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
->>>>>>> develop
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -267,15 +183,9 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-<<<<<<< HEAD
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat />
-=======
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat />
->>>>>>> develop
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -292,11 +202,7 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-<<<<<<< HEAD
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">
-=======
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
->>>>>>> develop
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -309,11 +215,7 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-<<<<<<< HEAD
       <PrecompiledHeader />
-=======
-      <PrecompiledHeader />
->>>>>>> develop
       <ProgramDataBaseFileName>..\lib\PocoCryptomtd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -324,11 +226,7 @@
       <OutputFile>..\lib\PocoCryptomtd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-<<<<<<< HEAD
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">
-=======
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
->>>>>>> develop
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -343,15 +241,9 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-<<<<<<< HEAD
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat />
-=======
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat />
->>>>>>> develop
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -359,11 +251,7 @@
       <OutputFile>..\lib\PocoCryptomt.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-<<<<<<< HEAD
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">
-=======
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
->>>>>>> develop
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -376,11 +264,7 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-<<<<<<< HEAD
       <PrecompiledHeader />
-=======
-      <PrecompiledHeader />
->>>>>>> develop
       <ProgramDataBaseFileName>..\lib\PocoCryptomdd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -391,11 +275,7 @@
       <OutputFile>..\lib\PocoCryptomdd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-<<<<<<< HEAD
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">
-=======
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
->>>>>>> develop
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -410,17 +290,10 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-<<<<<<< HEAD
       <PrecompiledHeader />
       <ProgramDataBaseFileName>..\lib\PocoCryptomd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat />
-=======
-      <PrecompiledHeader />
-      <ProgramDataBaseFileName>..\lib\PocoCryptomd.pdb</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat />
->>>>>>> develop
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -430,7 +303,6 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-<<<<<<< HEAD
     <ClInclude Include="include\Poco\Crypto\Cipher.h" />
     <ClInclude Include="include\Poco\Crypto\CipherFactory.h" />
     <ClInclude Include="include\Poco\Crypto\CipherImpl.h" />
@@ -469,43 +341,3 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
 </Project>
-=======
-    <ClInclude Include="include\Poco\Crypto\Cipher.h" />
-    <ClInclude Include="include\Poco\Crypto\CipherFactory.h" />
-    <ClInclude Include="include\Poco\Crypto\CipherImpl.h" />
-    <ClInclude Include="include\Poco\Crypto\CipherKey.h" />
-    <ClInclude Include="include\Poco\Crypto\CipherKeyImpl.h" />
-    <ClInclude Include="include\Poco\Crypto\CryptoStream.h" />
-    <ClInclude Include="include\Poco\Crypto\CryptoTransform.h" />
-    <ClInclude Include="include\Poco\Crypto\RSACipherImpl.h" />
-    <ClInclude Include="include\Poco\Crypto\RSADigestEngine.h" />
-    <ClInclude Include="include\Poco\Crypto\RSAKey.h" />
-    <ClInclude Include="include\Poco\Crypto\RSAKeyImpl.h" />
-    <ClInclude Include="include\Poco\Crypto\X509Certificate.h" />
-    <ClInclude Include="include\Poco\Crypto\Crypto.h" />
-    <ClInclude Include="include\Poco\Crypto\OpenSSLInitializer.h" />
-    <ClInclude Include="include\Poco\Crypto\DigestEngine.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\Cipher.cpp" />
-    <ClCompile Include="src\CipherFactory.cpp" />
-    <ClCompile Include="src\CipherImpl.cpp" />
-    <ClCompile Include="src\CipherKey.cpp" />
-    <ClCompile Include="src\CipherKeyImpl.cpp" />
-    <ClCompile Include="src\CryptoStream.cpp" />
-    <ClCompile Include="src\CryptoTransform.cpp" />
-    <ClCompile Include="src\RSACipherImpl.cpp" />
-    <ClCompile Include="src\RSADigestEngine.cpp" />
-    <ClCompile Include="src\RSAKey.cpp" />
-    <ClCompile Include="src\RSAKeyImpl.cpp" />
-    <ClCompile Include="src\X509Certificate.cpp" />
-    <ClCompile Include="src\OpenSSLInitializer.cpp" />
-    <ClCompile Include="src\DigestEngine.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\DLLVersion.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets" />
-</Project>
->>>>>>> develop

Crypto/testsuite/TestSuite_vs110.vcxproj

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?>
-<?xml version="1.0" encoding="UTF-8"?>
-=======
-<?xml version="1.0" encoding="utf-8"?>
->>>>>>> develop
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="debug_shared|Win32">
@@ -36,119 +32,43 @@
     <RootNamespace>TestSuite</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-<<<<<<< HEAD
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;" Label="Configuration">
-=======
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
->>>>>>> develop
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-<<<<<<< HEAD
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;" Label="Configuration">
-=======
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
->>>>>>> develop
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-<<<<<<< HEAD
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;" Label="Configuration">
-=======
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
->>>>>>> develop
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-<<<<<<< HEAD
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;" Label="Configuration">
-=======
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
->>>>>>> develop
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-<<<<<<< HEAD
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;" Label="Configuration">
-=======
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
->>>>>>> develop
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-<<<<<<< HEAD
-  <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;" Label="Configuration">
-=======
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
->>>>>>> develop
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
-<<<<<<< HEAD
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
-  <ImportGroup Label="ExtensionSettings"/>
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;" Label="PropertySheets">
-    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;" Label="PropertySheets">
-    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;" Label="PropertySheets">
-    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;" Label="PropertySheets">
-    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;" Label="PropertySheets">
-    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <ImportGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;" Label="PropertySheets">
-    <Import Condition="exists(&apos;$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props&apos;)" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros"/>
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">bin\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">true</LinkIncremental>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">bin\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">false</LinkIncremental>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">bin\static_mt\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">true</LinkIncremental>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">bin\static_mt\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">false</LinkIncremental>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">bin\static_md\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">true</LinkIncremental>
-    <OutDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">bin\static_md\</OutDir>
-    <IntDir Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">false</LinkIncremental>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">TestSuited</TargetName>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">TestSuited</TargetName>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">TestSuited</TargetName>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">TestSuite</TargetName>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">TestSuite</TargetName>
-    <TargetName Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">TestSuite</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_shared|Win32&apos;">
-=======
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
@@ -228,7 +148,6 @@
     <LibraryPath>C:\OpenSSL\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
->>>>>>> develop
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -241,11 +160,7 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-<<<<<<< HEAD
       <PrecompiledHeader />
-=======
-      <PrecompiledHeader />
->>>>>>> develop
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
@@ -262,11 +177,7 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-<<<<<<< HEAD
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_shared|Win32&apos;">
-=======
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
->>>>>>> develop
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -281,15 +192,9 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-<<<<<<< HEAD
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat />
-=======
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat />
->>>>>>> develop
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -304,11 +209,7 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-<<<<<<< HEAD
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|Win32&apos;">
-=======
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
->>>>>>> develop
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -321,11 +222,7 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-<<<<<<< HEAD
       <PrecompiledHeader />
-=======
-      <PrecompiledHeader />
->>>>>>> develop
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
@@ -343,11 +240,7 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-<<<<<<< HEAD
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|Win32&apos;">
-=======
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
->>>>>>> develop
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -362,15 +255,9 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-<<<<<<< HEAD
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat />
-=======
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat />
->>>>>>> develop
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -386,11 +273,7 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-<<<<<<< HEAD
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|Win32&apos;">
-=======
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
->>>>>>> develop
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -403,11 +286,7 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-<<<<<<< HEAD
       <PrecompiledHeader />
-=======
-      <PrecompiledHeader />
->>>>>>> develop
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
@@ -424,11 +303,7 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-<<<<<<< HEAD
-  <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|Win32&apos;">
-=======
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
->>>>>>> develop
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -443,15 +318,9 @@
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-<<<<<<< HEAD
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat />
-=======
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat />
->>>>>>> develop
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -467,7 +336,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-<<<<<<< HEAD
     <ClInclude Include="src\CryptoTest.h" />
     <ClInclude Include="src\DigestEngineTest.h" />
     <ClInclude Include="src\RSATest.h" />
@@ -483,20 +351,3 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
 </Project>
-=======
-    <ClInclude Include="src\CryptoTest.h" />
-    <ClInclude Include="src\DigestEngineTest.h" />
-    <ClInclude Include="src\RSATest.h" />
-    <ClInclude Include="src\CryptoTestSuite.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\DigestEngineTest.cpp" />
-    <ClCompile Include="src\CryptoTest.cpp" />
-    <ClCompile Include="src\RSATest.cpp" />
-    <ClCompile Include="src\CryptoTestSuite.cpp" />
-    <ClCompile Include="src\WinDriver.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets" />
-</Project>
->>>>>>> develop

Data/MySQL/include/Poco/Data/MySQL/Connector.h

@@ -39,25 +39,16 @@
 #ifndef Data_MySQL_Connector_INCLUDED
 #define Data_MySQL_Connector_INCLUDED
 
-<<<<<<< HEAD
-#include "MySQL.h"
-#include "Poco/Data/Connector.h"
-
-=======
 
 #include "MySQL.h"
 #include "Poco/Data/Connector.h"
 
 
->>>>>>> develop
 namespace Poco {
 namespace Data {
 namespace MySQL {
 
-<<<<<<< HEAD
-=======
 
->>>>>>> develop
 class MySQL_API Connector: public Poco::Data::Connector
 	/// Connector instantiates MySQL SessionImpl objects.
 {

Data/MySQL/testsuite/src/SQLExecutor.h

@@ -39,10 +39,7 @@
 #include "Poco/Data/MySQL/MySQL.h"
 #include "Poco/Data/Session.h"
 
-<<<<<<< HEAD
-=======
 
->>>>>>> develop
 class SQLExecutor: public CppUnit::TestCase
 {
 public:
@@ -105,13 +102,11 @@ public:
 
 	void blob(int bigSize = 1024);
 	void blobStmt();
-<<<<<<< HEAD
 
-=======
 	void dateTime();
 	void date();
 	void time();
->>>>>>> develop
+
 	void floats();
 	void doubles();
 	void tuples();

Data/SQLite/src/SQLiteStatementImpl.cpp

@@ -52,23 +52,16 @@ namespace Data {
 namespace SQLite {
 
 
-<<<<<<< HEAD
-=======
 const std::size_t SQLiteStatementImpl::POCO_SQLITE_INV_ROW_CNT = std::numeric_limits<std::size_t>::max();
 
 
->>>>>>> develop
 SQLiteStatementImpl::SQLiteStatementImpl(Poco::Data::SessionImpl& rSession, sqlite3* pDB):
 	StatementImpl(rSession),
 	_pDB(pDB),
 	_pStmt(0),
 	_stepCalled(false),
 	_nextResponse(0),
-<<<<<<< HEAD
-	_affectedRowCount(0),
-=======
 	_affectedRowCount(POCO_SQLITE_INV_ROW_CNT),
->>>>>>> develop
 	_canBind(false),
 	_isExtracted(false),
 	_canCompile(true)
@@ -85,11 +78,6 @@ SQLiteStatementImpl::~SQLiteStatementImpl()
 
 void SQLiteStatementImpl::compileImpl()
 {
-<<<<<<< HEAD
-	if (!_pLeftover) _bindBegin = bindings().begin();
-
-	std::string statement(toString());
-=======
 	if (!_pLeftover)
 	{
 		// Executed to force reset of previous changes count to zero.
@@ -112,7 +100,6 @@ void SQLiteStatementImpl::compileImpl()
 		throw InvalidAccessException("Cannot drop system table!");
 	}
 
->>>>>>> develop
 	sqlite3_stmt* pStmt = 0;
 	const char* pSql = _pLeftover ? _pLeftover->c_str() : statement.c_str();
 
@@ -227,25 +214,15 @@ void SQLiteStatementImpl::bindImpl()
 	else if (bindCount > remainingBindCount)
 		throw ParameterCountMismatchException();
 
-<<<<<<< HEAD
-	if (_bindBegin != bindings().end())
-	{
-		_affectedRowCount = (*_bindBegin)->numOfRowsHandled();
-=======
 	std::size_t boundRowCount;
 	if (_bindBegin != bindings().end())
 	{
 		boundRowCount = (*_bindBegin)->numOfRowsHandled();
->>>>>>> develop
 
 		Bindings::iterator oldBegin = _bindBegin;
 		for (std::size_t pos = 1; _bindBegin != bindEnd && (*_bindBegin)->canBind(); ++_bindBegin)
 		{
-<<<<<<< HEAD
-			if (_affectedRowCount != (*_bindBegin)->numOfRowsHandled())
-=======
 			if (boundRowCount != (*_bindBegin)->numOfRowsHandled())
->>>>>>> develop
 				throw BindingException("Size mismatch in Bindings. All Bindings MUST have the same size");
 
 			(*_bindBegin)->bind(pos);
@@ -266,11 +243,7 @@ void SQLiteStatementImpl::bindImpl()
 void SQLiteStatementImpl::clear()
 {
 	_columns[currentDataSet()].clear();
-<<<<<<< HEAD
-	_affectedRowCount = 0;
-=======
 	_affectedRowCount = POCO_SQLITE_INV_ROW_CNT;
->>>>>>> develop
 
 	if (_pStmt)
 	{
@@ -297,12 +270,9 @@ bool SQLiteStatementImpl::hasNext()
 	_stepCalled = true;
 	_nextResponse = sqlite3_step(_pStmt);
 
-<<<<<<< HEAD
-=======
 	if (_affectedRowCount == POCO_SQLITE_INV_ROW_CNT) _affectedRowCount = 0;
 	_affectedRowCount += sqlite3_changes(_pDB);
 
->>>>>>> develop
 	if (_nextResponse != SQLITE_ROW && _nextResponse != SQLITE_OK && _nextResponse != SQLITE_DONE)
 		Utility::throwException(_nextResponse);
 
@@ -329,11 +299,8 @@ std::size_t SQLiteStatementImpl::next()
 			_isExtracted = true;
 		}
 		_stepCalled = false;
-<<<<<<< HEAD
-=======
 		if (_affectedRowCount == POCO_SQLITE_INV_ROW_CNT) _affectedRowCount = 0;
 		_affectedRowCount += (*extracts.begin())->numOfRowsHandled();
->>>>>>> develop
 	}
 	else if (SQLITE_DONE == _nextResponse)
 	{
@@ -341,12 +308,7 @@ std::size_t SQLiteStatementImpl::next()
 	}
 	else
 	{
-<<<<<<< HEAD
-		int rc = _nextResponse;
-		Utility::throwException(rc, std::string("Iterator Error: trying to access the next value"));
-=======
 		Utility::throwException(_nextResponse, std::string("Iterator Error: trying to access the next value"));
->>>>>>> develop
 	}
 	
 	return 1u;
@@ -369,11 +331,7 @@ const MetaColumn& SQLiteStatementImpl::metaColumn(std::size_t pos) const
 
 std::size_t SQLiteStatementImpl::affectedRowCount() const
 {
-<<<<<<< HEAD
-	return _affectedRowCount ? _affectedRowCount : sqlite3_changes(_pDB);
-=======
 	return _affectedRowCount != POCO_SQLITE_INV_ROW_CNT ? _affectedRowCount : sqlite3_changes(_pDB);
->>>>>>> develop
 }
 
 

Foundation/CMakeLists.txt

@@ -1,11 +1,4 @@
 set(LIBNAME "PocoFoundation")
-<<<<<<< HEAD
-if (CMAKE_BUILD_TYPE MATCHES Debug)
-    set(LIBNAME "${LIBNAME}d")
-endif()
-
-
-=======
 
 if (WIN32)
   # cmake has CMAKE_RC_COMPILER, but no message compiler
@@ -28,7 +21,6 @@ if (WIN32)
   mark_as_advanced(CMAKE_MC_COMPILER)
 endif(WIN32)
   
->>>>>>> develop
 set( BASE_SRCS 
   src/ASCIIEncoding.cpp
   src/Ascii.cpp
@@ -59,10 +51,7 @@ set( BASE_SRCS
   src/DigestStream.cpp
   src/DirectoryIterator.cpp
   src/Environment.cpp
-<<<<<<< HEAD
-=======
   src/Error.cpp
->>>>>>> develop
   src/ErrorHandler.cpp
   src/Event.cpp
   src/EventArgs.cpp
@@ -139,10 +128,7 @@ set( BASE_SRCS
   src/StreamCopier.cpp
   src/StreamTokenizer.cpp
   src/String.cpp
-<<<<<<< HEAD
-=======
   src/NumericString.cpp
->>>>>>> develop
   src/StringTokenizer.cpp
   src/SynchronizedObject.cpp
   src/Task.cpp
@@ -217,8 +203,6 @@ set(WIN_SRCS
   src/WindowsConsoleChannel.cpp
 )
 
-<<<<<<< HEAD
-=======
 if (WIN32)
   set(RES_SRCS ${CMAKE_SOURCE_DIR}/Foundation/include/Poco/pocomsg.h)
   set_source_files_properties(${RES_SRCS} PROPERTIES GENERATED true)
@@ -235,7 +219,6 @@ if (WIN32)
   list(APPEND WIN_SRCS ${RES_SRCS})
 endif (WIN32)
 
->>>>>>> develop
 set(LIN_SRCS
   src/SyslogChannel.cpp
 )

Foundation/Foundation_vs100.vcxproj

@@ -290,11 +290,8 @@
   <ItemGroup>
     <ClCompile Include="src\Ascii.cpp" />
     <ClCompile Include="src\AtomicCounter.cpp" />
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\Base32Decoder.cpp" />
     <ClCompile Include="src\Base32Encoder.cpp" />
->>>>>>> develop
     <ClCompile Include="src\Bugcheck.cpp" />
     <ClCompile Include="src\ByteOrder.cpp" />
     <ClCompile Include="src\Checksum.cpp" />
@@ -333,10 +330,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\Error.cpp" />
->>>>>>> develop
     <ClCompile Include="src\Exception.cpp" />
     <ClCompile Include="src\FIFOBufferStream.cpp" />
     <ClCompile Include="src\Format.cpp" />
@@ -386,10 +380,7 @@
     <ClCompile Include="src\NestedDiagnosticContext.cpp" />
     <ClCompile Include="src\NumberFormatter.cpp" />
     <ClCompile Include="src\NumberParser.cpp" />
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\NumericString.cpp" />
->>>>>>> develop
     <ClCompile Include="src\RefCountedObject.cpp" />
     <ClCompile Include="src\String.cpp" />
     <ClCompile Include="src\StringTokenizer.cpp" />
@@ -989,11 +980,8 @@
     <ClInclude Include="include\Poco\AtomicCounter.h" />
     <ClInclude Include="include\Poco\AutoPtr.h" />
     <ClInclude Include="include\Poco\AutoReleasePool.h" />
-<<<<<<< HEAD
-=======
     <ClInclude Include="include\Poco\Base32Decoder.h" />
     <ClInclude Include="include\Poco\Base32Encoder.h" />
->>>>>>> develop
     <ClInclude Include="include\Poco\Buffer.h" />
     <ClInclude Include="include\Poco\Bugcheck.h" />
     <ClInclude Include="include\Poco\ByteOrder.h" />
@@ -1013,10 +1001,7 @@
     <ClInclude Include="include\Poco\Environment_VMS.h" />
     <ClInclude Include="include\Poco\Environment_WIN32.h" />
     <ClInclude Include="include\Poco\Environment_WIN32U.h" />
-<<<<<<< HEAD
-=======
     <ClInclude Include="include\Poco\Error.h" />
->>>>>>> develop
     <ClInclude Include="include\Poco\Exception.h" />
     <ClInclude Include="include\Poco\FIFOBuffer.h" />
     <ClInclude Include="include\Poco\FIFOBufferStream.h" />

Foundation/Foundation_vs110.sln

@@ -15,13 +15,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\Te
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs110.vcxproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}"
 	ProjectSection(ProjectDependencies) = postProject
-<<<<<<< HEAD
-		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
-=======
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F} = {0955EB03-544B-4BD4-9C10-89CF38078F5F}
 		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} = {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}
->>>>>>> develop
 	EndProjectSection
 EndProject
 Global
@@ -34,33 +30,6 @@ Global
 		release_static_mt|Win32 = release_static_mt|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-<<<<<<< HEAD
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.Build.0 = debug_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.ActiveCfg = debug_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_md|Win32.Build.0 = debug_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.ActiveCfg = debug_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static_mt|Win32.Build.0 = debug_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.ActiveCfg = release_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.Build.0 = release_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.ActiveCfg = release_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.Build.0 = release_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.ActiveCfg = release_shared|Win32
-		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.Build.0 = release_shared|Win32
-		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
-		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.Build.0 = debug_shared|Win32
-		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
-		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
-		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
-		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
-		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|Win32.ActiveCfg = release_shared|Win32
-		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|Win32.Build.0 = release_shared|Win32
-		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
-		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_md|Win32.Build.0 = release_static_md|Win32
-		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
-		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
-=======
->>>>>>> develop
 		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
@@ -73,8 +42,6 @@ Global
 		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_md|Win32.Build.0 = release_static_md|Win32
 		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
 		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
-<<<<<<< HEAD
-=======
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
@@ -99,7 +66,6 @@ Global
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_md|Win32.Build.0 = release_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.ActiveCfg = release_shared|Win32
 		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static_mt|Win32.Build.0 = release_shared|Win32
->>>>>>> develop
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32

Foundation/Foundation_vs110.vcxproj

@@ -334,10 +334,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\Error.cpp" />
->>>>>>> develop
     <ClCompile Include="src\Exception.cpp" />
     <ClCompile Include="src\FIFOBufferStream.cpp" />
     <ClCompile Include="src\Format.cpp" />
@@ -389,20 +386,14 @@
     <ClCompile Include="src\NumberParser.cpp" />
     <ClCompile Include="src\RefCountedObject.cpp" />
     <ClCompile Include="src\String.cpp" />
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\NumericString.cpp" />
->>>>>>> develop
     <ClCompile Include="src\StringTokenizer.cpp" />
     <ClCompile Include="src\UTF32Encoding.cpp" />
     <ClCompile Include="src\Var.cpp" />
     <ClCompile Include="src\VarHolder.cpp" />
     <ClCompile Include="src\Void.cpp" />
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\Base32Decoder.cpp" />
     <ClCompile Include="src\Base32Encoder.cpp" />
->>>>>>> develop
     <ClCompile Include="src\Base64Decoder.cpp" />
     <ClCompile Include="src\Base64Encoder.cpp" />
     <ClCompile Include="src\BinaryReader.cpp" />
@@ -1014,10 +1005,7 @@
     <ClInclude Include="include\Poco\Environment_VMS.h" />
     <ClInclude Include="include\Poco\Environment_WIN32.h" />
     <ClInclude Include="include\Poco\Environment_WIN32U.h" />
-<<<<<<< HEAD
-=======
     <ClInclude Include="include\Poco\Error.h" />
->>>>>>> develop
     <ClInclude Include="include\Poco\Exception.h" />
     <ClInclude Include="include\Poco\FIFOBuffer.h" />
     <ClInclude Include="include\Poco\FIFOBufferStream.h" />
@@ -1058,11 +1046,8 @@
     <ClInclude Include="include\Poco\UTFString.h" />
     <ClInclude Include="include\Poco\Version.h" />
     <ClInclude Include="include\Poco\Void.h" />
-<<<<<<< HEAD
-=======
     <ClInclude Include="include\Poco\Base32Decoder.h" />
     <ClInclude Include="include\Poco\Base32Encoder.h" />
->>>>>>> develop
     <ClInclude Include="include\Poco\Base64Decoder.h" />
     <ClInclude Include="include\Poco\Base64Encoder.h" />
     <ClInclude Include="include\Poco\BinaryReader.h" />

Foundation/Foundation_vs110.vcxproj.filters

@@ -222,12 +222,9 @@
     <ClCompile Include="src\Environment_WIN32U.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\Error.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
->>>>>>> develop
     <ClCompile Include="src\Exception.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -270,27 +267,21 @@
     <ClCompile Include="src\String.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\NumericString.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
->>>>>>> develop
     <ClCompile Include="src\StringTokenizer.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\Void.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\Base32Decoder.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\Base32Encoder.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
->>>>>>> develop
     <ClCompile Include="src\Base64Decoder.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -965,12 +956,9 @@
     <ClInclude Include="include\Poco\Environment_WIN32U.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
-<<<<<<< HEAD
-=======
     <ClInclude Include="include\Poco\Error.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
->>>>>>> develop
     <ClInclude Include="include\Poco\Exception.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -1073,15 +1061,12 @@
     <ClInclude Include="include\Poco\Void.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
-<<<<<<< HEAD
-=======
     <ClInclude Include="include\Poco\Base32Decoder.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\Base32Encoder.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
->>>>>>> develop
     <ClInclude Include="include\Poco\Base64Decoder.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>

Foundation/Foundation_x64_vs110.vcxproj

@@ -340,10 +340,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ClCompile>
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\Error.cpp" />
->>>>>>> develop
     <ClCompile Include="src\Exception.cpp" />
     <ClCompile Include="src\FIFOBufferStream.cpp" />
     <ClCompile Include="src\Format.cpp" />
@@ -395,20 +392,14 @@
     <ClCompile Include="src\NumberParser.cpp" />
     <ClCompile Include="src\RefCountedObject.cpp" />
     <ClCompile Include="src\String.cpp" />
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\NumericString.cpp" />
->>>>>>> develop
     <ClCompile Include="src\StringTokenizer.cpp" />
     <ClCompile Include="src\UTF32Encoding.cpp" />
     <ClCompile Include="src\Var.cpp" />
     <ClCompile Include="src\VarHolder.cpp" />
     <ClCompile Include="src\Void.cpp" />
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\Base32Decoder.cpp" />
     <ClCompile Include="src\Base32Encoder.cpp" />
->>>>>>> develop
     <ClCompile Include="src\Base64Decoder.cpp" />
     <ClCompile Include="src\Base64Encoder.cpp" />
     <ClCompile Include="src\BinaryReader.cpp" />
@@ -1019,10 +1010,7 @@
     <ClInclude Include="include\Poco\Environment_VMS.h" />
     <ClInclude Include="include\Poco\Environment_WIN32.h" />
     <ClInclude Include="include\Poco\Environment_WIN32U.h" />
-<<<<<<< HEAD
-=======
     <ClInclude Include="include\Poco\Error.h" />
->>>>>>> develop
     <ClInclude Include="include\Poco\Exception.h" />
     <ClInclude Include="include\Poco\FIFOBufferStream.h" />
     <ClInclude Include="include\Poco\Format.h" />
@@ -1061,11 +1049,8 @@
     <ClInclude Include="include\Poco\UTF32Encoding.h" />
     <ClInclude Include="include\Poco\Version.h" />
     <ClInclude Include="include\Poco\Void.h" />
-<<<<<<< HEAD
-=======
     <ClInclude Include="include\Poco\Base32Decoder.h" />
     <ClInclude Include="include\Poco\Base32Encoder.h" />
->>>>>>> develop
     <ClInclude Include="include\Poco\Base64Decoder.h" />
     <ClInclude Include="include\Poco\Base64Encoder.h" />
     <ClInclude Include="include\Poco\BinaryReader.h" />

Foundation/Foundation_x64_vs110.vcxproj.filters

@@ -222,12 +222,9 @@
     <ClCompile Include="src\Environment_WIN32U.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\Error.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
->>>>>>> develop
     <ClCompile Include="src\Exception.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
@@ -270,27 +267,21 @@
     <ClCompile Include="src\String.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\NumericString.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
->>>>>>> develop
     <ClCompile Include="src\StringTokenizer.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\Void.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\Base32Decoder.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\Base32Encoder.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
->>>>>>> develop
     <ClCompile Include="src\Base64Decoder.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -965,12 +956,9 @@
     <ClInclude Include="include\Poco\Environment_WIN32U.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
-<<<<<<< HEAD
-=======
     <ClInclude Include="include\Poco\Error.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
->>>>>>> develop
     <ClInclude Include="include\Poco\Exception.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
@@ -1073,15 +1061,12 @@
     <ClInclude Include="include\Poco\Void.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
-<<<<<<< HEAD
-=======
     <ClInclude Include="include\Poco\Base32Decoder.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\Poco\Base32Encoder.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
->>>>>>> develop
     <ClInclude Include="include\Poco\Base64Decoder.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>

Foundation/include/Poco/FIFOBufferStream.h

@@ -132,11 +132,7 @@ class Foundation_API FIFOBufferStream: public FIFOIOS, public std::iostream
 	/// An output stream for writing to a FIFO.
 {
 public:
-<<<<<<< HEAD
 	Poco::BasicEvent<bool>& readable;
-=======
-	Poco::BasicEvent<bool>& readable;
->>>>>>> develop
 	Poco::BasicEvent<bool>& writable;
 
 	explicit FIFOBufferStream(FIFOBuffer& buffer);

Foundation/include/Poco/NumericString.h

@@ -41,10 +41,7 @@
 
 
 #include "Poco/Foundation.h"
-<<<<<<< HEAD
-=======
 #include "Poco/Buffer.h"
->>>>>>> develop
 #include "Poco/FPEnvironment.h"
 #ifdef min
 	#undef min
@@ -55,12 +52,6 @@
 #include <limits>
 #include <cmath>
 #if !defined(POCO_NO_LOCALE)
-<<<<<<< HEAD
-#include <locale>
-#endif
-
-
-=======
 	#include <locale>
 #endif
 
@@ -72,7 +63,6 @@
 #define POCO_FLT_EXP 'e'
 
 
->>>>>>> develop
 namespace Poco {
 
 
@@ -100,13 +90,10 @@ inline char thousandSeparator()
 }
 
 
-<<<<<<< HEAD
-=======
 //
 // String to Number Conversions
 //
 
->>>>>>> develop
 template <typename I>
 bool strToInt(const char* pStr, I& result, short base, char thSep = ',')
 	/// Converts zero-terminated character array to integer number;
@@ -223,165 +210,6 @@ bool strToInt(const std::string& str, I& result, short base, char thSep = ',')
 }
 
 
-<<<<<<< HEAD
-namespace Impl {
-
-static char DUMMY_EXP_UNDERFLOW = 0; // dummy default val
-
-}
-
-template <typename F>
-bool strToFloat (const char* pStr, F& result, char& eu = Impl::DUMMY_EXP_UNDERFLOW, char decSep = '.', char thSep = ',')
-	/// Converts zero-terminated array to floating-point number;
-	/// Returns true if succesful. Exponent underflow (i.e. loss of precision)
-	/// is signalled in eu. Thousand separators are recognized for the locale
-	/// and silently skipped but not verified for correct positioning.
-	///
-	/// If parsing was unsuccesful, the return value is false with
-	/// result and eu values undetermined.
-{
-	poco_assert (decSep != thSep);
-
-	if (pStr == 0 || *pStr == '\0') return false;
-
-	// parser states:
-	const char STATE_LEADING_SPACES = 0;
-	const char STATE_DIGITS_BEFORE_DEC_POINT = 1;
-	const char STATE_DIGITS_AFTER_DEC_POINT = 2;
-	const char STATE_EXP_CHAR = 3;
-	const char STATE_EXP_DIGITS = 4;
-	const char STATE_SUFFIX = 5; // 'f' suffix
-
-	char numSign = 1, expSign = 1;
-	char state = STATE_LEADING_SPACES;
-	F mantissa = 0.0, exponent = 0.0;
-	F pow10 = 1.;
-	result = 0.0;
-	eu = 0;
-	for (; *pStr != '\0'; ++pStr)
-	{
-		switch (*pStr)
-		{
-		case '.':
-			if (decSep == '.')
-			{
-				if (state >= STATE_DIGITS_AFTER_DEC_POINT) return false;
-				state = STATE_DIGITS_AFTER_DEC_POINT;
-				break;
-			}
-			else if ((thSep == '.') && (state == STATE_DIGITS_BEFORE_DEC_POINT))
-				break;
-			else
-				return false;
-
-		case ',':
-			if (decSep == ',')
-			{
-				if (state >= STATE_DIGITS_AFTER_DEC_POINT) return false;
-				state = STATE_DIGITS_AFTER_DEC_POINT;
-				break;
-			}
-			else if ((thSep == ',') && (state == STATE_DIGITS_BEFORE_DEC_POINT))
-				break;
-			else
-				return false;
-
-		case ' ': // space (SPC)
-			if ((thSep == ' ') && (state == STATE_DIGITS_BEFORE_DEC_POINT)) break;
-		case '\t': // horizontal tab (TAB)
-		case '\n': // line feed (LF)
-		case '\v': // vertical tab (VT)
-		case '\f': // form feed (FF)
-		case '\r': // carriage return (CR)
-			if ((state >= STATE_DIGITS_AFTER_DEC_POINT) || (state >= STATE_EXP_DIGITS))
-				break;
-			else if ((state > STATE_LEADING_SPACES) && (state < STATE_DIGITS_AFTER_DEC_POINT))
-				return false;
-			break;
-
-		case '-':
-			if (state == STATE_LEADING_SPACES)
-				numSign = -1;
-			else if (state == STATE_EXP_CHAR) // exponential char
-				expSign = -1;
-			else return false;
-		case '+':
-			break;
-
-		case '0':
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-		case '8':
-		case '9':
-			if (state >= STATE_SUFFIX) return false; // constant suffix
-			if (state <= STATE_DIGITS_BEFORE_DEC_POINT) // integral part digits
-			{
-				result = result * 10 + (*pStr - '0');
-				state = STATE_DIGITS_BEFORE_DEC_POINT;
-			}
-			else if (state <= STATE_DIGITS_AFTER_DEC_POINT) // fractional part digits
-			{
-				mantissa += (*pStr - '0') / (pow10 *= 10.);
-				state = STATE_DIGITS_AFTER_DEC_POINT;
-			}
-			else if (state <= STATE_EXP_DIGITS) // exponent digits
-			{
-				exponent = exponent * 10 + (*pStr - '0');
-				state = STATE_EXP_DIGITS;
-			}
-			else return false;
-			break;
-
-		case 'E':
-		case 'e':
-			if (state > STATE_DIGITS_AFTER_DEC_POINT) return false;
-			state = STATE_EXP_CHAR;
-			break;
-
-		case 'F':
-		case 'f':
-			state = STATE_SUFFIX;
-			break;
-
-		default:
-			return false;
-		}
-	}
-
-	if (exponent > std::numeric_limits<F>::max_exponent10)
-	{
-		eu = expSign;
-		exponent = std::numeric_limits<F>::max_exponent10;
-	}
-
-	result += mantissa;
-	if (numSign != 1) result *= numSign;
-	if (exponent > 1.0)
-	{
-		F scale = std::pow(10., exponent);
-		result = (expSign < 0) ? (result / scale) : (result * scale);
-	}
-
-	return (state != STATE_LEADING_SPACES) && // empty/zero-length string
-		!FPEnvironment::isInfinite(result) &&
-		!FPEnvironment::isNaN(result);
-}
-
-
-template <typename F>
-bool strToFloat (const std::string& s, F& result, char& eu = Impl::DUMMY_EXP_UNDERFLOW, char decSep = '.', char thSep = ',')
-	/// Converts string to floating-point number;
-	/// This is a wrapper function, for details see see the
-	/// bool strToFloat(const char*, F&, char&, char, char) implementation.
-{
-	return strToFloat(s.c_str(), result, eu, decSep, thSep); 
-}
-=======
 //
 // Number to String Conversions
 //
@@ -718,7 +546,6 @@ Foundation_API bool strToDouble(const std::string& str, double& result, char dec
 //
 // end double-conversion functions declarations
 //
->>>>>>> develop
 
 
 } // namespace Poco

Foundation/include/Poco/StringTokenizer.h

@@ -70,13 +70,6 @@ public:
 		/// Additionally, options can be specified:
 		///   * TOK_IGNORE_EMPTY: empty tokens are ignored
 		///   * TOK_TRIM: trailing and leading whitespace is removed from tokens.
-<<<<<<< HEAD
-		/// An empty token at the end of str is always ignored. For example,
-		/// a StringTokenizer with the following arguments:
-		///     StringTokenizer(",ab,cd,", ",");
-		/// will produce three tokens, "", "ab" and "cd".
-=======
->>>>>>> develop
 
 	~StringTokenizer();
 		/// Destroys the tokenizer.
@@ -115,11 +108,8 @@ private:
 	StringTokenizer(const StringTokenizer&);
 	StringTokenizer& operator = (const StringTokenizer&);
 
-<<<<<<< HEAD
-=======
 	void trim (std::string& token);
 
->>>>>>> develop
 	TokenVec _tokens;
 };
 

Foundation/include/Poco/UTFString.h

@@ -1,9 +1,5 @@
 //
-<<<<<<< HEAD
-// Types.h
-=======
 // UTFString.h
->>>>>>> develop
 //
 // $Id: //poco/1.4/Foundation/include/Poco/UTFString.h#2 $
 //
@@ -91,10 +87,7 @@ namespace Poco {
 	#endif //POCO_NO_WSTRING
 //#endif // POCO_ENABLE_CPP11
 
-<<<<<<< HEAD
-=======
 
->>>>>>> develop
 } // namespace Poco
 
 

Foundation/testsuite/TestSuite_vs110.vcxproj

@@ -330,10 +330,7 @@
     <ClCompile Include="src\StringTokenizerTest.cpp" />
     <ClCompile Include="src\TuplesTest.cpp" />
     <ClCompile Include="src\TypeListTest.cpp" />
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\Base32Test.cpp" />
->>>>>>> develop
     <ClCompile Include="src\Base64Test.cpp" />
     <ClCompile Include="src\BinaryReaderWriterTest.cpp" />
     <ClCompile Include="src\CountingStreamTest.cpp" />
@@ -467,10 +464,7 @@
     <ClInclude Include="src\StringTokenizerTest.h" />
     <ClInclude Include="src\TuplesTest.h" />
     <ClInclude Include="src\TypeListTest.h" />
-<<<<<<< HEAD
-=======
     <ClInclude Include="src\Base32Test.h" />
->>>>>>> develop
     <ClInclude Include="src\Base64Test.h" />
     <ClInclude Include="src\BinaryReaderWriterTest.h" />
     <ClInclude Include="src\CountingStreamTest.h" />

Foundation/testsuite/TestSuite_vs110.vcxproj.filters

@@ -240,12 +240,9 @@
     <ClCompile Include="src\TypeListTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\Base32Test.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
->>>>>>> develop
     <ClCompile Include="src\Base64Test.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -641,12 +638,9 @@
     <ClInclude Include="src\TypeListTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
-<<<<<<< HEAD
-=======
     <ClInclude Include="src\Base32Test.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
->>>>>>> develop
     <ClInclude Include="src\Base64Test.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>

Foundation/testsuite/TestSuite_x64_vs110.vcxproj

@@ -330,10 +330,7 @@
     <ClCompile Include="src\StringTokenizerTest.cpp" />
     <ClCompile Include="src\TuplesTest.cpp" />
     <ClCompile Include="src\TypeListTest.cpp" />
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\Base32Test.cpp" />
->>>>>>> develop
     <ClCompile Include="src\Base64Test.cpp" />
     <ClCompile Include="src\BinaryReaderWriterTest.cpp" />
     <ClCompile Include="src\CountingStreamTest.cpp" />
@@ -468,10 +465,7 @@
     <ClInclude Include="src\StringTokenizerTest.h" />
     <ClInclude Include="src\TuplesTest.h" />
     <ClInclude Include="src\TypeListTest.h" />
-<<<<<<< HEAD
-=======
     <ClInclude Include="src\Base32Test.h" />
->>>>>>> develop
     <ClInclude Include="src\Base64Test.h" />
     <ClInclude Include="src\BinaryReaderWriterTest.h" />
     <ClInclude Include="src\CountingStreamTest.h" />

Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters

@@ -240,12 +240,9 @@
     <ClCompile Include="src\TypeListTest.cpp">
       <Filter>Core\Source Files</Filter>
     </ClCompile>
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\Base32Test.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
->>>>>>> develop
     <ClCompile Include="src\Base64Test.cpp">
       <Filter>Streams\Source Files</Filter>
     </ClCompile>
@@ -644,12 +641,9 @@
     <ClInclude Include="src\TypeListTest.h">
       <Filter>Core\Header Files</Filter>
     </ClInclude>
-<<<<<<< HEAD
-=======
     <ClInclude Include="src\Base32Test.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>
->>>>>>> develop
     <ClInclude Include="src\Base64Test.h">
       <Filter>Streams\Header Files</Filter>
     </ClInclude>

Foundation/testsuite/src/VarTest.cpp

@@ -41,10 +41,7 @@
 #include <map>
 #include <utility>
 
-<<<<<<< HEAD
-=======
 
->>>>>>> develop
 #if defined(_MSC_VER) && _MSC_VER < 1400
 	#pragma warning(disable:4800)//forcing value to bool 'true' or 'false'
 #endif

JSON/CMakeLists.txt

@@ -1,8 +1,4 @@
 set(LIBNAME "PocoJSON")
-<<<<<<< HEAD
-set(LIBNAME "${LIBNAME}${LIB_EXT}")
-=======
->>>>>>> develop
 
 aux_source_directory(src SRCS)
 
@@ -14,11 +10,7 @@ add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} )
 set_target_properties( ${LIBNAME} 
 	PROPERTIES
 	VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} )
-<<<<<<< HEAD
-target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT})
-=======
 target_link_libraries( ${LIBNAME} PocoFoundation)
->>>>>>> develop
 
 install(
     DIRECTORY include/Poco

JSON/JSON_vs100.sln

@@ -2,11 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_vs100.vcxproj", "{A63135B8-0DFC-428C-AF90-BC020BE83D0C}"
 EndProject
-<<<<<<< HEAD
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs100.vcxproj", "{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}"
-=======
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs100.vcxproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}"
->>>>>>> develop
 	ProjectSection(ProjectDependencies) = postProject
 		{A63135B8-0DFC-428C-AF90-BC020BE83D0C} = {A63135B8-0DFC-428C-AF90-BC020BE83D0C}
 	EndProjectSection
@@ -39,26 +35,6 @@ Global
 		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
 		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
 		{A63135B8-0DFC-428C-AF90-BC020BE83D0C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
-<<<<<<< HEAD
-		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
-		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_shared|Win32.Build.0 = debug_shared|Win32
-		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
-		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
-		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
-		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
-		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
-		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
-		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
-		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_shared|Win32.ActiveCfg = release_shared|Win32
-		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_shared|Win32.Build.0 = release_shared|Win32
-		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_shared|Win32.Deploy.0 = release_shared|Win32
-		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
-		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_md|Win32.Build.0 = release_static_md|Win32
-		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
-		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
-		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
-		{8DDEF92F-2475-410B-8292-1D67B4C6E4A6}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
-=======
 		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
 		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Build.0 = debug_shared|Win32
 		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
@@ -77,7 +53,6 @@ Global
 		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
 		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
 		{96CF3103-E49E-3F5E-A11D-6DBCDA043053}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
->>>>>>> develop
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

JSON/src/Parser.cpp

@@ -38,10 +38,7 @@
 #include "Poco/JSON/JSONException.h"
 #include "Poco/Ascii.h"
 #include "Poco/Token.h"
-<<<<<<< HEAD
-=======
 #include "Poco/UTF8Encoding.h"
->>>>>>> develop
 #undef min
 #undef max
 #include <limits>
@@ -69,21 +66,12 @@ public:
 
 	bool start(char c, std::istream& istr)
 	{
-<<<<<<< HEAD
 		if (c == '{'
          || c == '}'
          || c == ']'
          || c == '['
          || c == ','
          || c == ':')
-=======
-		if (c == '{'
-         || c == '}'
-         || c == ']'
-         || c == '['
-         || c == ','
-         || c == ':')
->>>>>>> develop
 		{
 			_value = c;
 			return true;
@@ -121,11 +109,7 @@ public:
 
 	bool start(char c, std::istream& istr)
 	{
-<<<<<<< HEAD
 		if (c == '"')
-=======
-		if (c == '"')
->>>>>>> develop
 		{
 			_value = ""; // We don't need the quote!
 			return true;
@@ -135,17 +119,10 @@ public:
 
 	void finish(std::istream& istr)
 	{
-<<<<<<< HEAD
-		int c = istr.get();
-		while (c != -1)
-		{
-			if ( c == 0 )
-=======
 		int c = 0;
 		while ((c = istr.get()) != -1)
 		{
 			if (c == 0)
->>>>>>> develop
 			{
 				throw JSONException("Null byte not allowed");
 			}
@@ -155,12 +132,6 @@ public:
 				throw JSONException(format("Control character 0x%x not allowed", (unsigned int) c));
 			}
 
-<<<<<<< HEAD
-			if ( c == '"' )
-				break;
-
-			if ( c == '\\' ) // Escaped String
-=======
 			if (c == '"')
 				break;
 				
@@ -190,37 +161,10 @@ public:
 			}
 
 			if (c == '\\') // Escaped String
->>>>>>> develop
 			{
 				c = istr.get();
 				switch(c)
 				{
-<<<<<<< HEAD
-				case '"' :
-					c = '"';
-					break;
-				case '\\' :
-					c = '\\';
-					break;
-				case '/' :
-					c = '/';
-					break;
-				case 'b' :
-					c = '\b';
-					break;
-				case 'f' :
-					c = '\f';
-					break;
-				case 'n' :
-					c = '\n';
-					break;
-				case 'r' :
-					c = '\r';
-					break;
-				case 't' :
-					c = '\t';
-					break;
-=======
 				case '"' :  c = '"';  break;
 				case '\\' : c = '\\'; break;
 				case '/' :  c = '/';  break;
@@ -229,7 +173,6 @@ public:
 				case 'n' :  c = '\n'; break;
 				case 'r' :  c = '\r'; break;
 				case 't' :  c = '\t'; break;
->>>>>>> develop
 				case 'u' : // Unicode
 				{
 					Poco::Int32 unicode = decodeUnicode(istr);
@@ -263,10 +206,6 @@ public:
 					{
 						throw JSONException("Invalid unicode");
 					}
-<<<<<<< HEAD
-					c = unicode;
-					break;
-=======
 					
 					Poco::UTF8Encoding utf8encoding;
 					int length = utf8encoding.convert(unicode, NULL, 0);
@@ -277,7 +216,6 @@ public:
 						_value += (char) convert[i];
 					}
 					continue;
->>>>>>> develop
 				}
 				default:
 				{
@@ -286,10 +224,6 @@ public:
 				}
 			}
 			_value += c;
-<<<<<<< HEAD
-			c = istr.get();
-=======
->>>>>>> develop
 		}
 
 		if ( c == -1 )
@@ -324,8 +258,6 @@ public:
 
 		return value;
 	}
-<<<<<<< HEAD
-=======
 	
 private:
 	int utf8_check_first(char byte)
@@ -369,7 +301,6 @@ private:
 			return 0;
 		}
 	}
->>>>>>> develop
 };
 
 
@@ -436,11 +367,7 @@ public:
 		if ( c == -1 )
 			return false;
 
-<<<<<<< HEAD
 		if (Ascii::isDigit(c))
-=======
-		if (Ascii::isDigit(c))
->>>>>>> develop
 		{
 			if ( c == '0' )
 			{
@@ -454,24 +381,14 @@ public:
 			return true;
 		}
 
-<<<<<<< HEAD
 		if (c == '-')
-=======
-		if (c == '-')
->>>>>>> develop
 		{
 			_value = c;
 
 			int nc = istr.peek();
-<<<<<<< HEAD
 			if (Ascii::isDigit(nc))
 			{
 				if (nc == '0')
-=======
-			if (Ascii::isDigit(nc))
-			{
-				if (nc == '0')
->>>>>>> develop
 				{
 					_value += '0';
 					istr.get();
@@ -494,11 +411,7 @@ public:
 		int c;
 		while( (c = istr.peek()) != -1)
 		{
-<<<<<<< HEAD
 			if (Ascii::isDigit(c))
-=======
-			if (Ascii::isDigit(c))
->>>>>>> develop
 			{
 				_value += c;
 				istr.get();
@@ -509,11 +422,7 @@ public:
 				{
 				case '.': // Float
 				{
-<<<<<<< HEAD
 					if (_activeClass == Token::FLOAT_LITERAL_TOKEN)
-=======
-					if (_activeClass == Token::FLOAT_LITERAL_TOKEN)
->>>>>>> develop
 					{
 						throw JSONException("Invalid float value");
 					}
@@ -534,11 +443,7 @@ public:
 				case 'E':
 				case 'e':
 				{
-<<<<<<< HEAD
 					if (_activeClass == Token::DOUBLE_LITERAL_TOKEN)
-=======
-					if (_activeClass == Token::DOUBLE_LITERAL_TOKEN)
->>>>>>> develop
 					{
 						throw JSONException("Invalid double value");
 					}
@@ -550,22 +455,14 @@ public:
 
 					// When the next char is - or + then read the next char
 					c = istr.peek();
-<<<<<<< HEAD
 					if (c == '-' || c == '+')
-=======
-					if (c == '-' || c == '+')
->>>>>>> develop
 					{
 						_value += c;
 						istr.get();
 						c = istr.peek();
 					}
 
-<<<<<<< HEAD
 					if (! Ascii::isDigit(c))
-=======
-					if (! Ascii::isDigit(c))
->>>>>>> develop
 					{
 						throw JSONException("Invalid double value");
 					}
@@ -607,11 +504,7 @@ Parser::~Parser()
 const Token* Parser::nextToken()
 {
 	const Token* token = _tokenizer.next();
-<<<<<<< HEAD
 	if (token->is(Token::EOF_TOKEN))
-=======
-	if (token->is(Token::EOF_TOKEN))
->>>>>>> develop
 	{
 		throw JSONException("Unexpected EOF found");
 	}
@@ -624,7 +517,6 @@ void Parser::parse(std::istream& in)
 	_tokenizer.attachToStream(in);
 	const Token* token = nextToken();
 
-<<<<<<< HEAD
 	if (token->is(Token::SEPARATOR_TOKEN))
 	{
 		// This must be a { or a [
@@ -633,16 +525,6 @@ void Parser::parse(std::istream& in)
 			readObject();
 		}
 		else if (token->asChar() == '[')
-=======
-	if (token->is(Token::SEPARATOR_TOKEN))
-	{
-		// This must be a { or a [
-		if (token->asChar() == '{')
-		{
-			readObject();
-		}
-		else if (token->asChar() == '[')
->>>>>>> develop
 		{
 			readArray();
 		}
@@ -651,11 +533,7 @@ void Parser::parse(std::istream& in)
 			throw JSONException(format("Invalid separator '%c' found. Expecting { or [", token->asChar()));
 		}
 		token = _tokenizer.next();
-<<<<<<< HEAD
 		if (! token->is(Token::EOF_TOKEN))
-=======
-		if (! token->is(Token::EOF_TOKEN))
->>>>>>> develop
 		{
 			throw JSONException(format("EOF expected but found '%s'", token->asString()));
 		}
@@ -669,11 +547,7 @@ void Parser::parse(std::istream& in)
 
 void Parser::readObject()
 {
-<<<<<<< HEAD
 	if (_handler != NULL)
-=======
-	if (_handler != NULL)
->>>>>>> develop
 	{
 		_handler->startObject();
 	}
@@ -683,11 +557,7 @@ void Parser::readObject()
 		while(readRow());
 	}
 
-<<<<<<< HEAD
 	if (_handler != NULL)
-=======
-	if (_handler != NULL)
->>>>>>> develop
 	{
 		_handler->endObject();
 	}
@@ -698,20 +568,12 @@ bool Parser::readRow(bool firstCall)
 {
 	const Token* token = nextToken();
 
-<<<<<<< HEAD
 	if (firstCall && token->tokenClass() == Token::SEPARATOR_TOKEN && token->asChar() == '}')
-=======
-	if (firstCall && token->tokenClass() == Token::SEPARATOR_TOKEN && token->asChar() == '}')
->>>>>>> develop
 	{
 		return false; // End of object is possible for an empty object
 	}
 
-<<<<<<< HEAD
 	if (token->tokenClass() == Token::STRING_LITERAL_TOKEN)
-=======
-	if (token->tokenClass() == Token::STRING_LITERAL_TOKEN)
->>>>>>> develop
 	{
 		std::string propertyName = token->tokenString();
 		if ( _handler != NULL )
@@ -721,19 +583,13 @@ bool Parser::readRow(bool firstCall)
 
 		token = nextToken();
 
-<<<<<<< HEAD
 		if (   token->is(Token::SEPARATOR_TOKEN)
             && token->asChar() == ':')
-=======
-		if (   token->is(Token::SEPARATOR_TOKEN)
-            && token->asChar() == ':')
->>>>>>> develop
 		{
 			readValue(nextToken());
 
 			token = nextToken();
 
-<<<<<<< HEAD
 			if (token->is(Token::SEPARATOR_TOKEN))
 			{
 				if (token->asChar() == ',')
@@ -741,15 +597,6 @@ bool Parser::readRow(bool firstCall)
 					return true; // Read next row
 				}
 				else if (token->asChar() == '}')
-=======
-			if (token->is(Token::SEPARATOR_TOKEN))
-			{
-				if (token->asChar() == ',')
-				{
-					return true; // Read next row
-				}
-				else if (token->asChar() == '}')
->>>>>>> develop
 				{
 					return false; // End of object
 				}
@@ -786,22 +633,6 @@ void Parser::readValue(const Token* token)
 		break;
 			
 	case Token::INTEGER_LITERAL_TOKEN:
-<<<<<<< HEAD
-		if ( _handler != NULL )
-		{
-			int value = token->asInteger();
-#if defined(POCO_HAVE_INT64)
-			if (    value == std::numeric_limits<int>::max() 
-			     || value == std::numeric_limits<int>::min() )
-			{
-				_handler->value(NumberParser::parse64(token->asString()));
-			}
-			else
-			{
-				_handler->value(token->asInteger());
-			}
-#else
-=======
 		if (_handler != NULL)
 		{
 #if defined(POCO_HAVE_INT64)
@@ -818,48 +649,29 @@ void Parser::readValue(const Token* token)
 			}
 #else
 			int value = token->asInteger();
->>>>>>> develop
 			_handle->value(value);
 #endif
 		}
 		break;
 	case Token::KEYWORD_TOKEN:
 	{
-<<<<<<< HEAD
 		if (token->tokenString().compare("null") == 0)
 		{
 			if (_handler != NULL)
-=======
-		if (token->tokenString().compare("null") == 0)
-		{
-			if (_handler != NULL)
->>>>>>> develop
 			{
 				_handler->null();
 			}
 		}
-<<<<<<< HEAD
 		else  if (token->tokenString().compare("true") == 0)
 		{
 			if (_handler != NULL)
-=======
-		else  if (token->tokenString().compare("true") == 0)
-		{
-			if (_handler != NULL)
->>>>>>> develop
 			{
 				_handler->value(true);
 			}
 		}
-<<<<<<< HEAD
 		else if (token->tokenString().compare("false") == 0)
 		{
 			if (_handler != NULL)
-=======
-		else if (token->tokenString().compare("false") == 0)
-		{
-			if (_handler != NULL)
->>>>>>> develop
 			{
 				_handler->value(false);
 			}
@@ -873,39 +685,18 @@ void Parser::readValue(const Token* token)
 	case Token::FLOAT_LITERAL_TOKEN:
 		// Fall through
 	case Token::DOUBLE_LITERAL_TOKEN:
-<<<<<<< HEAD
 		if (_handler != NULL)
-=======
-		if (_handler != NULL)
->>>>>>> develop
 		{
 			_handler->value(token->asFloat());
 		}
 		break;
 	case Token::STRING_LITERAL_TOKEN:
-<<<<<<< HEAD
 		if (_handler != NULL)
-=======
-		if (_handler != NULL)
->>>>>>> develop
 		{
 			_handler->value(token->tokenString());
 		}
 		break;
 	case Token::SEPARATOR_TOKEN:
-<<<<<<< HEAD
-	{
-		if ( token->asChar() == '{' )
-		{
-			readObject();
-		}
-		else if ( token->asChar() == '[' )
-		{
-			readArray();
-		}
-		break;
-	}
-=======
 		{
 			if (token->asChar() == '{')
 			{
@@ -919,36 +710,23 @@ void Parser::readValue(const Token* token)
 		}
 	case Token::INVALID_TOKEN:
 		throw JSONException(format("Invalid token '%s' found", token->asString()));
->>>>>>> develop
 	}
 }
 
 
 void Parser::readArray()
 {
-<<<<<<< HEAD
 	if (_handler != NULL)
-=======
-	if (_handler != NULL)
->>>>>>> develop
 	{
 		_handler->startArray();
 	}
 
-<<<<<<< HEAD
 	if (readElements(true)) // First call is special: check for empty array
-=======
-	if (readElements(true)) // First call is special: check for empty array
->>>>>>> develop
 	{
 		while(readElements());
 	}
 
-<<<<<<< HEAD
 	if (_handler != NULL)
-=======
-	if (_handler != NULL)
->>>>>>> develop
 	{
 		_handler->endArray();
 	}
@@ -959,11 +737,7 @@ bool Parser::readElements(bool firstCall)
 {
 	const Token* token = nextToken();
 
-<<<<<<< HEAD
 	if (firstCall && token->is(Token::SEPARATOR_TOKEN) && token->asChar() == ']')
-=======
-	if (firstCall && token->is(Token::SEPARATOR_TOKEN) && token->asChar() == ']')
->>>>>>> develop
 	{
 		// End of array is possible for an empty array
 		return false;
@@ -975,17 +749,10 @@ bool Parser::readElements(bool firstCall)
 
 	if ( token->is(Token::SEPARATOR_TOKEN) )
 	{
-<<<<<<< HEAD
 		if (token->asChar() == ']')
 			return false; // End of array
 
 		if (token->asChar() == ',')
-=======
-		if (token->asChar() == ']')
-			return false; // End of array
-
-		if (token->asChar() == ',')
->>>>>>> develop
 			return true;
 
 		throw JSONException(format("Invalid separator '%c' found. Expecting , or ]", token->asChar()));

JSON/testsuite/src/JSONTest.cpp

@@ -47,12 +47,9 @@
 #include "Poco/File.h"
 #include "Poco/FileStream.h"
 #include "Poco/Glob.h"
-<<<<<<< HEAD
-=======
 #include "Poco/UTF8Encoding.h"
 #include "Poco/Latin1Encoding.h"
 #include "Poco/TextConverter.h"
->>>>>>> develop
 
 #include <set>
 
@@ -195,8 +192,7 @@ void JSONTest::testNumberProperty()
 	assert(value == 1969);
 }
 
-<<<<<<< HEAD
+
-=======
 #if defined(POCO_HAVE_INT64)
 
 
@@ -231,7 +227,6 @@ void JSONTest::testNumber64Property()
 
 #endif
 
->>>>>>> develop
 
 void JSONTest::testStringProperty()
 {
@@ -395,16 +390,11 @@ void JSONTest::testObjectProperty()
 	}
 
 	assert(result.type() == typeid(Object::Ptr));
-<<<<<<< HEAD
-
-	Object::Ptr object = result.extract<Object::Ptr>();
-=======
 	
 	Object::Ptr object = result.extract<Object::Ptr>();
 	assert (object->isObject("test"));
 	assert (!object->isArray("test"));
 
->>>>>>> develop
 	Var test = object->get("test");
 	assert(test.type() == typeid(Object::Ptr));
 	object = test.extract<Object::Ptr>();
@@ -416,8 +406,6 @@ void JSONTest::testObjectProperty()
 }
 
 
-<<<<<<< HEAD
-=======
 void JSONTest::testObjectArray()
 {
 	std::string json = "{ \"test\" : { \"test1\" : [1, 2, 3], \"test2\" : 4 } }";
@@ -448,7 +436,6 @@ void JSONTest::testObjectArray()
 }
 
 
->>>>>>> develop
 void JSONTest::testEmptyArray()
 {
 	std::string json = "[]";
@@ -848,8 +835,6 @@ void JSONTest::testInvalidJanssonFiles()
 }
 
 
-<<<<<<< HEAD
-=======
 void JSONTest::testInvalidUnicodeJanssonFiles()
 {
 	Poco::Path pathPattern(getTestFilesPath("invalid-unicode"));
@@ -894,7 +879,6 @@ void JSONTest::testInvalidUnicodeJanssonFiles()
 }
 
 
->>>>>>> develop
 void JSONTest::testTemplate()
 {
 	Template tpl;
@@ -908,8 +892,7 @@ void JSONTest::testTemplate()
 	tpl.render(data, std::cout);
 }
 
-<<<<<<< HEAD
+
-=======
 void JSONTest::testUnicode()
 {
 	const unsigned char supp[] = {0x61, 0xE1, 0xE9, 0x78, 0xED, 0xF3, 0xFA, 0x0};
@@ -944,7 +927,7 @@ void JSONTest::testUnicode()
 
 	assert(test.convert<std::string>() == original);
 }
->>>>>>> develop
+
 
 std::string JSONTest::getTestFilesPath(const std::string& type)
 {
@@ -966,15 +949,11 @@ std::string JSONTest::getTestFilesPath(const std::string& type)
 	if (Poco::File(pathPattern).exists())
 		validDir += '*';
 	else
-<<<<<<< HEAD
-		throw Poco::NotFoundException("cannot locate directory containing valid JSON test files");
-
-=======
 	{
 		std::cout << "Can't find " << validDir << std::endl;
 		throw Poco::NotFoundException("cannot locate directory containing valid JSON test files");
 	}
->>>>>>> develop
+
 	return validDir;
 }
 
@@ -987,22 +966,16 @@ CppUnit::Test* JSONTest::suite()
 	CppUnit_addTest(pSuite, JSONTest, testTrueProperty);
 	CppUnit_addTest(pSuite, JSONTest, testFalseProperty);
 	CppUnit_addTest(pSuite, JSONTest, testNumberProperty);
-<<<<<<< HEAD
-=======
 #if defined(POCO_HAVE_INT64)
 	CppUnit_addTest(pSuite, JSONTest, testNumber64Property);
 #endif
->>>>>>> develop
 	CppUnit_addTest(pSuite, JSONTest, testStringProperty);
 	CppUnit_addTest(pSuite, JSONTest, testEmptyObject);
 	CppUnit_addTest(pSuite, JSONTest, testDoubleProperty);
 	CppUnit_addTest(pSuite, JSONTest, testDouble2Property);
 	CppUnit_addTest(pSuite, JSONTest, testDouble3Property);
 	CppUnit_addTest(pSuite, JSONTest, testObjectProperty);
-<<<<<<< HEAD
-=======
 	CppUnit_addTest(pSuite, JSONTest, testObjectArray);
->>>>>>> develop
 	CppUnit_addTest(pSuite, JSONTest, testEmptyArray);
 	CppUnit_addTest(pSuite, JSONTest, testNestedArray);
 	CppUnit_addTest(pSuite, JSONTest, testNullElement);
@@ -1016,13 +989,9 @@ CppUnit::Test* JSONTest::suite()
 	CppUnit_addTest(pSuite, JSONTest, testQuery);
 	CppUnit_addTest(pSuite, JSONTest, testValidJanssonFiles);
 	CppUnit_addTest(pSuite, JSONTest, testInvalidJanssonFiles);
-<<<<<<< HEAD
-	CppUnit_addTest(pSuite, JSONTest, testTemplate);
-=======
 	CppUnit_addTest(pSuite, JSONTest, testInvalidUnicodeJanssonFiles);
 	CppUnit_addTest(pSuite, JSONTest, testTemplate);
 	CppUnit_addTest(pSuite, JSONTest, testUnicode);
->>>>>>> develop
 
 	return pSuite;
 }

JSON/testsuite/src/JSONTest.h

@@ -50,22 +50,16 @@ public:
 	void testTrueProperty();
 	void testFalseProperty();
 	void testNumberProperty();
-<<<<<<< HEAD
-=======
 #if defined(POCO_HAVE_INT64)
 	void testNumber64Property();
 #endif
->>>>>>> develop
 	void testStringProperty();
 	void testEmptyObject();
 	void testDoubleProperty();
 	void testDouble2Property();
 	void testDouble3Property();
 	void testObjectProperty();
-<<<<<<< HEAD
-=======
 	void testObjectArray();
->>>>>>> develop
 	void testEmptyArray();
 	void testNestedArray();
 	void testNullElement();
@@ -81,11 +75,8 @@ public:
 	void testInvalidJanssonFiles();
 	void testTemplate();
 	void testItunes();
-<<<<<<< HEAD
-=======
 	void testUnicode(); 
 	void testInvalidUnicodeJanssonFiles();
->>>>>>> develop
 
 	void setUp();
 	void tearDown();

Net/Net_vs110.vcxproj

@@ -347,18 +347,12 @@
     <ClInclude Include="include\Poco\Net\FTPClientSession.h"/>
     <ClInclude Include="include\Poco\Net\FTPStreamFactory.h"/>
     <ClInclude Include="include\Poco\Net\SocketAcceptor.h"/>
-<<<<<<< HEAD
-=======
     <ClInclude Include="include\Poco\Net\ParallelSocketAcceptor.h"/>
->>>>>>> develop
     <ClInclude Include="include\Poco\Net\SocketConnector.h"/>
     <ClInclude Include="include\Poco\Net\SocketNotification.h"/>
     <ClInclude Include="include\Poco\Net\SocketNotifier.h"/>
     <ClInclude Include="include\Poco\Net\SocketReactor.h"/>
-<<<<<<< HEAD
-=======
     <ClInclude Include="include\Poco\Net\ParallelSocketReactor.h"/>
->>>>>>> develop
     <ClInclude Include="include\Poco\Net\MailMessage.h"/>
     <ClInclude Include="include\Poco\Net\MailRecipient.h"/>
     <ClInclude Include="include\Poco\Net\MailStream.h"/>
@@ -381,10 +375,7 @@
     <ClCompile Include="src\DNS.cpp"/>
     <ClCompile Include="src\HostEntry.cpp"/>
     <ClCompile Include="src\IPAddress.cpp"/>
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\Net.cpp"/>
->>>>>>> develop
     <ClCompile Include="src\NetException.cpp"/>
     <ClCompile Include="src\NetworkInterface.cpp"/>
     <ClCompile Include="src\SocketAddress.cpp"/>

Net/Net_vs110.vcxproj.filters

@@ -351,12 +351,9 @@
     <ClInclude Include="include\Poco\Net\SocketAcceptor.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
-<<<<<<< HEAD
-=======
     <ClInclude Include="include\Poco\Net\ParallelSocketAcceptor.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
->>>>>>> develop
     <ClInclude Include="include\Poco\Net\SocketConnector.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
@@ -369,12 +366,9 @@
     <ClInclude Include="include\Poco\Net\SocketReactor.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
-<<<<<<< HEAD
-=======
     <ClInclude Include="include\Poco\Net\ParallelSocketReactor.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
->>>>>>> develop
     <ClInclude Include="include\Poco\Net\MailMessage.h">
       <Filter>Mail\Header Files</Filter>
     </ClInclude>
@@ -437,12 +431,9 @@
     <ClCompile Include="src\IPAddress.cpp">
       <Filter>NetCore\Source Files</Filter>
     </ClCompile>
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\Net.cpp">
       <Filter>NetCore\Source Files</Filter>
     </ClCompile>
->>>>>>> develop
     <ClCompile Include="src\NetException.cpp">
       <Filter>NetCore\Source Files</Filter>
     </ClCompile>

Net/Net_x64_vs110.vcxproj

@@ -345,18 +345,12 @@
     <ClInclude Include="include\Poco\Net\FTPClientSession.h"/>
     <ClInclude Include="include\Poco\Net\FTPStreamFactory.h"/>
     <ClInclude Include="include\Poco\Net\SocketAcceptor.h"/>
-<<<<<<< HEAD
-=======
     <ClInclude Include="include\Poco\Net\ParallelSocketAcceptor.h"/>
->>>>>>> develop
     <ClInclude Include="include\Poco\Net\SocketConnector.h"/>
     <ClInclude Include="include\Poco\Net\SocketNotification.h"/>
     <ClInclude Include="include\Poco\Net\SocketNotifier.h"/>
     <ClInclude Include="include\Poco\Net\SocketReactor.h"/>
-<<<<<<< HEAD
-=======
     <ClInclude Include="include\Poco\Net\ParallelSocketReactor.h"/>
->>>>>>> develop
     <ClInclude Include="include\Poco\Net\MailMessage.h"/>
     <ClInclude Include="include\Poco\Net\MailRecipient.h"/>
     <ClInclude Include="include\Poco\Net\MailStream.h"/>
@@ -379,10 +373,7 @@
     <ClCompile Include="src\DNS.cpp"/>
     <ClCompile Include="src\HostEntry.cpp"/>
     <ClCompile Include="src\IPAddress.cpp"/>
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\Net.cpp"/>
->>>>>>> develop
     <ClCompile Include="src\NetException.cpp"/>
     <ClCompile Include="src\NetworkInterface.cpp"/>
     <ClCompile Include="src\SocketAddress.cpp"/>

Net/Net_x64_vs110.vcxproj.filters

@@ -351,12 +351,9 @@
     <ClInclude Include="include\Poco\Net\SocketAcceptor.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
-<<<<<<< HEAD
-=======
     <ClInclude Include="include\Poco\Net\ParallelSocketAcceptor.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
->>>>>>> develop
     <ClInclude Include="include\Poco\Net\SocketConnector.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
@@ -369,12 +366,9 @@
     <ClInclude Include="include\Poco\Net\SocketReactor.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
-<<<<<<< HEAD
-=======
     <ClInclude Include="include\Poco\Net\ParallelSocketReactor.h">
       <Filter>Reactor\Header Files</Filter>
     </ClInclude>
->>>>>>> develop
     <ClInclude Include="include\Poco\Net\MailMessage.h">
       <Filter>Mail\Header Files</Filter>
     </ClInclude>
@@ -437,12 +431,9 @@
     <ClCompile Include="src\IPAddress.cpp">
       <Filter>NetCore\Source Files</Filter>
     </ClCompile>
-<<<<<<< HEAD
-=======
     <ClCompile Include="src\Net.cpp">
       <Filter>NetCore\Source Files</Filter>
     </ClCompile>
->>>>>>> develop
     <ClCompile Include="src\NetException.cpp">
       <Filter>NetCore\Source Files</Filter>
     </ClCompile>

Net/samples/SMTPLogger/Makefile

@@ -15,10 +15,7 @@ target_version = 1
 target_libs    = PocoNet PocoFoundation
 
 include $(POCO_BASE)/build/rules/exec
-<<<<<<< HEAD
-=======
 
 ifdef POCO_UNBUNDLED
         SYSLIBS += -lz
 endif
->>>>>>> develop

NetSSL_OpenSSL/CMakeLists.txt

@@ -1,8 +1,4 @@
 set(LIBNAME "PocoNetSSL")
-<<<<<<< HEAD
-set(LIBNAME "${LIBNAME}${LIB_EXT}")
-=======
->>>>>>> develop
 
 aux_source_directory(src SRCS)
 include_directories( ${OPENSSL_INCLUDE_DIR} )
@@ -15,11 +11,7 @@ add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} )
 set_target_properties( ${LIBNAME} 
 	PROPERTIES
 	VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} )
-<<<<<<< HEAD
-target_link_libraries( ${LIBNAME} PocoCrypto${LIB_EXT} PocoNet${LIB_EXT} PocoUtil${LIB_EXT} PocoFoundation${LIB_EXT} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} )
-=======
 target_link_libraries( ${LIBNAME} PocoCrypto PocoNet PocoUtil PocoFoundation ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} )
->>>>>>> develop
 
 install(
     DIRECTORY include/Poco

PDF/CMakeLists.txt

@@ -1,29 +1,17 @@
 set(LIBNAME "PocoPDF")
-<<<<<<< HEAD
-set(LIBNAME "${LIBNAME}${LIB_EXT}")
-=======
->>>>>>> develop
 
 aux_source_directory(src SRCS)
 include_directories(include/Poco/PDF) # zip src
 
 if (NOT POCO_STATIC)
-<<<<<<< HEAD
-  add_definitions(-DJSON_EXPORTS)
-=======
   add_definitions(-DPDF_EXPORTS)
->>>>>>> develop
 endif (NOT POCO_STATIC)
 
 add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} )
 set_target_properties( ${LIBNAME} 
 	PROPERTIES
 	VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} )
-<<<<<<< HEAD
-target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT})
-=======
 target_link_libraries( ${LIBNAME} PocoFoundation)
->>>>>>> develop
 
 install(
     DIRECTORY include/Poco

Util/CMakeLists.txt

@@ -1,8 +1,4 @@
 set(LIBNAME "PocoUtil")
-<<<<<<< HEAD
-set(LIBNAME "${LIBNAME}${LIB_EXT}")
-=======
->>>>>>> develop
 
 set( BASE_SRCS
 src/AbstractConfiguration.cpp
@@ -51,11 +47,7 @@ add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} )
 set_target_properties( ${LIBNAME} 
 	PROPERTIES
 	VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} )
-<<<<<<< HEAD
-target_link_libraries( ${LIBNAME} PocoJSON${LIB_EXT} PocoXML${LIB_EXT} PocoFoundation${LIB_EXT})
-=======
 target_link_libraries( ${LIBNAME} PocoJSON PocoXML PocoFoundation)
->>>>>>> develop
 
 install(
     DIRECTORY include/Poco

Util/include/Poco/Util/JSONConfiguration.h

@@ -36,37 +36,24 @@
 //
 
 
-<<<<<<< HEAD
-=======
 // Avoid accidental linking of JSON library when JSONConfiguration
 // is not desired.
 #ifndef POCO_UTIL_NO_JSONCONFIGURATION
 
 
->>>>>>> develop
 #ifndef Util_JSONConfiguration_INCLUDED
 #define Util_JSONConfiguration_INCLUDED
 
 
-<<<<<<< HEAD
-#include <istream>
-
-#include "Poco/Util/AbstractConfiguration.h"
-#include "Poco/JSON/Object.h"
-=======
 #include "Poco/Util/AbstractConfiguration.h"
 #include "Poco/JSON/Object.h"
 #include <istream>
 
->>>>>>> develop
 
 namespace Poco {
 namespace Util {
 
-<<<<<<< HEAD
-=======
 
->>>>>>> develop
 class Util_API JSONConfiguration : public AbstractConfiguration
 	/// This configuration class extracts configuration properties
 	/// from a JSON object. An XPath-like syntax for property
@@ -173,16 +160,11 @@ private:
  	JSON::Object::Ptr _object;
 };
 
-<<<<<<< HEAD
-=======
 
->>>>>>> develop
 } } // namespace Poco::Util
 
 
 #endif // Util_JSONConfiguration_INCLUDED
-<<<<<<< HEAD
+
-=======
 
 #endif // POCO_UTIL_NO_JSONCONFIGURATION
->>>>>>> develop

Util/samples/Units/src/Units.cpp

@@ -35,14 +35,6 @@
 #include "Poco/Util/Units.h"
 #include <iostream>
 
-<<<<<<< HEAD
-using namespace Poco::Util::Units::Values;
-using namespace Poco::Util::Units::Constants;
-
-using Poco::Util::Units::square;
-using Poco::Util::Units::cube;
-
-=======
 
 using namespace Poco::Util::Units::Values;
 using namespace Poco::Util::Units::Constants;
@@ -52,7 +44,6 @@ using Poco::Util::Units::square;
 using Poco::Util::Units::cube;
 
 
->>>>>>> develop
 namespace Poco {
 namespace Util {
 namespace Units {

Util/src/JSONConfiguration.cpp

@@ -32,8 +32,6 @@
 // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 //
-<<<<<<< HEAD
-=======
 
 
 // Avoid accidental linking of JSON library when JSONConfiguration
@@ -41,7 +39,6 @@
 #ifndef POCO_UTIL_NO_JSONCONFIGURATION
 
 
->>>>>>> develop
 #include "Poco/FileStream.h"
 #include "Poco/StringTokenizer.h"
 #include "Poco/Util/JSONConfiguration.h"
@@ -51,17 +48,10 @@
 #include "Poco/RegularExpression.h"
 #include "Poco/NumberParser.h"
 
-<<<<<<< HEAD
-namespace Poco
-{
-namespace Util
-{
-=======
 
 namespace Poco {
 namespace Util {
 
->>>>>>> develop
 
 JSONConfiguration::JSONConfiguration() : _object(new JSON::Object())
 {
@@ -133,148 +123,6 @@ bool JSONConfiguration::getRaw(const std::string & key, std::string & value) con
 
 
 void JSONConfiguration::getIndexes(std::string& name, std::vector<int>& indexes)
-<<<<<<< HEAD
-{
-	indexes.clear();
-
-	RegularExpression::MatchVec matches;
-	int firstOffset = -1;
-	int offset = 0;
-	RegularExpression regex("\\[([0-9]+)\\]");
-	while(regex.match(name, offset, matches) > 0 )
-	{
-		if ( firstOffset == -1 )
-		{
-			firstOffset = matches[0].offset;
-		}
-		std::string num = name.substr(matches[1].offset, matches[1].length);
-		indexes.push_back(NumberParser::parse(num));
-		offset = matches[0].offset + matches[0].length;
-	}
-
-	if ( firstOffset != -1 )
-	{
-		name = name.substr(0, firstOffset);
-	}
-}
-
-JSON::Object::Ptr JSONConfiguration::findStart(const std::string& key, std::string& lastPart)
-{
-	JSON::Object::Ptr currentObject = _object;
-
-	StringTokenizer tokenizer(key, ".");
-	lastPart = tokenizer[tokenizer.count() - 1];
-
-	for(int i = 0; i < tokenizer.count() - 1; ++i)
-	{
-		std::vector<int> indexes;
-		std::string name = tokenizer[i];
-		getIndexes(name, indexes);
-
-		DynamicAny result = currentObject->get(name);
-
-		if ( result.isEmpty() ) // Not found
-		{
-			if ( indexes.empty() ) // We want an object, create it
-			{
-				JSON::Object::Ptr newObject = new JSON::Object();
-				currentObject->set(name, newObject);
-				currentObject = newObject;
-			}
-			else // We need an array
-			{
-				JSON::Array::Ptr newArray;
-				JSON::Array::Ptr parentArray;
-				JSON::Array::Ptr topArray;
-				for(std::vector<int>::iterator it = indexes.begin(); it != indexes.end(); ++it)
-				{
-					newArray = new JSON::Array();
-					if ( topArray.isNull() )
-					{
-						topArray = newArray;
-					}
-
-					if ( ! parentArray.isNull() )
-					{
-						parentArray->add(newArray);
-					}
-
-					for(int i = 0; i <= *it - 1; ++i)
-					{
-						Poco::DynamicAny nullValue;
-						newArray->add(nullValue);
-					}
-
-					parentArray = newArray;
-				}
-
-				currentObject->set(name, topArray);
-				currentObject = new JSON::Object();
-				newArray->add(currentObject);
-			}
-		}
-		else // We have a value
-		{
-			if ( indexes.empty() ) // We want an object
-			{
-				if ( result.type() == typeid(JSON::Object::Ptr) )
-				{
-					currentObject = result.extract<JSON::Object::Ptr>();
-				}
-				else
-				{
-					throw SyntaxException("Expected a JSON object");
-				}
-			}
-			else
-			{
-				if ( result.type() == typeid(JSON::Array::Ptr) )
-				{
-					JSON::Array::Ptr arr = result.extract<JSON::Array::Ptr>();
-
-					for(std::vector<int>::iterator it = indexes.begin(); it != indexes.end() - 1; ++it)
-					{
-						JSON::Array::Ptr currentArray = arr;
-						arr = arr->getArray(*it);
-						if ( arr.isNull() )
-						{
-							arr = new JSON::Array();
-							currentArray->add(arr);
-						}
-					}
-
-					result = arr->get(*indexes.rbegin());
-					if ( result.isEmpty() ) // Index doesn't exist
-					{
-						JSON::Object::Ptr newObject = new JSON::Object();
-						arr->add(newObject);
-						currentObject = newObject;
-					}
-					else // Index is available
-					{
-						if ( result.type() == typeid(JSON::Object::Ptr) )
-						{
-							currentObject = result.extract<JSON::Object::Ptr>();
-						}
-						else
-						{
-							throw SyntaxException("Expected a JSON object");
-						}
-					}
-				}
-				else
-				{
-					throw SyntaxException("Expected a JSON array");
-				}
-			}
-		}
-	}
-	return currentObject;
-}
-
-void JSONConfiguration::setValue(const std::string& key, const Poco::DynamicAny& value)
-=======
->>>>>>> develop
 {
 	indexes.clear();
 
@@ -419,10 +267,6 @@ void JSONConfiguration::setValue(const std::string& key, const Poco::DynamicAny&
 {
 
 	std::string sValue;
-<<<<<<< HEAD
-=======
-	
->>>>>>> develop
 	value.convert<std::string>(sValue);
 	KeyValue kv(key, sValue);
 	
@@ -439,15 +283,6 @@ void JSONConfiguration::setValue(const std::string& key, const Poco::DynamicAny&
 	std::vector<int> indexes;
 	getIndexes(lastPart, indexes);
 
-<<<<<<< HEAD
-	std::string lastPart;
-	JSON::Object::Ptr parentObject = findStart(key, lastPart);
-
-	std::vector<int> indexes;
-	getIndexes(lastPart, indexes);
-
-=======
->>>>>>> develop
 	if ( indexes.empty() ) // No Array
 	{
 		parentObject->set(lastPart, value);
@@ -492,54 +327,12 @@ void JSONConfiguration::setValue(const std::string& key, const Poco::DynamicAny&
 	}
 }
 
-<<<<<<< HEAD
-void JSONConfiguration::setString(const std::string& key, const std::string& value)
-{
-	setValue(key, value);
-}
-
-
-void JSONConfiguration::setRaw(const std::string& key, const std::string& value)
-{
-	setValue(key, value);
-}
-
-void JSONConfiguration::setInt(const std::string& key, int value)
-{
-	setValue(key, value);
-}
-
-void JSONConfiguration::setBool(const std::string& key, bool value)
-{
-	setValue(key, value);
-}
-
-void JSONConfiguration::setDouble(const std::string& key, double value)
-=======
 
 void JSONConfiguration::setString(const std::string& key, const std::string& value)
->>>>>>> develop
 {
 	setValue(key, value);
 }
 
-<<<<<<< HEAD
-void JSONConfiguration::enumerate(const std::string& key, Keys& range) const
-{
-	JSON::Query query(_object);
-	Poco::DynamicAny result = query.find(key);
-	if ( result.type() == typeid(JSON::Object::Ptr) )
-	{
-		JSON::Object::Ptr object = result.extract<JSON::Object::Ptr>();
-		object->getNames(range);
-	}
-}
-
-
-void JSONConfiguration::save(std::ostream& ostr, unsigned int indent) const
-{
-	_object->stringify(ostr, indent);
-=======
 
 void JSONConfiguration::setRaw(const std::string& key, const std::string& value)
 {
@@ -574,7 +367,6 @@ void JSONConfiguration::enumerate(const std::string& key, Keys& range) const
 		JSON::Object::Ptr object = result.extract<JSON::Object::Ptr>();
 		object->getNames(range);
 	}
->>>>>>> develop
 }
 
 
@@ -587,15 +379,8 @@ void JSONConfiguration::save(std::ostream& ostr, unsigned int indent) const
 void JSONConfiguration::removeRaw(const std::string& key)
 
 {
-<<<<<<< HEAD
 	std::string lastPart;
 	JSON::Object::Ptr parentObject = findStart(key, lastPart);
-	
-=======
-	
-	std::string lastPart;
-	JSON::Object::Ptr parentObject = findStart(key, lastPart);
->>>>>>> develop
 	std::vector<int> indexes;
 	getIndexes(lastPart, indexes);
 
@@ -606,14 +391,8 @@ void JSONConfiguration::removeRaw(const std::string& key)
 	else
 	{
 		DynamicAny result = parentObject->get(lastPart);
-<<<<<<< HEAD
 		if (!result.isEmpty() && result.type() == typeid(JSON::Array::Ptr))
 		{
-=======
-		if (!result.isEmpty() && result.type() == typeid(JSON::Array::Ptr))
-		{
-
->>>>>>> develop
 			JSON::Array::Ptr arr = result.extract<JSON::Array::Ptr>();
 			for(std::vector<int>::iterator it = indexes.begin(); it != indexes.end() - 1; ++it)
 			{
@@ -622,11 +401,6 @@ void JSONConfiguration::removeRaw(const std::string& key)
 			arr->remove(indexes.back());
 		}
 	}
-<<<<<<< HEAD
-}
-
-}} // Namespace Poco::Util
-=======
 
 }
 
@@ -634,4 +408,3 @@ void JSONConfiguration::removeRaw(const std::string& key)
 } } // namespace Poco::Util
 
 #endif // POCO_UTIL_NO_JSONCONFIGURATION
->>>>>>> develop

Util/testsuite/src/JSONConfigurationTest.cpp

@@ -28,21 +28,15 @@
 // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 //
-<<<<<<< HEAD
-=======
 
 
->>>>>>> develop
 #include "JSONConfigurationTest.h"
 #include "CppUnit/TestCaller.h"
 #include "CppUnit/TestSuite.h"
 #include "Poco/Util/JSONConfiguration.h"
 #include "Poco/JSON/JSONException.h"
 
-<<<<<<< HEAD
-=======
 
->>>>>>> develop
 using Poco::Util::JSONConfiguration;
 using Poco::Util::AbstractConfiguration;
 using Poco::AutoPtr;
@@ -111,10 +105,7 @@ void JSONConfigurationTest::testLoad()
 
 }
 
-<<<<<<< HEAD
-=======
 
->>>>>>> develop
 AbstractConfiguration* JSONConfigurationTest::allocConfiguration() const
 {
 	return new JSONConfiguration;

XML/CMakeLists.txt

@@ -1,8 +1,4 @@
 set(LIBNAME "PocoXML")
-<<<<<<< HEAD
-set(LIBNAME "${LIBNAME}${LIB_EXT}")
-=======
->>>>>>> develop
 
 aux_source_directory(src SRCS)
 
@@ -12,11 +8,7 @@ add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} )
 set_target_properties( ${LIBNAME} 
 	PROPERTIES 
 	VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} )
-<<<<<<< HEAD
-target_link_libraries( ${LIBNAME} PocoFoundation${LIB_EXT})
-=======
 target_link_libraries( ${LIBNAME} PocoFoundation)
->>>>>>> develop
 
 install(
     DIRECTORY include/Poco

Zip/CMakeLists.txt

@@ -1,8 +1,4 @@
 set(LIBNAME "PocoZip")
-<<<<<<< HEAD
-set(LIBNAME "${LIBNAME}${LIB_EXT}")
-=======
->>>>>>> develop
 
 aux_source_directory(src SRCS)
 
@@ -14,11 +10,7 @@ add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} )
 set_target_properties( ${LIBNAME} 
 	PROPERTIES
 	VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} )
-<<<<<<< HEAD
-target_link_libraries( ${LIBNAME} PocoUtil${LIB_EXT} PocoXML${LIB_EXT} PocoFoundation${LIB_EXT})
-=======
 target_link_libraries( ${LIBNAME} PocoUtil PocoXML PocoFoundation)
->>>>>>> develop
 
 install(
     DIRECTORY include/Poco