aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--boost/common/template/driver.cxx2
-rw-r--r--boost/mysql/template/driver.cxx2
-rw-r--r--common/auto/driver.cxx2
-rw-r--r--common/composite/driver.cxx2
-rw-r--r--common/const/driver.cxx2
-rw-r--r--common/container/driver.cxx2
-rw-r--r--common/ctor/driver.cxx2
-rw-r--r--common/inverse/driver.cxx2
-rw-r--r--common/lazy-ptr/driver.cxx2
-rw-r--r--common/lifecycle/driver.cxx2
-rw-r--r--common/query/driver.cxx2
-rw-r--r--common/relationship/driver.cxx2
-rw-r--r--common/schema/driver.cxx2
-rw-r--r--common/template/driver.cxx2
-rw-r--r--common/threads/driver.cxx3
-rw-r--r--libcommon/common/common.cxx18
-rw-r--r--mysql/native/driver.cxx2
-rw-r--r--mysql/template/driver.cxx2
-rw-r--r--mysql/truncation/driver.cxx2
-rw-r--r--mysql/types/driver.cxx2
-rw-r--r--tracer/include/driver.cxx2
-rw-r--r--tracer/object/driver.cxx4
-rw-r--r--tracer/pragma/driver.cxx2
-rw-r--r--tracer/template/driver.cxx4
-rw-r--r--tracer/transaction/driver.cxx3
-rw-r--r--tracer/types/driver.cxx2
26 files changed, 38 insertions, 36 deletions
diff --git a/boost/common/template/driver.cxx b/boost/common/template/driver.cxx
index 19ce6d8..5865289 100644
--- a/boost/common/template/driver.cxx
+++ b/boost/common/template/driver.cxx
@@ -19,7 +19,7 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main (int argc, char* argv[])
diff --git a/boost/mysql/template/driver.cxx b/boost/mysql/template/driver.cxx
index 8a65b0c..2a92ab4 100644
--- a/boost/mysql/template/driver.cxx
+++ b/boost/mysql/template/driver.cxx
@@ -19,7 +19,7 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main (int argc, char* argv[])
diff --git a/common/auto/driver.cxx b/common/auto/driver.cxx
index 4388bbf..9b863f8 100644
--- a/common/auto/driver.cxx
+++ b/common/auto/driver.cxx
@@ -19,7 +19,7 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main (int argc, char* argv[])
diff --git a/common/composite/driver.cxx b/common/composite/driver.cxx
index bf8e668..51e6a26 100644
--- a/common/composite/driver.cxx
+++ b/common/composite/driver.cxx
@@ -19,7 +19,7 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main (int argc, char* argv[])
diff --git a/common/const/driver.cxx b/common/const/driver.cxx
index b4eb80e..10e3103 100644
--- a/common/const/driver.cxx
+++ b/common/const/driver.cxx
@@ -20,7 +20,7 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main (int argc, char* argv[])
diff --git a/common/container/driver.cxx b/common/container/driver.cxx
index b4f5b87..0705794 100644
--- a/common/container/driver.cxx
+++ b/common/container/driver.cxx
@@ -19,7 +19,7 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main (int argc, char* argv[])
diff --git a/common/ctor/driver.cxx b/common/ctor/driver.cxx
index c8e418f..23d2af1 100644
--- a/common/ctor/driver.cxx
+++ b/common/ctor/driver.cxx
@@ -19,7 +19,7 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main (int argc, char* argv[])
diff --git a/common/inverse/driver.cxx b/common/inverse/driver.cxx
index 26ead16..1f018e7 100644
--- a/common/inverse/driver.cxx
+++ b/common/inverse/driver.cxx
@@ -20,7 +20,7 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main (int argc, char* argv[])
diff --git a/common/lazy-ptr/driver.cxx b/common/lazy-ptr/driver.cxx
index d03eaef..c40eb92 100644
--- a/common/lazy-ptr/driver.cxx
+++ b/common/lazy-ptr/driver.cxx
@@ -19,7 +19,7 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
auto_ptr<obj2>
create (unsigned int id)
diff --git a/common/lifecycle/driver.cxx b/common/lifecycle/driver.cxx
index ae755a2..8328700 100644
--- a/common/lifecycle/driver.cxx
+++ b/common/lifecycle/driver.cxx
@@ -19,7 +19,7 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main (int argc, char* argv[])
diff --git a/common/query/driver.cxx b/common/query/driver.cxx
index 78f0bd4..6bef996 100644
--- a/common/query/driver.cxx
+++ b/common/query/driver.cxx
@@ -19,7 +19,7 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
void
print (result<person>& r)
diff --git a/common/relationship/driver.cxx b/common/relationship/driver.cxx
index 637dfd0..cad17a0 100644
--- a/common/relationship/driver.cxx
+++ b/common/relationship/driver.cxx
@@ -19,7 +19,7 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main (int argc, char* argv[])
diff --git a/common/schema/driver.cxx b/common/schema/driver.cxx
index 344b4b6..b53464c 100644
--- a/common/schema/driver.cxx
+++ b/common/schema/driver.cxx
@@ -19,7 +19,7 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main (int argc, char* argv[])
diff --git a/common/template/driver.cxx b/common/template/driver.cxx
index 9386784..ad95809 100644
--- a/common/template/driver.cxx
+++ b/common/template/driver.cxx
@@ -19,7 +19,7 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main (int argc, char* argv[])
diff --git a/common/threads/driver.cxx b/common/threads/driver.cxx
index 6c64736..212ff60 100644
--- a/common/threads/driver.cxx
+++ b/common/threads/driver.cxx
@@ -24,7 +24,8 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
+namespace details = odb::details;
const unsigned long thread_count = 32;
const unsigned long iteration_count = 100;
diff --git a/libcommon/common/common.cxx b/libcommon/common/common.cxx
index d451c4b..bffc0fc 100644
--- a/libcommon/common/common.cxx
+++ b/libcommon/common/common.cxx
@@ -18,9 +18,12 @@
#include <common/common.hxx>
using namespace std;
-using namespace odb;
-auto_ptr<database>
+#if defined(DATABASE_MYSQL)
+using namespace odb::mysql;
+#endif
+
+auto_ptr<odb::database>
create_database (int& argc, char* argv[], size_t max_connections)
{
if (argc > 1 && argv[1] == string ("--help"))
@@ -28,19 +31,16 @@ create_database (int& argc, char* argv[], size_t max_connections)
cerr << "Usage: " << argv[0] << " [options]" << endl
<< "Options:" << endl;
-#if defined(DATABASE_MYSQL)
- mysql::database::print_usage (cerr);
-#endif
-
+ database::print_usage (cerr);
exit (0);
}
#if defined(DATABASE_MYSQL)
- auto_ptr<mysql::connection_factory> f;
+ auto_ptr<connection_factory> f;
if (max_connections != 0)
- f.reset (new mysql::connection_pool_factory (max_connections));
+ f.reset (new connection_pool_factory (max_connections));
- return auto_ptr<database> (new mysql::database (argc, argv, false, 0, f));
+ return auto_ptr<odb::database> (new database (argc, argv, false, 0, f));
#endif
}
diff --git a/mysql/native/driver.cxx b/mysql/native/driver.cxx
index 1141860..8854566 100644
--- a/mysql/native/driver.cxx
+++ b/mysql/native/driver.cxx
@@ -16,7 +16,7 @@
#include <common/common.hxx>
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main (int argc, char* argv[])
diff --git a/mysql/template/driver.cxx b/mysql/template/driver.cxx
index d7fecdf..a305739 100644
--- a/mysql/template/driver.cxx
+++ b/mysql/template/driver.cxx
@@ -19,7 +19,7 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main (int argc, char* argv[])
diff --git a/mysql/truncation/driver.cxx b/mysql/truncation/driver.cxx
index 7b8a11d..b4f68b4 100644
--- a/mysql/truncation/driver.cxx
+++ b/mysql/truncation/driver.cxx
@@ -19,7 +19,7 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main (int argc, char* argv[])
diff --git a/mysql/types/driver.cxx b/mysql/types/driver.cxx
index d4fa7ec..b675655 100644
--- a/mysql/types/driver.cxx
+++ b/mysql/types/driver.cxx
@@ -19,7 +19,7 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main (int argc, char* argv[])
diff --git a/tracer/include/driver.cxx b/tracer/include/driver.cxx
index 70cdd99..f2f9382 100644
--- a/tracer/include/driver.cxx
+++ b/tracer/include/driver.cxx
@@ -33,7 +33,7 @@
#include "test4-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main ()
diff --git a/tracer/object/driver.cxx b/tracer/object/driver.cxx
index 9c8d465..4ea6329 100644
--- a/tracer/object/driver.cxx
+++ b/tracer/object/driver.cxx
@@ -18,12 +18,12 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main ()
{
- tracer::database db;
+ odb::tracer::database db;
// database operation out of transaction
//
diff --git a/tracer/pragma/driver.cxx b/tracer/pragma/driver.cxx
index c463230..2f89ad5 100644
--- a/tracer/pragma/driver.cxx
+++ b/tracer/pragma/driver.cxx
@@ -18,7 +18,7 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main ()
diff --git a/tracer/template/driver.cxx b/tracer/template/driver.cxx
index 616f966..e63fae6 100644
--- a/tracer/template/driver.cxx
+++ b/tracer/template/driver.cxx
@@ -18,12 +18,12 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
int
main ()
{
- tracer::database db;
+ odb::tracer::database db;
//
//
diff --git a/tracer/transaction/driver.cxx b/tracer/transaction/driver.cxx
index fcec91c..f6945d4 100644
--- a/tracer/transaction/driver.cxx
+++ b/tracer/transaction/driver.cxx
@@ -15,7 +15,8 @@
#include <odb/tracer/transaction.hxx>
using namespace std;
-using namespace odb;
+using namespace odb::core;
+namespace tracer = odb::tracer;
int
main ()
diff --git a/tracer/types/driver.cxx b/tracer/types/driver.cxx
index 6847878..9c1b97d 100644
--- a/tracer/types/driver.cxx
+++ b/tracer/types/driver.cxx
@@ -14,7 +14,7 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb;
+using namespace odb::core;
template <typename T1, typename T2>
struct same_p
generated by cgit v1.1 at 2024-05-18 01:59:07 +0000