aboutsummaryrefslogtreecommitdiff
path: root/mapping
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-02-18 10:42:41 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-02-18 10:42:41 +0200
commitd5fb4a771a99ab543d62ed15f0a0eeefab1762a8 (patch)
tree44f794987b1b4b3a366202396040e6beefa7bffb /mapping
parent672d06ce03fe11beb9dd5791d3f5d2883fa44618 (diff)
Add odb::core namespace to be used in using-directives
Port all the examples and tests.
Diffstat (limited to 'mapping')
-rw-r--r--mapping/database.hxx6
-rw-r--r--mapping/driver.cxx2
2 files changed, 4 insertions, 4 deletions
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<odb::database>
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<database> (new mysql::database (argc, argv));
+ return auto_ptr<database> (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[])