diff --git a/uppsrc/Core/Inet.h b/uppsrc/Core/Inet.h index abb811c9e..c4a62ac44 100644 --- a/uppsrc/Core/Inet.h +++ b/uppsrc/Core/Inet.h @@ -738,7 +738,7 @@ public: dword GetWaitEvents() const { return WAIT_READ|(!!out_queue.GetCount() * WAIT_WRITE); } SOCKET GetSOCKET() const { return socket ? socket->GetSOCKET() : INVALID_SOCKET; } - String GetPeerAddr() const { return socket ? socket->GetPeerAddr() : ""; } + String GetPeerAddr() const { return socket ? socket->GetPeerAddr() : String(); } void AddTo(SocketWaitEvent& e) { e.Add(*socket, GetWaitEvents()); } static void Trace(bool b = true); diff --git a/uppsrc/Core/JSON.h b/uppsrc/Core/JSON.h index 8b5642bcc..34014a917 100644 --- a/uppsrc/Core/JSON.h +++ b/uppsrc/Core/JSON.h @@ -1,9 +1,9 @@ Value ParseJSON(CParser& p); Value ParseJSON(const char *s); -inline String AsJSON(int i) { return IsNull(i) ? "null" : AsString(i); } -inline String AsJSON(double n) { return IsNull(n) ? "null" : AsString(n); } -inline String AsJSON(float f) { return IsNull(f) ? "null" : AsString(f); } +inline String AsJSON(int i) { return IsNull(i) ? String("null") : AsString(i); } +inline String AsJSON(double n) { return IsNull(n) ? String("null") : AsString(n); } +inline String AsJSON(float f) { return IsNull(f) ? String("null") : AsString(f); } inline String AsJSON(bool b) { return b ? "true" : "false"; } inline String AsJSON(const String& s) { return AsCString(s, INT_MAX, NULL, ASCSTRING_JSON); } inline String AsJSON(const WString& s) { return AsCString(s.ToString(), INT_MAX, NULL, ASCSTRING_JSON); } diff --git a/uppsrc/ide/InstantSetup.cpp b/uppsrc/ide/InstantSetup.cpp index 6a1df70a8..62a946ca0 100644 --- a/uppsrc/ide/InstantSetup.cpp +++ b/uppsrc/ide/InstantSetup.cpp @@ -359,7 +359,8 @@ void InstantSetup() bm.GetAdd("BUILDER") = builder; bmSet(bm, "COMPILER", ""); - bmSet(bm, "COMMON_OPTIONS", x64 ? "/bigobj" : "/bigobj /D_ATL_XP_TARGETING"); + bmSet(bm, "COMMON_OPTIONS", x64 ? "/bigobj -D_CRT_SECURE_NO_WARNINGS" + : "/bigobj /D_ATL_XP_TARGETING -D_CRT_SECURE_NO_WARNINGS"); bmSet(bm, "COMMON_CPP_OPTIONS", ""); bmSet(bm, "COMMON_C_OPTIONS", ""); bmSet(bm, "COMMON_FLAGS", ""); diff --git a/uppsrc/plugin/sqlite3/lib/sqlite3mc_amalgamation.c b/uppsrc/plugin/sqlite3/lib/sqlite3mc_amalgamation.c index fcf894364..aa80f13dd 100644 --- a/uppsrc/plugin/sqlite3/lib/sqlite3mc_amalgamation.c +++ b/uppsrc/plugin/sqlite3/lib/sqlite3mc_amalgamation.c @@ -222489,7 +222489,7 @@ SQLITE_API sqlite3rbu *sqlite3rbu_vacuum( ){ if( zTarget==0 ){ return rbuMisuseError(); } if( zState ){ - int n = strlen(zState); + int n = (int)strlen(zState); if( n>=7 && 0==memcmp("-vactmp", &zState[n-7], 7) ){ return rbuMisuseError(); }