github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Functions4U: Updated namespaces and time callbacks

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@11810 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2018-03-02 13:47:43 +00:00
parent 4f506897a0
commit 4e05e6b41d
19 changed files with 245 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

9
bazaar/Functions4U/Functions4U.cpp
View file

@ -1,7 +1,9 @@
#include <Core/Core.h>
#include "Functions4U.h"
using namespace Upp;
#ifdef PLATFORM_WIN32 // || defined (PLATFORM_WIN64)
#define Ptr Ptr_
#define byte byte_
@ -19,7 +21,7 @@
#undef CY
#endif
NAMESPACE_UPP
//NAMESPACE_UPP
#define TFILE <Functions4U/Functions4U.t>
#include <Core/t.h>
@ -2120,7 +2122,7 @@ bool FileDataArray::SaveFile(const char *fileName) {
}
bool FileDataArray::AppendFile(const char *fileName) {
return Upp::AppendFile(fileName, GetFileText());
return ::AppendFile(fileName, GetFileText());
}
bool FileDataArray::LoadFile(const char *fileName)
@ -2652,7 +2654,6 @@ int SysX(const char *cmd, String& out, String& err, double timeOut,
return IsNull(ret) ? 0 : ret;
}
END_UPP_NAMESPACE
// Dummy functions added after TheIDE change
Upp::String GetCurrentMainPackage() {return "dummy";}