From b7824f749e29f7c9d018e468e18c2c7b6bd3e4c9 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 30 Mar 2010 11:40:26 +0200 Subject: Use odb prefix for inclusion --- odb/context.cxx | 3 ++- odb/context.hxx | 6 +++--- odb/generator.cxx | 4 ++-- odb/generator.hxx | 4 ++-- odb/makefile | 10 +++++++--- odb/options.cxx | 2 +- odb/options.hxx | 2 +- odb/plugin.cxx | 8 ++++---- odb/semantics.hxx | 22 +++++++++++----------- odb/semantics/class-template.cxx | 3 +-- odb/semantics/class-template.hxx | 6 +++--- odb/semantics/class.cxx | 3 +-- odb/semantics/class.hxx | 2 +- odb/semantics/derived.cxx | 3 +-- odb/semantics/derived.hxx | 2 +- odb/semantics/elements.cxx | 3 +-- odb/semantics/elements.hxx | 6 ++---- odb/semantics/enum.cxx | 3 +-- odb/semantics/enum.hxx | 2 +- odb/semantics/fundamental.cxx | 3 +-- odb/semantics/fundamental.hxx | 2 +- odb/semantics/namespace.cxx | 3 +-- odb/semantics/namespace.hxx | 2 +- odb/semantics/template.cxx | 3 +-- odb/semantics/template.hxx | 2 +- odb/semantics/union-template.cxx | 3 +-- odb/semantics/union-template.hxx | 6 +++--- odb/semantics/union.cxx | 3 +-- odb/semantics/union.hxx | 2 +- odb/semantics/unit.cxx | 3 +-- odb/semantics/unit.hxx | 4 ++-- odb/traversal.hxx | 22 +++++++++++----------- odb/traversal/class-template.cxx | 2 +- odb/traversal/class-template.hxx | 7 ++++--- odb/traversal/class.cxx | 2 +- odb/traversal/class.hxx | 4 ++-- odb/traversal/derived.cxx | 2 +- odb/traversal/derived.hxx | 4 ++-- odb/traversal/elements.cxx | 2 +- odb/traversal/elements.hxx | 3 +-- odb/traversal/enum.cxx | 2 +- odb/traversal/enum.hxx | 4 ++-- odb/traversal/fundamental.hxx | 4 ++-- odb/traversal/namespace.hxx | 4 ++-- odb/traversal/template.cxx | 2 +- odb/traversal/template.hxx | 4 ++-- odb/traversal/union-template.cxx | 2 +- odb/traversal/union-template.hxx | 7 ++++--- odb/traversal/union.hxx | 4 ++-- odb/traversal/unit.hxx | 4 ++-- 50 files changed, 104 insertions(+), 111 deletions(-) (limited to 'odb') diff --git a/odb/context.cxx b/odb/context.cxx index 913aa5d..f34bc5b 100644 --- a/odb/context.cxx +++ b/odb/context.cxx @@ -4,7 +4,8 @@ // license : GNU GPL v2; see accompanying LICENSE file #include -#include "context.hxx" + +#include using namespace std; diff --git a/odb/context.hxx b/odb/context.hxx index efdf610..f86e568 100644 --- a/odb/context.hxx +++ b/odb/context.hxx @@ -14,9 +14,9 @@ #include -#include -#include -#include +#include +#include +#include using std::endl; diff --git a/odb/generator.cxx b/odb/generator.cxx index 3548802..4538e54 100644 --- a/odb/generator.cxx +++ b/odb/generator.cxx @@ -13,8 +13,8 @@ #include #include -#include -#include +#include +#include using namespace std; using namespace cutl; diff --git a/odb/generator.hxx b/odb/generator.hxx index 42f7bed..833ff7b 100644 --- a/odb/generator.hxx +++ b/odb/generator.hxx @@ -6,8 +6,8 @@ #ifndef ODB_GENERATOR_HXX #define ODB_GENERATOR_HXX -#include -#include +#include +#include class generator { diff --git a/odb/makefile b/odb/makefile index 2789a47..7375546 100644 --- a/odb/makefile +++ b/odb/makefile @@ -70,14 +70,18 @@ $(call import,\ $(odb): $(cxx_dobj) $(cutl.l) | $(odb_so) $(odb_so): $(cxx_pobj) $(cutl.l) -$(cxx_dobj) $(cxx_dod): cpp_options := -I$(src_base) +$(cxx_dobj) $(cxx_dod): cpp_options := -I$(src_root) $(cxx_pobj) $(cxx_dobj) $(cxx_pod) $(cxx_dod): $(cutl.l.cpp-options) genf := $(cli_tun:.cli=.hxx) $(cli_tun:.cli=.ixx) $(cli_tun:.cli=.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(gen): cli := $(cli) -$(gen): cli_options := --generate-file-scanner --guard-prefix ODB +$(gen): cli_options := \ +--generate-file-scanner \ +--include-with-brackets \ +--include-prefix odb \ +--guard-prefix ODB $(call include-dep,$(cxx_pod)) $(call include-dep,$(cxx_dod)) @@ -127,7 +131,7 @@ ifdef cxx_gnu $(cxx_pobj): cxx_pic_options := -fPIC -$(cxx_pobj) $(cxx_pod): cpp_options := -I$(src_base) \ +$(cxx_pobj) $(cxx_pod): cpp_options := -I$(src_root) \ -I$(shell $(cxx_gnu) -print-file-name=plugin)/include $(odb_so): diff --git a/odb/options.cxx b/odb/options.cxx index b209119..5e72ff4 100644 --- a/odb/options.cxx +++ b/odb/options.cxx @@ -2,7 +2,7 @@ // compiler for C++. // -#include "options.hxx" +#include #include #include diff --git a/odb/options.hxx b/odb/options.hxx index b8a6488..92fc595 100644 --- a/odb/options.hxx +++ b/odb/options.hxx @@ -353,6 +353,6 @@ class options std::string options_file_; }; -#include "options.ixx" +#include #endif // ODB_OPTIONS_HXX diff --git a/odb/plugin.cxx b/odb/plugin.cxx index f381251..06c7abd 100644 --- a/odb/plugin.cxx +++ b/odb/plugin.cxx @@ -3,7 +3,7 @@ // copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file -#include // Keep it first. +#include // Keep it first. #include #include @@ -13,9 +13,9 @@ #include #include -#include -#include -#include +#include +#include +#include #ifndef LOCATION_COLUMN #define LOCATION_COLUMN(LOC) (expand_location (LOC).column) diff --git a/odb/semantics.hxx b/odb/semantics.hxx index c30bece..3c642ff 100644 --- a/odb/semantics.hxx +++ b/odb/semantics.hxx @@ -6,16 +6,16 @@ #ifndef ODB_SEMANTICS_HXX #define ODB_SEMANTICS_HXX -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif // ODB_SEMANTICS_HXX diff --git a/odb/semantics/class-template.cxx b/odb/semantics/class-template.cxx index 05deef8..20c8ba7 100644 --- a/odb/semantics/class-template.cxx +++ b/odb/semantics/class-template.cxx @@ -4,8 +4,7 @@ // license : GNU GPL v2; see accompanying LICENSE file #include - -#include +#include namespace semantics { diff --git a/odb/semantics/class-template.hxx b/odb/semantics/class-template.hxx index a6a34a4..7d069ec 100644 --- a/odb/semantics/class-template.hxx +++ b/odb/semantics/class-template.hxx @@ -6,9 +6,9 @@ #ifndef ODB_SEMANTICS_CLASS_TEMPLATE_HXX #define ODB_SEMANTICS_CLASS_TEMPLATE_HXX -#include -#include -#include +#include +#include +#include namespace semantics { diff --git a/odb/semantics/class.cxx b/odb/semantics/class.cxx index 7462d7c..b408d05 100644 --- a/odb/semantics/class.cxx +++ b/odb/semantics/class.cxx @@ -4,8 +4,7 @@ // license : GNU GPL v2; see accompanying LICENSE file #include - -#include +#include namespace semantics { diff --git a/odb/semantics/class.hxx b/odb/semantics/class.hxx index ba1a09b..bb5dec3 100644 --- a/odb/semantics/class.hxx +++ b/odb/semantics/class.hxx @@ -7,7 +7,7 @@ #define ODB_SEMANTICS_CLASS_HXX #include -#include +#include namespace semantics { diff --git a/odb/semantics/derived.cxx b/odb/semantics/derived.cxx index 490dac4..5f33d5a 100644 --- a/odb/semantics/derived.cxx +++ b/odb/semantics/derived.cxx @@ -4,8 +4,7 @@ // license : GNU GPL v2; see accompanying LICENSE file #include - -#include +#include namespace semantics { diff --git a/odb/semantics/derived.hxx b/odb/semantics/derived.hxx index 00ab18a..e7c0e51 100644 --- a/odb/semantics/derived.hxx +++ b/odb/semantics/derived.hxx @@ -6,7 +6,7 @@ #ifndef ODB_SEMANTICS_DERIVED_HXX #define ODB_SEMANTICS_DERIVED_HXX -#include +#include namespace semantics { diff --git a/odb/semantics/elements.cxx b/odb/semantics/elements.cxx index caed01e..29b1f8e 100644 --- a/odb/semantics/elements.cxx +++ b/odb/semantics/elements.cxx @@ -4,8 +4,7 @@ // license : GNU GPL v2; see accompanying LICENSE file #include - -#include +#include namespace semantics { diff --git a/odb/semantics/elements.hxx b/odb/semantics/elements.hxx index 969f33a..cc3b0be 100644 --- a/odb/semantics/elements.hxx +++ b/odb/semantics/elements.hxx @@ -6,7 +6,7 @@ #ifndef ODB_SEMANTICS_ELEMENTS_HXX #define ODB_SEMANTICS_ELEMENTS_HXX -#include // Keep it first. +#include // Keep it first. #include #include @@ -18,10 +18,8 @@ #include #include - #include #include - #include namespace semantics @@ -590,6 +588,6 @@ namespace semantics }; } -#include +#include #endif // ODB_SEMANTICS_ELEMENTS_HXX diff --git a/odb/semantics/enum.cxx b/odb/semantics/enum.cxx index ab19c70..ea23d1e 100644 --- a/odb/semantics/enum.cxx +++ b/odb/semantics/enum.cxx @@ -4,8 +4,7 @@ // license : GNU GPL v2; see accompanying LICENSE file #include - -#include +#include namespace semantics { diff --git a/odb/semantics/enum.hxx b/odb/semantics/enum.hxx index 6f3dfae..b03a56c 100644 --- a/odb/semantics/enum.hxx +++ b/odb/semantics/enum.hxx @@ -7,7 +7,7 @@ #define ODB_SEMANTICS_ENUM_HXX #include -#include +#include namespace semantics { diff --git a/odb/semantics/fundamental.cxx b/odb/semantics/fundamental.cxx index 0edca0c..10074a5 100644 --- a/odb/semantics/fundamental.cxx +++ b/odb/semantics/fundamental.cxx @@ -4,8 +4,7 @@ // license : GNU GPL v2; see accompanying LICENSE file #include - -#include +#include namespace semantics { diff --git a/odb/semantics/fundamental.hxx b/odb/semantics/fundamental.hxx index eea49a8..5cee2ac 100644 --- a/odb/semantics/fundamental.hxx +++ b/odb/semantics/fundamental.hxx @@ -6,7 +6,7 @@ #ifndef ODB_SEMANTICS_FUNDAMENTAL_HXX #define ODB_SEMANTICS_FUNDAMENTAL_HXX -#include +#include namespace semantics { diff --git a/odb/semantics/namespace.cxx b/odb/semantics/namespace.cxx index 72e977f..797b53d 100644 --- a/odb/semantics/namespace.cxx +++ b/odb/semantics/namespace.cxx @@ -4,8 +4,7 @@ // license : GNU GPL v2; see accompanying LICENSE file #include - -#include +#include namespace semantics { diff --git a/odb/semantics/namespace.hxx b/odb/semantics/namespace.hxx index b6a673c..936a8c7 100644 --- a/odb/semantics/namespace.hxx +++ b/odb/semantics/namespace.hxx @@ -6,7 +6,7 @@ #ifndef ODB_SEMANTICS_NAMESPACE_HXX #define ODB_SEMANTICS_NAMESPACE_HXX -#include +#include namespace semantics { diff --git a/odb/semantics/template.cxx b/odb/semantics/template.cxx index 4882aa3..4a3df79 100644 --- a/odb/semantics/template.cxx +++ b/odb/semantics/template.cxx @@ -4,8 +4,7 @@ // license : GNU GPL v2; see accompanying LICENSE file #include - -#include +#include namespace semantics { diff --git a/odb/semantics/template.hxx b/odb/semantics/template.hxx index 1357dbf..b610cfb 100644 --- a/odb/semantics/template.hxx +++ b/odb/semantics/template.hxx @@ -7,7 +7,7 @@ #define ODB_SEMANTICS_TEMPLATE_HXX #include -#include +#include namespace semantics { diff --git a/odb/semantics/union-template.cxx b/odb/semantics/union-template.cxx index a83748f..6aa192b 100644 --- a/odb/semantics/union-template.cxx +++ b/odb/semantics/union-template.cxx @@ -4,8 +4,7 @@ // license : GNU GPL v2; see accompanying LICENSE file #include - -#include +#include namespace semantics { diff --git a/odb/semantics/union-template.hxx b/odb/semantics/union-template.hxx index 8e74e6e..4b0df27 100644 --- a/odb/semantics/union-template.hxx +++ b/odb/semantics/union-template.hxx @@ -6,9 +6,9 @@ #ifndef ODB_SEMANTICS_UNION_TEMPLATE_HXX #define ODB_SEMANTICS_UNION_TEMPLATE_HXX -#include -#include -#include +#include +#include +#include namespace semantics { diff --git a/odb/semantics/union.cxx b/odb/semantics/union.cxx index a4e62a1..ae2f46e 100644 --- a/odb/semantics/union.cxx +++ b/odb/semantics/union.cxx @@ -4,8 +4,7 @@ // license : GNU GPL v2; see accompanying LICENSE file #include - -#include +#include namespace semantics { diff --git a/odb/semantics/union.hxx b/odb/semantics/union.hxx index e4b93a9..2f441ca 100644 --- a/odb/semantics/union.hxx +++ b/odb/semantics/union.hxx @@ -6,7 +6,7 @@ #ifndef ODB_SEMANTICS_UNION_HXX #define ODB_SEMANTICS_UNION_HXX -#include +#include namespace semantics { diff --git a/odb/semantics/unit.cxx b/odb/semantics/unit.cxx index 073b7fd..260b1c6 100644 --- a/odb/semantics/unit.cxx +++ b/odb/semantics/unit.cxx @@ -4,8 +4,7 @@ // license : GNU GPL v2; see accompanying LICENSE file #include - -#include +#include namespace semantics { diff --git a/odb/semantics/unit.hxx b/odb/semantics/unit.hxx index 05eec7f..4a7b5f4 100644 --- a/odb/semantics/unit.hxx +++ b/odb/semantics/unit.hxx @@ -8,8 +8,8 @@ #include -#include -#include +#include +#include namespace semantics { diff --git a/odb/traversal.hxx b/odb/traversal.hxx index 1a9a8c3..f904466 100644 --- a/odb/traversal.hxx +++ b/odb/traversal.hxx @@ -6,16 +6,16 @@ #ifndef ODB_TRAVERSAL_HXX #define ODB_TRAVERSAL_HXX -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif // ODB_TRAVERSAL_HXX diff --git a/odb/traversal/class-template.cxx b/odb/traversal/class-template.cxx index 457e69a..e73f52b 100644 --- a/odb/traversal/class-template.cxx +++ b/odb/traversal/class-template.cxx @@ -3,7 +3,7 @@ // copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file -#include +#include namespace traversal { diff --git a/odb/traversal/class-template.hxx b/odb/traversal/class-template.hxx index a5fd798..c6276ff 100644 --- a/odb/traversal/class-template.hxx +++ b/odb/traversal/class-template.hxx @@ -6,9 +6,10 @@ #ifndef ODB_TRAVERSAL_CLASS_TEMPLATE_HXX #define ODB_TRAVERSAL_CLASS_TEMPLATE_HXX -#include -#include -#include +#include + +#include +#include namespace traversal { diff --git a/odb/traversal/class.cxx b/odb/traversal/class.cxx index 752bd10..2a7f9e6 100644 --- a/odb/traversal/class.cxx +++ b/odb/traversal/class.cxx @@ -3,7 +3,7 @@ // copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file -#include +#include namespace traversal { diff --git a/odb/traversal/class.hxx b/odb/traversal/class.hxx index d871832..717a386 100644 --- a/odb/traversal/class.hxx +++ b/odb/traversal/class.hxx @@ -6,8 +6,8 @@ #ifndef ODB_TRAVERSAL_CLASS_HXX #define ODB_TRAVERSAL_CLASS_HXX -#include -#include +#include +#include namespace traversal { diff --git a/odb/traversal/derived.cxx b/odb/traversal/derived.cxx index ed75835..0669e6e 100644 --- a/odb/traversal/derived.cxx +++ b/odb/traversal/derived.cxx @@ -3,7 +3,7 @@ // copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file -#include +#include namespace traversal { diff --git a/odb/traversal/derived.hxx b/odb/traversal/derived.hxx index 5af31af..fe58d92 100644 --- a/odb/traversal/derived.hxx +++ b/odb/traversal/derived.hxx @@ -6,8 +6,8 @@ #ifndef ODB_TRAVERSAL_DERIVED_HXX #define ODB_TRAVERSAL_DERIVED_HXX -#include -#include +#include +#include namespace traversal { diff --git a/odb/traversal/elements.cxx b/odb/traversal/elements.cxx index 62f3eab..893d98f 100644 --- a/odb/traversal/elements.cxx +++ b/odb/traversal/elements.cxx @@ -3,7 +3,7 @@ // copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file -#include +#include namespace traversal { diff --git a/odb/traversal/elements.hxx b/odb/traversal/elements.hxx index be21b63..1af2c8c 100644 --- a/odb/traversal/elements.hxx +++ b/odb/traversal/elements.hxx @@ -7,8 +7,7 @@ #define ODB_TRAVERSAL_ELEMENTS_HXX #include - -#include +#include namespace traversal { diff --git a/odb/traversal/enum.cxx b/odb/traversal/enum.cxx index ae04531..9f5d572 100644 --- a/odb/traversal/enum.cxx +++ b/odb/traversal/enum.cxx @@ -3,7 +3,7 @@ // copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file -#include +#include namespace traversal { diff --git a/odb/traversal/enum.hxx b/odb/traversal/enum.hxx index ee4d8c3..c3cb037 100644 --- a/odb/traversal/enum.hxx +++ b/odb/traversal/enum.hxx @@ -6,8 +6,8 @@ #ifndef ODB_TRAVERSAL_ENUM_HXX #define ODB_TRAVERSAL_ENUM_HXX -#include -#include +#include +#include namespace traversal { diff --git a/odb/traversal/fundamental.hxx b/odb/traversal/fundamental.hxx index e34fb02..b6891d6 100644 --- a/odb/traversal/fundamental.hxx +++ b/odb/traversal/fundamental.hxx @@ -6,8 +6,8 @@ #ifndef ODB_TRAVERSAL_FUNDAMENTAL_HXX #define ODB_TRAVERSAL_FUNDAMENTAL_HXX -#include -#include +#include +#include namespace traversal { diff --git a/odb/traversal/namespace.hxx b/odb/traversal/namespace.hxx index c1c129d..3da801e 100644 --- a/odb/traversal/namespace.hxx +++ b/odb/traversal/namespace.hxx @@ -6,8 +6,8 @@ #ifndef ODB_TRAVERSAL_NAMESPACE_HXX #define ODB_TRAVERSAL_NAMESPACE_HXX -#include -#include +#include +#include namespace traversal { diff --git a/odb/traversal/template.cxx b/odb/traversal/template.cxx index 352a605..8df5442 100644 --- a/odb/traversal/template.cxx +++ b/odb/traversal/template.cxx @@ -3,7 +3,7 @@ // copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file -#include +#include namespace traversal { diff --git a/odb/traversal/template.hxx b/odb/traversal/template.hxx index 0ff8237..37eced9 100644 --- a/odb/traversal/template.hxx +++ b/odb/traversal/template.hxx @@ -6,8 +6,8 @@ #ifndef ODB_TRAVERSAL_TEMPLATE_HXX #define ODB_TRAVERSAL_TEMPLATE_HXX -#include -#include +#include +#include namespace traversal { diff --git a/odb/traversal/union-template.cxx b/odb/traversal/union-template.cxx index e4f7cdf..b85e9bf 100644 --- a/odb/traversal/union-template.cxx +++ b/odb/traversal/union-template.cxx @@ -3,7 +3,7 @@ // copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file -#include +#include namespace traversal { diff --git a/odb/traversal/union-template.hxx b/odb/traversal/union-template.hxx index 4a7a0d7..200e4dc 100644 --- a/odb/traversal/union-template.hxx +++ b/odb/traversal/union-template.hxx @@ -6,9 +6,10 @@ #ifndef ODB_TRAVERSAL_UNION_TEMPLATE_HXX #define ODB_TRAVERSAL_UNION_TEMPLATE_HXX -#include -#include -#include +#include + +#include +#include namespace traversal { diff --git a/odb/traversal/union.hxx b/odb/traversal/union.hxx index bd828ff..4f332e7 100644 --- a/odb/traversal/union.hxx +++ b/odb/traversal/union.hxx @@ -6,8 +6,8 @@ #ifndef ODB_TRAVERSAL_UNION_HXX #define ODB_TRAVERSAL_UNION_HXX -#include -#include +#include +#include namespace traversal { diff --git a/odb/traversal/unit.hxx b/odb/traversal/unit.hxx index f15c5fd..48f614d 100644 --- a/odb/traversal/unit.hxx +++ b/odb/traversal/unit.hxx @@ -6,8 +6,8 @@ #ifndef ODB_TRAVERSAL_UNIT_HXX #define ODB_TRAVERSAL_UNIT_HXX -#include -#include +#include +#include namespace traversal { -- cgit v1.1