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

ide: Fixed to compile with GCC

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7547 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-07-28 09:27:06 +00:00
parent 4cf361b176
commit d93f1870c6
5 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/CppBase/CppBase.h
View file

@ -205,13 +205,13 @@ inline bool IsCppTemplate(int i) {
return i == STRUCTTEMPLATE || i >= FUNCTIONTEMPLATE && i <= CLASSFUNCTIONTEMPLATE;
}
enum {
enum AccessEnum {
PUBLIC,
PROTECTED,
PRIVATE,
};
enum {
enum FileTypeEnum {
FILE_H,
FILE_HPP,
FILE_CPP,

2
uppsrc/CppBase/Qualify.cpp
View file

@ -178,14 +178,12 @@ String QualifyIds(Scopefo& nf, const String& k, bool all)
String Qualify(const CppBase& base, const String& scope, const String& type)
{
Scopefo nf(base, scope);
byte dummy = 2;
return QualifyIds(nf, type, true);
}
String QualifyKey(const CppBase& base, const String& scope, const String& type)
{
Scopefo nf(base, scope);
byte dummy = 2;
return QualifyIds(nf, type, false);
}

2
uppsrc/ide/Browser/Browser.h
View file

@ -42,7 +42,7 @@ const CppItem *GetCodeRefItem(const String& ref);
int GetMatchLen(const char *s, const char *t);
enum { WITHBODY = 33 };
enum WithBodyEnum { WITHBODY = 33 };
inline Font BrowserFont()
#ifdef PLATFORM_WIN32

2
uppsrc/ide/Browser/init
View file

@ -4,7 +4,7 @@
#include "ide\Common/init"
#include "PdfDraw/init"
#include "RichEdit/init"
#define BLITZ_INDEX__ F09f1bfac1925f12219a612fc7165f5a9
#define BLITZ_INDEX__ F93222d80ec8e06ccbdf5f9e1c0bd4535
#include "TopicI.icpp"
#undef BLITZ_INDEX__
#endif

4
uppsrc/ide/Navigator.cpp
View file

@ -198,8 +198,8 @@ void AssistEditor::NavigatorDisplay::Paint(Draw& w, const Rect& r, const Value&
Size AssistEditor::NavigatorDisplay::GetStdSize(const Value& q) const
{
return Size(DoPaint(NilDraw(), Size(999999, 999999), q, White(), White(), 0),
2 * Draw::GetStdFontCy());
NilDraw w;
return Size(DoPaint(w, Size(999999, 999999), q, White(), White(), 0), 2 * Draw::GetStdFontCy());
}
void AssistEditor::Search()