diff options
Diffstat (limited to 'odb/include.cxx')
| -rw-r--r-- | odb/include.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/odb/include.cxx b/odb/include.cxx index 3d17b9a..a921451 100644 --- a/odb/include.cxx +++ b/odb/include.cxx @@ -169,6 +169,7 @@ namespace { string f (file); size_t n (f.size ()); + database db (options_.database ()[0]); // Check if we have a synthesized prologue/epilogue fragment. // @@ -201,18 +202,18 @@ namespace size_t size (options_.odb_prologue ().size ()); if (n < size) - ss << options_.odb_prologue ()[n]; + ss << options_.odb_prologue ()[db][n]; else - f = options_.odb_prologue_file ()[n - size]; + f = options_.odb_prologue_file ()[db][n - size]; } else { size_t size (options_.odb_epilogue ().size ()); if (n < size) - ss << options_.odb_epilogue ()[n]; + ss << options_.odb_epilogue ()[db][n]; else - f = options_.odb_epilogue_file ()[n - size]; + f = options_.odb_epilogue_file ()[db][n - size]; } if (f.empty ()) @@ -688,7 +689,7 @@ namespace include } path f (inc->path_.base ()); - f += ctx.options.odb_file_suffix (); + f += ctx.options.odb_file_suffix ()[ctx.options.database ()[0]]; f += ctx.options.hxx_suffix (); char o (inc->type_ == include_directive::quote ? '"' : '<'); |