Fix build break due to release/2.0 to master merge

obastemur · obastemur · commit 9fc653430f4a · 2017-04-08T16:31:07.000+02:00
diff --git a/lib/Common/Codex/Utf8Helper.h b/lib/Common/Codex/Utf8Helper.h
@@ -47,9 +47,9 @@ namespace utf8
     }
 
     template <class Allocator>
-    HRESULT WideStringToNarrow(_In_ LPCWSTR sourceString, size_t sourceCount, _Out_ LPSTR* destStringPtr, _Out_ size_t* destCount)
+    HRESULT WideStringToNarrow(_In_ LPCWSTR sourceString, size_t sourceCount, _Out_ LPSTR* destStringPtr, _Out_ size_t* destCount, size_t* allocateCount = nullptr)
     {
-        return WideStringToNarrow(Allocator::allocate, sourceString, sourceCount, destStringPtr, destCount);
+        return WideStringToNarrow(Allocator::allocate, sourceString, sourceCount, destStringPtr, destCount, allocateCount);
     }
 
     ///
@@ -115,7 +115,7 @@ namespace utf8
         }
         return S_OK;
     }
-    
+
     template <class Allocator>
     HRESULT NarrowStringToWide(_In_ LPCSTR sourceString, size_t sourceCount, _Out_ LPWSTR* destStringPtr, _Out_ size_t* destCount, size_t* allocateCount = nullptr)
     {

Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,9 @@ namespace utf8`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`template <class Allocator>`
`50`		`- HRESULT WideStringToNarrow(_In_ LPCWSTR sourceString, size_t sourceCount, _Out_ LPSTR* destStringPtr, _Out_ size_t* destCount)`
	`50`	`+ HRESULT WideStringToNarrow(_In_ LPCWSTR sourceString, size_t sourceCount, _Out_ LPSTR* destStringPtr, _Out_ size_t* destCount, size_t* allocateCount = nullptr)`
`51`	`51`	`{`
`52`		`- return WideStringToNarrow(Allocator::allocate, sourceString, sourceCount, destStringPtr, destCount);`
	`52`	`+ return WideStringToNarrow(Allocator::allocate, sourceString, sourceCount, destStringPtr, destCount, allocateCount);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`///`
`@@ -115,7 +115,7 @@ namespace utf8`
`115`	`115`	`}`
`116`	`116`	`return S_OK;`
`117`	`117`	`}`
`118`		`-`
	`118`	`+`
`119`	`119`	`template <class Allocator>`
`120`	`120`	`HRESULT NarrowStringToWide(_In_ LPCSTR sourceString, size_t sourceCount, _Out_ LPWSTR* destStringPtr, _Out_ size_t* destCount, size_t* allocateCount = nullptr)`
`121`	`121`	`{`