From ac83439900ab5ed4febe68375d3936ae2a59d707 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sun, 24 Jul 2011 14:52:31 +0200
Subject: Allow pragmas to be either overriding or accumulating

---
 odb/pragma.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'odb/pragma.cxx')

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);
-- 
cgit v1.1