github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-30 23:02:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

U++: fixed sources to support c++0x (rm #269)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@4818 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2012-04-19 07:51:23 +00:00
parent a2cdb45a7b
commit 4a31c85643
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/Util.cpp
View file

@ -540,7 +540,7 @@ String Decode64(const String& s)
for(;;)
{
byte ea = *p++ - ' ' - 1, eb = *p++ - ' ' - 1, ec = *p++ - ' ' - 1, ed = *p++ - ' ' - 1;
byte out[3] = { (ea << 2) | (eb >> 4), (eb << 4) | (ec >> 2), (ec << 6) | (ed >> 0) };
byte out[3] = { byte((ea << 2) | (eb >> 4)), byte((eb << 4) | (ec >> 2)), byte((ec << 6) | (ed >> 0)) };
switch(len)
{
case 1: dec.Cat(out[0]); return dec;

2
uppsrc/CtrlLib/ArrayCtrl.cpp
View file

@ -2772,7 +2772,7 @@ static String sCsvFormat(const Value& v)
String ArrayCtrl::AsCsv(bool sel, int sep, bool hdr)
{
char h[2] = { sep, 0 };
char h[2] = { (char)sep, 0 };
return AsText(sCsvFormat, sel, h, "\r\n", hdr ? h : NULL, "\r\n");
}

2
uppsrc/CtrlLib/DateTimeCtrl.h
View file

@ -450,7 +450,7 @@ class DateTimeCtrl : public T {
int width = sz.cx;
int height = sz.cy;
Rect rw = Ctrl::GetWorkArea();
Rect rw = this->Ctrl::GetWorkArea();
Rect rs = this->GetScreenRect();
Rect r;
r.left = rs.left;

4
uppsrc/ide/Common/Util.cpp
View file

@ -54,9 +54,9 @@ bool SaveChangedFileFinish(const String& filename, const String& data)
return SaveFileFinish(filename, data);
}
typedef VectorMap<String, String> StringMap;
typedef VectorMap<String, String> sStringMap;
GLOBAL_VAR(StringMap, sWorkspaceCfg)
GLOBAL_VAR(sStringMap, sWorkspaceCfg)
GLOBAL_VAR(Vector<Callback>, sWorkspaceCfgFlush)
void RegisterWorkspaceConfig(const char *name)

2
uppsrc/ide/ide.upp
View file

@ -87,7 +87,7 @@ file
Copying;
mainconfig
"" = "GUI SVO_VALUE",
"" = "GUI",
"" = "GUI .USEMALLOC",
"" = ".NOGTK GUI",
"" = "GUI HEAPDBG CHECKINIT",