Merge branch 'using-declarations' into upstream-master
* using-declarations: Typo fixes Fix warning suppression for WARN_PARSE_USING_UNDEF Using declarations fix in symbol tables Revert recent using-declarations code changes Conflicts: CHANGES.current
This commit is contained in:
commit
d2e9b80be3
6 changed files with 27 additions and 48 deletions
|
|
@ -1143,7 +1143,7 @@ int JSEmitter::emitConstant(Node *n) {
|
|||
String *rawval = Getattr(n, "rawval");
|
||||
String *value = rawval ? rawval : Getattr(n, "value");
|
||||
|
||||
// HACK: forcing usage of cppvalue for v8 (which turned out to fix typdef_struct.i, et. al)
|
||||
// HACK: forcing usage of cppvalue for v8 (which turned out to fix typedef_struct.i, et. al)
|
||||
if (State::IsSet(state.globals(FORCE_CPP)) && Getattr(n, "cppvalue") != NULL) {
|
||||
value = Getattr(n, "cppvalue");
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue