remove some warnings with VS2013

in time::time(unsigned hour, unsigned minute, unsigned second) constructor, add return statement if args are valid
This commit is contained in:
beru
2015-05-04 02:18:25 +09:00
parent 1b01493e9f
commit 49cc9b1ff7
5 changed files with 74 additions and 33 deletions

View File

@@ -24,7 +24,7 @@
#include <codecvt>
#endif
#if defined(NANA_MINGW)
#if defined(NANA_WINDOWS)
#include <windows.h>
#endif
@@ -54,7 +54,7 @@ namespace nana
mbstr.clear();
return true;
}
#if defined(NANA_MINGW)
#if defined(NANA_WINDOWS)
int bytes = ::WideCharToMultiByte(CP_ACP, 0, s, -1, 0, 0, 0, 0);
if(bytes > 1)
{
@@ -87,7 +87,7 @@ namespace nana
wcstr.clear();
return true;
}
#if defined(NANA_MINGW)
#if defined(NANA_WINDOWS)
int chars = ::MultiByteToWideChar(CP_ACP, 0, s, -1, 0, 0);
if(chars > 1)
{
@@ -119,7 +119,7 @@ namespace nana
wcstr.clear();
return true;
}
#if defined(NANA_MINGW)
#if defined(NANA_WINDOWS)
int chars = ::MultiByteToWideChar(CP_ACP, 0, s, -1, 0, 0);
if(chars > 1)
{