From d5fb4a771a99ab543d62ed15f0a0eeefab1762a8 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 18 Feb 2011 10:42:41 +0200 Subject: Add odb::core namespace to be used in using-directives Port all the examples and tests. --- boost/database.hxx | 6 +++--- boost/driver.cxx | 2 +- composite/database.hxx | 6 +++--- composite/driver.cxx | 2 +- container/database.hxx | 6 +++--- container/driver.cxx | 2 +- hello/database.hxx | 6 +++--- hello/driver.cxx | 2 +- inverse/database.hxx | 6 +++--- inverse/driver.cxx | 2 +- mapping/database.hxx | 6 +++--- mapping/driver.cxx | 2 +- query/database.hxx | 6 +++--- relationship/database.hxx | 6 +++--- relationship/driver.cxx | 2 +- schema/database.hxx | 6 +++--- schema/driver.cxx | 2 +- template/database.hxx | 6 +++--- template/driver.cxx | 2 +- 19 files changed, 39 insertions(+), 39 deletions(-) diff --git a/boost/database.hxx b/boost/database.hxx index 9fd9478..fad4f16 100644 --- a/boost/database.hxx +++ b/boost/database.hxx @@ -24,7 +24,7 @@ inline std::auto_ptr create_database (int& argc, char* argv[]) { using namespace std; - using namespace odb; + using namespace odb::core; if (argc > 1 && argv[1] == string ("--help")) { @@ -32,14 +32,14 @@ create_database (int& argc, char* argv[]) << "Options:" << endl; #if defined(DATABASE_MYSQL) - mysql::database::print_usage (cerr); + odb::mysql::database::print_usage (cerr); #endif exit (0); } #if defined(DATABASE_MYSQL) - return auto_ptr (new mysql::database (argc, argv)); + return auto_ptr (new odb::mysql::database (argc, argv)); #endif } diff --git a/boost/driver.cxx b/boost/driver.cxx index 5136312..39f9c2a 100644 --- a/boost/driver.cxx +++ b/boost/driver.cxx @@ -16,7 +16,7 @@ using namespace std; using namespace boost::gregorian; -using namespace odb; +using namespace odb::core; int main (int argc, char* argv[]) diff --git a/composite/database.hxx b/composite/database.hxx index c21c9fc..58f7ac0 100644 --- a/composite/database.hxx +++ b/composite/database.hxx @@ -24,7 +24,7 @@ inline std::auto_ptr create_database (int& argc, char* argv[]) { using namespace std; - using namespace odb; + using namespace odb::core; if (argc > 1 && argv[1] == string ("--help")) { @@ -32,14 +32,14 @@ create_database (int& argc, char* argv[]) << "Options:" << endl; #if defined(DATABASE_MYSQL) - mysql::database::print_usage (cerr); + odb::mysql::database::print_usage (cerr); #endif exit (0); } #if defined(DATABASE_MYSQL) - return auto_ptr (new mysql::database (argc, argv)); + return auto_ptr (new odb::mysql::database (argc, argv)); #endif } diff --git a/composite/driver.cxx b/composite/driver.cxx index f8feb2f..9c50d45 100644 --- a/composite/driver.cxx +++ b/composite/driver.cxx @@ -14,7 +14,7 @@ #include "person-odb.hxx" using namespace std; -using namespace odb; +using namespace odb::core; int main (int argc, char* argv[]) diff --git a/container/database.hxx b/container/database.hxx index c72f320..6e4c1e7 100644 --- a/container/database.hxx +++ b/container/database.hxx @@ -24,7 +24,7 @@ inline std::auto_ptr create_database (int& argc, char* argv[]) { using namespace std; - using namespace odb; + using namespace odb::core; if (argc > 1 && argv[1] == string ("--help")) { @@ -32,14 +32,14 @@ create_database (int& argc, char* argv[]) << "Options:" << endl; #if defined(DATABASE_MYSQL) - mysql::database::print_usage (cerr); + odb::mysql::database::print_usage (cerr); #endif exit (0); } #if defined(DATABASE_MYSQL) - return auto_ptr (new mysql::database (argc, argv)); + return auto_ptr (new odb::mysql::database (argc, argv)); #endif } diff --git a/container/driver.cxx b/container/driver.cxx index 109fec0..23ceff6 100644 --- a/container/driver.cxx +++ b/container/driver.cxx @@ -14,7 +14,7 @@ #include "person-odb.hxx" using namespace std; -using namespace odb; +using namespace odb::core; void print (const person& p) diff --git a/hello/database.hxx b/hello/database.hxx index 7436eec..6616cfe 100644 --- a/hello/database.hxx +++ b/hello/database.hxx @@ -24,7 +24,7 @@ inline std::auto_ptr create_database (int& argc, char* argv[]) { using namespace std; - using namespace odb; + using namespace odb::core; if (argc > 1 && argv[1] == string ("--help")) { @@ -32,14 +32,14 @@ create_database (int& argc, char* argv[]) << "Options:" << endl; #if defined(DATABASE_MYSQL) - mysql::database::print_usage (cerr); + odb::mysql::database::print_usage (cerr); #endif exit (0); } #if defined(DATABASE_MYSQL) - return auto_ptr (new mysql::database (argc, argv)); + return auto_ptr (new odb::mysql::database (argc, argv)); #endif } diff --git a/hello/driver.cxx b/hello/driver.cxx index 61c3797..16b1b75 100644 --- a/hello/driver.cxx +++ b/hello/driver.cxx @@ -14,7 +14,7 @@ #include "person-odb.hxx" using namespace std; -using namespace odb; +using namespace odb::core; int main (int argc, char* argv[]) diff --git a/inverse/database.hxx b/inverse/database.hxx index 964381b..4748faf 100644 --- a/inverse/database.hxx +++ b/inverse/database.hxx @@ -24,7 +24,7 @@ inline std::auto_ptr create_database (int& argc, char* argv[]) { using namespace std; - using namespace odb; + using namespace odb::core; if (argc > 1 && argv[1] == string ("--help")) { @@ -32,14 +32,14 @@ create_database (int& argc, char* argv[]) << "Options:" << endl; #if defined(DATABASE_MYSQL) - mysql::database::print_usage (cerr); + odb::mysql::database::print_usage (cerr); #endif exit (0); } #if defined(DATABASE_MYSQL) - return auto_ptr (new mysql::database (argc, argv)); + return auto_ptr (new odb::mysql::database (argc, argv)); #endif } diff --git a/inverse/driver.cxx b/inverse/driver.cxx index 8b2538f..4aa6bd6 100644 --- a/inverse/driver.cxx +++ b/inverse/driver.cxx @@ -15,7 +15,7 @@ #include "employee-odb.hxx" using namespace std; -using namespace odb; +using namespace odb::core; void print (const employee& e) diff --git a/mapping/database.hxx b/mapping/database.hxx index e0b2ed4..704f691 100644 --- a/mapping/database.hxx +++ b/mapping/database.hxx @@ -24,7 +24,7 @@ inline std::auto_ptr create_database (int& argc, char* argv[]) { using namespace std; - using namespace odb; + using namespace odb::core; if (argc > 1 && argv[1] == string ("--help")) { @@ -32,14 +32,14 @@ create_database (int& argc, char* argv[]) << "Options:" << endl; #if defined(DATABASE_MYSQL) - mysql::database::print_usage (cerr); + odb::mysql::database::print_usage (cerr); #endif exit (0); } #if defined(DATABASE_MYSQL) - return auto_ptr (new mysql::database (argc, argv)); + return auto_ptr (new odb::mysql::database (argc, argv)); #endif } diff --git a/mapping/driver.cxx b/mapping/driver.cxx index dae2c94..80f825e 100644 --- a/mapping/driver.cxx +++ b/mapping/driver.cxx @@ -14,7 +14,7 @@ #include "person-odb.hxx" using namespace std; -using namespace odb; +using namespace odb::core; int main (int argc, char* argv[]) diff --git a/query/database.hxx b/query/database.hxx index aad361a..fe23d97 100644 --- a/query/database.hxx +++ b/query/database.hxx @@ -24,7 +24,7 @@ inline std::auto_ptr create_database (int& argc, char* argv[]) { using namespace std; - using namespace odb; + using namespace odb::core; if (argc > 1 && argv[1] == string ("--help")) { @@ -32,14 +32,14 @@ create_database (int& argc, char* argv[]) << "Options:" << endl; #if defined(DATABASE_MYSQL) - mysql::database::print_usage (cerr); + odb::mysql::database::print_usage (cerr); #endif exit (0); } #if defined(DATABASE_MYSQL) - return auto_ptr (new mysql::database (argc, argv)); + return auto_ptr (new odb::mysql::database (argc, argv)); #endif } diff --git a/relationship/database.hxx b/relationship/database.hxx index f9cd50c..8958831 100644 --- a/relationship/database.hxx +++ b/relationship/database.hxx @@ -24,7 +24,7 @@ inline std::auto_ptr create_database (int& argc, char* argv[]) { using namespace std; - using namespace odb; + using namespace odb::core; if (argc > 1 && argv[1] == string ("--help")) { @@ -32,14 +32,14 @@ create_database (int& argc, char* argv[]) << "Options:" << endl; #if defined(DATABASE_MYSQL) - mysql::database::print_usage (cerr); + odb::mysql::database::print_usage (cerr); #endif exit (0); } #if defined(DATABASE_MYSQL) - return auto_ptr (new mysql::database (argc, argv)); + return auto_ptr (new odb::mysql::database (argc, argv)); #endif } diff --git a/relationship/driver.cxx b/relationship/driver.cxx index d31e056..ed359c1 100644 --- a/relationship/driver.cxx +++ b/relationship/driver.cxx @@ -15,7 +15,7 @@ #include "employee-odb.hxx" using namespace std; -using namespace odb; +using namespace odb::core; void print (const employee& e) diff --git a/schema/database.hxx b/schema/database.hxx index c163925..8e27e16 100644 --- a/schema/database.hxx +++ b/schema/database.hxx @@ -24,7 +24,7 @@ inline std::auto_ptr create_database (int& argc, char* argv[]) { using namespace std; - using namespace odb; + using namespace odb::core; if (argc > 1 && argv[1] == string ("--help")) { @@ -32,14 +32,14 @@ create_database (int& argc, char* argv[]) << "Options:" << endl; #if defined(DATABASE_MYSQL) - mysql::database::print_usage (cerr); + odb::mysql::database::print_usage (cerr); #endif exit (0); } #if defined(DATABASE_MYSQL) - return auto_ptr (new mysql::database (argc, argv)); + return auto_ptr (new odb::mysql::database (argc, argv)); #endif } diff --git a/schema/driver.cxx b/schema/driver.cxx index 5ba5113..3f36f03 100644 --- a/schema/driver.cxx +++ b/schema/driver.cxx @@ -15,7 +15,7 @@ #include "employee-odb.hxx" using namespace std; -using namespace odb; +using namespace odb::core; int main (int argc, char* argv[]) diff --git a/template/database.hxx b/template/database.hxx index 2170141..62f7cd1 100644 --- a/template/database.hxx +++ b/template/database.hxx @@ -24,7 +24,7 @@ inline std::auto_ptr create_database (int& argc, char* argv[]) { using namespace std; - using namespace odb; + using namespace odb::core; if (argc > 1 && argv[1] == string ("--help")) { @@ -32,14 +32,14 @@ create_database (int& argc, char* argv[]) << "Options:" << endl; #if defined(DATABASE_MYSQL) - mysql::database::print_usage (cerr); + odb::mysql::database::print_usage (cerr); #endif exit (0); } #if defined(DATABASE_MYSQL) - return auto_ptr (new mysql::database (argc, argv)); + return auto_ptr (new odb::mysql::database (argc, argv)); #endif } diff --git a/template/driver.cxx b/template/driver.cxx index 387035d..8f647df 100644 --- a/template/driver.cxx +++ b/template/driver.cxx @@ -14,7 +14,7 @@ #include "person-odb.hxx" using namespace std; -using namespace odb; +using namespace odb::core; int main (int argc, char* argv[]) -- cgit v1.1