diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2016-08-28 18:12:03 -0700 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2016-08-28 18:37:57 -0700 |
| commit | 5f05e954ee1f1daf953b3ff20af81775f226d5bf (patch) | |
| tree | 21a691619f0e260e18df4140d4d8381682ecd979 /085scenario_console.cc | |
| parent | c7fde8d4e4175b436bc8db92bedd231261827e2c (diff) | |
| download | mu-5f05e954ee1f1daf953b3ff20af81775f226d5bf.tar.gz | |
3273
Undo 3272. The trouble with creating a new section for constants is that there's no good place to order it since constants can be initialized using globals as well as vice versa. And I don't want to add constraints disallowing either side. Instead, a new plan: always declare constants in the Globals section using 'extern const' rather than just 'const', since otherwise constants implicitly have internal linkage (http://stackoverflow.com/questions/14894698/why-does-extern-const-int-n-not-work-as-expected)
Diffstat (limited to '085scenario_console.cc')
| -rw-r--r-- | 085scenario_console.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/085scenario_console.cc b/085scenario_console.cc index 6dc825e1..b4e41699 100644 --- a/085scenario_console.cc +++ b/085scenario_console.cc @@ -33,8 +33,8 @@ scenario keyboard-in-scenario [ ] ] -:(before "End Fixed Scenario Locations") -const int CONSOLE = Next_predefined_global_for_scenarios++; +:(before "End Scenario Globals") +extern const int CONSOLE = Next_predefined_global_for_scenarios++; //: give 'console' a fixed location in scenarios :(before "End Special Scenario Variable Names(r)") Name[r]["console"] = CONSOLE; |