From bfbcd808d8dfe8c098e96c72da6c430614cd1a45 Mon Sep 17 00:00:00 2001
From: jxd134 <jinxd134@foxmail.com>
Date: Tue, 16 Feb 2016 13:20:46 +0800
Subject: [PATCH 1/2] visual studio 2013 to visual studio 2015

---
 TinySTL/TinySTL.vcxproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/TinySTL/TinySTL.vcxproj b/TinySTL/TinySTL.vcxproj
index c177dde..354a82e 100644
--- a/TinySTL/TinySTL.vcxproj
+++ b/TinySTL/TinySTL.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -19,13 +19,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

From 1783d7df5824b7f1c2fffcf4782d4b87fff59436 Mon Sep 17 00:00:00 2001
From: jxd134 <jinxd134@foxmail.com>
Date: Fri, 26 Feb 2016 20:33:52 +0800
Subject: [PATCH 2/2] the return value of difference_type function in
 iterator.h is difference_type*

---
 TinySTL/Detail/Alloc.cpp | 2 ++
 TinySTL/Iterator.h       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/TinySTL/Detail/Alloc.cpp b/TinySTL/Detail/Alloc.cpp
index 260f48f..ead46f1 100644
--- a/TinySTL/Detail/Alloc.cpp
+++ b/TinySTL/Detail/Alloc.cpp
@@ -1,9 +1,11 @@
 #include "../Alloc.h"
 
 namespace TinySTL{
+
 	char *alloc::start_free = 0;
 	char *alloc::end_free = 0;
 	size_t alloc::heap_size = 0;
+
 	alloc::obj *alloc::free_list[alloc::ENFreeLists::NFREELISTS] = {
 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	};
diff --git a/TinySTL/Iterator.h b/TinySTL/Iterator.h
index e2457dc..fb56b57 100644
--- a/TinySTL/Iterator.h
+++ b/TinySTL/Iterator.h
@@ -101,7 +101,7 @@ namespace TinySTL{
 		return static_cast<typename iterator_traits<Iterator>::value_type*>(0);
 	}
 	template<class Iterator>
-	inline typename iterator_traits<Iterator>::difference_type
+	inline typename iterator_traits<Iterator>::difference_type*
 		difference_type(const Iterator& It){
 		return static_cast<typename iterator_traits<Iterator>::difference_type*>(0);
 	}