Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
glslang
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
glslang
Commits
4c64a40d
Commit
4c64a40d
authored
Feb 21, 2017
by
David Neto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add override where needed by clang++
Otherwise we get an error when we have both -Werror and -Winconsistent-missing-override. This is required for building with NDK r14 betas
parent
8f674e82
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
SymbolTable.h
glslang/MachineIndependent/SymbolTable.h
+7
-7
No files found.
glslang/MachineIndependent/SymbolTable.h
View file @
4c64a40d
...
@@ -229,11 +229,11 @@ public:
...
@@ -229,11 +229,11 @@ public:
returnType
.
shallowCopy
(
retType
);
returnType
.
shallowCopy
(
retType
);
declaredBuiltIn
=
retType
.
getQualifier
().
builtIn
;
declaredBuiltIn
=
retType
.
getQualifier
().
builtIn
;
}
}
virtual
TFunction
*
clone
()
const
;
virtual
TFunction
*
clone
()
const
override
;
virtual
~
TFunction
();
virtual
~
TFunction
();
virtual
TFunction
*
getAsFunction
()
{
return
this
;
}
virtual
TFunction
*
getAsFunction
()
override
{
return
this
;
}
virtual
const
TFunction
*
getAsFunction
()
const
{
return
this
;
}
virtual
const
TFunction
*
getAsFunction
()
const
override
{
return
this
;
}
virtual
void
addParameter
(
TParameter
&
p
)
virtual
void
addParameter
(
TParameter
&
p
)
{
{
...
@@ -251,10 +251,10 @@ public:
...
@@ -251,10 +251,10 @@ public:
mangledName
.
insert
(
0
,
prefix
);
mangledName
.
insert
(
0
,
prefix
);
}
}
virtual
const
TString
&
getMangledName
()
const
{
return
mangledName
;
}
virtual
const
TString
&
getMangledName
()
const
override
{
return
mangledName
;
}
virtual
const
TType
&
getType
()
const
{
return
returnType
;
}
virtual
const
TType
&
getType
()
const
override
{
return
returnType
;
}
virtual
TBuiltInVariable
getDeclaredBuiltInType
()
const
{
return
declaredBuiltIn
;
}
virtual
TBuiltInVariable
getDeclaredBuiltInType
()
const
{
return
declaredBuiltIn
;
}
virtual
TType
&
getWritableType
()
{
return
returnType
;
}
virtual
TType
&
getWritableType
()
override
{
return
returnType
;
}
virtual
void
relateToOperator
(
TOperator
o
)
{
assert
(
writable
);
op
=
o
;
}
virtual
void
relateToOperator
(
TOperator
o
)
{
assert
(
writable
);
op
=
o
;
}
virtual
TOperator
getBuiltInOp
()
const
{
return
op
;
}
virtual
TOperator
getBuiltInOp
()
const
{
return
op
;
}
virtual
void
setDefined
()
{
assert
(
writable
);
defined
=
true
;
}
virtual
void
setDefined
()
{
assert
(
writable
);
defined
=
true
;
}
...
@@ -272,7 +272,7 @@ public:
...
@@ -272,7 +272,7 @@ public:
virtual
TParameter
&
operator
[](
int
i
)
{
assert
(
writable
);
return
parameters
[
i
];
}
virtual
TParameter
&
operator
[](
int
i
)
{
assert
(
writable
);
return
parameters
[
i
];
}
virtual
const
TParameter
&
operator
[](
int
i
)
const
{
return
parameters
[
i
];
}
virtual
const
TParameter
&
operator
[](
int
i
)
const
{
return
parameters
[
i
];
}
virtual
void
dump
(
TInfoSink
&
infoSink
)
const
;
virtual
void
dump
(
TInfoSink
&
infoSink
)
const
override
;
protected
:
protected
:
explicit
TFunction
(
const
TFunction
&
);
explicit
TFunction
(
const
TFunction
&
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment