github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

uppsrc: Fixed various MSC related warnings/errors

Browse source
This commit is contained in:
Mirek Fidler 2024-07-24 15:16:25 +02:00
parent c49a6a76ac
commit 9ef11deca3
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/Inet.h
View file

@ -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);

6
uppsrc/Core/JSON.h
View file

@ -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); }

3
uppsrc/ide/InstantSetup.cpp
View file

@ -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", "");

2
uppsrc/plugin/sqlite3/lib/sqlite3mc_amalgamation.c
View file

@ -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();
}