Fix the few non-portable uses of "char" (where a -1 might be relevant): All uses of char are now either "int", "unsigned char" or char arrays for storing strings. Also, went to consistent "char* foo" coding convention. (There were only a few ambiguous uses.)
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@25400 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
parent
52c351442c
commit
51cdd90fa8
15 changed files with 72 additions and 72 deletions
|
|
@ -232,7 +232,7 @@ protected:
|
|||
int ifdepth; // current #if-#else-#endif nesting in the cpp.c file (pre-processor)
|
||||
bool elseSeen[maxIfNesting]; // Keep a track of whether an else has been seen at a particular depth
|
||||
int elsetracker; // #if-#else and #endif constructs...Counter.
|
||||
const char *ErrMsg;
|
||||
const char* ErrMsg;
|
||||
|
||||
class tMacroInput : public tInput {
|
||||
public:
|
||||
|
|
@ -371,17 +371,17 @@ protected:
|
|||
class tStringInput : public tInput {
|
||||
public:
|
||||
tStringInput(TPpContext* pp, TInputScanner& i) : tInput(pp), input(&i) { }
|
||||
virtual int scan(TPpToken *);
|
||||
virtual int scan(TPpToken*);
|
||||
virtual int getch();
|
||||
virtual void ungetch();
|
||||
protected:
|
||||
TInputScanner* input;
|
||||
};
|
||||
|
||||
int InitScanner(TPpContext *cpp);
|
||||
int ScanFromString(char *s);
|
||||
int InitScanner(TPpContext* cpp);
|
||||
int ScanFromString(char* s);
|
||||
void missingEndifCheck();
|
||||
int lFloatConst(char *str, int len, int ch, TPpToken * ppToken);
|
||||
int lFloatConst(char* str, int len, int ch, TPpToken* ppToken);
|
||||
|
||||
bool inComment;
|
||||
|
||||
|
|
@ -394,17 +394,17 @@ protected:
|
|||
TStringMap stringMap;
|
||||
int nextAtom;
|
||||
void InitAtomTable();
|
||||
int AddAtomFixed(const char *s, int atom);
|
||||
int LookUpAddString(const char *s);
|
||||
const char *GetAtomString(int atom);
|
||||
int AddAtomFixed(const char* s, int atom);
|
||||
int LookUpAddString(const char* s);
|
||||
const char* GetAtomString(int atom);
|
||||
|
||||
//
|
||||
// From PpMemory.cpp
|
||||
//
|
||||
MemoryPool *mem_CreatePool(size_t chunksize, unsigned align);
|
||||
void mem_FreePool(MemoryPool *);
|
||||
void *mem_Alloc(MemoryPool *p, size_t size);
|
||||
int mem_AddCleanup(MemoryPool *p, void (*fn)(void *, void*), void *arg1, void* arg2);
|
||||
void mem_FreePool(MemoryPool*);
|
||||
void *mem_Alloc(MemoryPool* p, size_t size);
|
||||
int mem_AddCleanup(MemoryPool* p, void (*fn)(void *, void*), void* arg1, void* arg2);
|
||||
};
|
||||
|
||||
} // end namespace glslang
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue