diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2011-07-24 14:52:31 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2011-07-24 14:52:31 +0200 |
| commit | ac83439900ab5ed4febe68375d3936ae2a59d707 (patch) | |
| tree | 705d6930ee10d1963f8061da0d64bd45f6301a10 /odb/pragma.cxx | |
| parent | 81ea37904e4959414b53b225b4b5e56e1b561bdc (diff) | |
Allow pragmas to be either overriding or accumulating
Diffstat (limited to 'odb/pragma.cxx')
| -rw-r--r-- | odb/pragma.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/odb/pragma.cxx b/odb/pragma.cxx index a77cf48..6e1ecfa 100644 --- a/odb/pragma.cxx +++ b/odb/pragma.cxx @@ -272,6 +272,7 @@ handle_pragma (cpp_reader* reader, string val; tree node (0); location_t loc (input_location); + pragma::mode_type mode (pragma::override); if (p == "table") { @@ -794,7 +795,7 @@ handle_pragma (cpp_reader* reader, // Record this pragma. // - pragma prag (p, val, node, loc); + pragma prag (mode, p, val, node, loc); if (decl) decl_pragmas_[decl].insert (prag); @@ -989,7 +990,7 @@ handle_pragma_qualifier (cpp_reader* reader, string const& p) // Record this pragma. // - pragma prag (p, "", 0, loc); + pragma prag (pragma::override, p, "", 0, loc); if (decl) decl_pragmas_[decl].insert (prag); |