Amebis/WinStd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve overlapping variable name warnings

Browse Source
This commit is contained in:
Simon Rozman 2018-08-31 13:24:21 +02:00
parent 82eee72e46
commit 567969bcfb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/WinStd/COM.h
View File

@ -968,9 +968,9 @@ namespace winstd
/// ///
/// \sa [VariantChangeType function](https://msdn.microsoft.com/en-us/library/windows/desktop/ms221258.aspx) /// \sa [VariantChangeType function](https://msdn.microsoft.com/en-us/library/windows/desktop/ms221258.aspx)
/// ///
inline HRESULT change_type(_In_ VARTYPE vt, _In_opt_ USHORT wFlags = 0) inline HRESULT change_type(_In_ VARTYPE _vt, _In_opt_ USHORT wFlags = 0)
{ {
return VariantChangeType(this, this, wFlags, vt); return VariantChangeType(this, this, wFlags, _vt);
} }
private: private:

6
include/WinStd/Common.h
View File

@ -1727,10 +1727,10 @@ inline int vsprintf(_Out_ std::basic_string<_Elem, _Traits, _Ax> &str, _In_z_ _P
} else { } else {
for (size_t capacity = 2*WINSTD_STACK_BUFFER_BYTES/sizeof(_Elem);; capacity *= 2) { for (size_t capacity = 2*WINSTD_STACK_BUFFER_BYTES/sizeof(_Elem);; capacity *= 2) {
// Allocate on heap and retry. // Allocate on heap and retry.
std::unique_ptr<_Elem[]> buf(new _Elem[capacity]); std::unique_ptr<_Elem[]> buf_dyn(new _Elem[capacity]);
count = vsnprintf(buf.get(), capacity - 1, format, arg); count = vsnprintf(buf_dyn.get(), capacity - 1, format, arg);
if (count >= 0) { if (count >= 0) {
str.assign(buf.get(), count); str.assign(buf_dyn.get(), count);
break; break;
} }
} }