BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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.)

Browse source 
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:
John Kessenich 2014-02-18 23:37:57 +00:00
parent 52c351442c
commit 51cdd90fa8
15 changed files with 72 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

10
glslang/MachineIndependent/preprocessor/PpAtom.cpp
View file

@ -96,7 +96,7 @@ using namespace glslang;
const struct {
int val;
const char *str;
const char* str;
} tokens[] = {
{ CPP_AND_OP, "&&" },
{ CPP_AND_ASSIGN, "&=" },
@ -128,7 +128,7 @@ namespace glslang {
//
// Map a new or existing string to an atom, inventing a new atom if necessary.
//
int TPpContext::LookUpAddString(const char *s)
int TPpContext::LookUpAddString(const char* s)
{
TAtomMap::const_iterator it = atomMap.find(s);
if (it == atomMap.end())
@ -140,7 +140,7 @@ int TPpContext::LookUpAddString(const char *s)
//
// Map an already created atom to its string.
//
const char *TPpContext::GetAtomString(int atom)
const char* TPpContext::GetAtomString(int atom)
{
if (atom == 0)
return "<null atom>";
@ -159,7 +159,7 @@ const char *TPpContext::GetAtomString(int atom)
//
// Add forced mapping of string to atom.
//
int TPpContext::AddAtomFixed(const char *s, int atom)
int TPpContext::AddAtomFixed(const char* s, int atom)
{
TAtomMap::const_iterator it = atomMap.insert(std::pair<TString, int>(s, atom)).first;
if (stringMap.size() < (size_t)atom + 1)
@ -175,7 +175,7 @@ int TPpContext::AddAtomFixed(const char *s, int atom)
void TPpContext::InitAtomTable()
{
// Add single character tokens to the atom table:
const char *s = "~!%^&*()-+=|,.<>/?;:[]{}#";
const char* s = "~!%^&*()-+=|,.<>/?;:[]{}#";
char t[2];
t[1] = '\0';