Skip to content

D
dlib
Commit 94ff8e83 authored by Davis King's avatar Davis King
Browse files
Options

Just removed the sqlite namespace and unindended everything.

parent 8d1cf196
Expand all Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 27 deletions
dlib/sqlite/sqlite.h
View file @ 94ff8e83
This diff is collapsed.
dlib/sqlite/sqlite_abstract.h
View file @ 94ff8e83
...@@ -14,10 +14,8 @@ ...@@ -14,10 +14,8 @@
namespace dlib namespace dlib
{ {
namespace sqlite
{
// ------------------------------------------------------------------------------------ // ----------------------------------------------------------------------------------------
struct sqlite_error : public error struct sqlite_error : public error
{ {
...@@ -29,7 +27,7 @@ namespace dlib ...@@ -29,7 +27,7 @@ namespace dlib
!*/ !*/
}; };
// ------------------------------------------------------------------------------------ // ----------------------------------------------------------------------------------------
class database : noncopyable class database : noncopyable
{ {
...@@ -121,7 +119,7 @@ namespace dlib ...@@ -121,7 +119,7 @@ namespace dlib
}; };
// ------------------------------------------------------------------------------------ // ----------------------------------------------------------------------------------------
class statement : noncopyable class statement : noncopyable
{ {
...@@ -435,9 +433,8 @@ namespace dlib ...@@ -435,9 +433,8 @@ namespace dlib
}; };
// ------------------------------------------------------------------------------------ // ----------------------------------------------------------------------------------------
}
} }
#endif // DLIB_SQLiTE_ABSTRACT_H_ #endif // DLIB_SQLiTE_ABSTRACT_H_
......
dlib/sqlite/sqlite_tools.h
View file @ 94ff8e83
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
namespace dlib namespace dlib
{ {
namespace sqlite
{
class transaction : noncopyable class transaction : noncopyable
{ {
...@@ -47,7 +45,7 @@ namespace dlib ...@@ -47,7 +45,7 @@ namespace dlib
}; };
// ------------------------------------------------------------------------------------ // ----------------------------------------------------------------------------------------
template < template <
...@@ -73,7 +71,7 @@ namespace dlib ...@@ -73,7 +71,7 @@ namespace dlib
} }
} }
// ------------------------------------------------------------------------------------ // ----------------------------------------------------------------------------------------
inline std::string query_text ( inline std::string query_text (
database& db, database& db,
...@@ -95,7 +93,7 @@ namespace dlib ...@@ -95,7 +93,7 @@ namespace dlib
} }
} }
// ------------------------------------------------------------------------------------ // ----------------------------------------------------------------------------------------
inline double query_double ( inline double query_double (
database& db, database& db,
...@@ -117,7 +115,7 @@ namespace dlib ...@@ -117,7 +115,7 @@ namespace dlib
} }
} }
// ------------------------------------------------------------------------------------ // ----------------------------------------------------------------------------------------
inline int query_int ( inline int query_int (
database& db, database& db,
...@@ -139,7 +137,7 @@ namespace dlib ...@@ -139,7 +137,7 @@ namespace dlib
} }
} }
// ------------------------------------------------------------------------------------ // ----------------------------------------------------------------------------------------
inline int64 query_int64 ( inline int64 query_int64 (
database& db, database& db,
...@@ -161,7 +159,7 @@ namespace dlib ...@@ -161,7 +159,7 @@ namespace dlib
} }
} }
// ------------------------------------------------------------------------------------ // ----------------------------------------------------------------------------------------
inline const std::vector<char> query_blob ( inline const std::vector<char> query_blob (
database& db, database& db,
...@@ -183,9 +181,8 @@ namespace dlib ...@@ -183,9 +181,8 @@ namespace dlib
} }
} }
// ------------------------------------------------------------------------------------ // ----------------------------------------------------------------------------------------
}
} }
#endif // DLIB_SQLiTE_TOOLS_H_ #endif // DLIB_SQLiTE_TOOLS_H_
......
dlib/sqlite/sqlite_tools_abstract.h
View file @ 94ff8e83
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
namespace dlib namespace dlib
{ {
namespace sqlite
{
class transaction : noncopyable class transaction : noncopyable
{ {
...@@ -56,7 +54,7 @@ namespace dlib ...@@ -56,7 +54,7 @@ namespace dlib
}; };
// ------------------------------------------------------------------------------------ // ----------------------------------------------------------------------------------------
template < template <
typename T typename T
...@@ -77,7 +75,7 @@ namespace dlib ...@@ -77,7 +75,7 @@ namespace dlib
!*/ !*/
// ------------------------------------------------------------------------------------ // ----------------------------------------------------------------------------------------
std::string query_text ( std::string query_text (
database& db, database& db,
...@@ -93,7 +91,7 @@ namespace dlib ...@@ -93,7 +91,7 @@ namespace dlib
succeeding. succeeding.
!*/ !*/
// ------------------------------------------------------------------------------------ // ----------------------------------------------------------------------------------------
double query_double ( double query_double (
database& db, database& db,
...@@ -109,7 +107,7 @@ namespace dlib ...@@ -109,7 +107,7 @@ namespace dlib
succeeding. succeeding.
!*/ !*/
// ------------------------------------------------------------------------------------ // ----------------------------------------------------------------------------------------
int query_int ( int query_int (
database& db, database& db,
...@@ -125,7 +123,7 @@ namespace dlib ...@@ -125,7 +123,7 @@ namespace dlib
succeeding. succeeding.
!*/ !*/
// ------------------------------------------------------------------------------------ // ----------------------------------------------------------------------------------------
int64 query_int64 ( int64 query_int64 (
database& db, database& db,
...@@ -141,7 +139,7 @@ namespace dlib ...@@ -141,7 +139,7 @@ namespace dlib
succeeding. succeeding.
!*/ !*/
// ------------------------------------------------------------------------------------ // ----------------------------------------------------------------------------------------
const std::vector<char> query_blob ( const std::vector<char> query_blob (
database& db, database& db,
...@@ -157,9 +155,8 @@ namespace dlib ...@@ -157,9 +155,8 @@ namespace dlib
succeeding. succeeding.
!*/ !*/
// ------------------------------------------------------------------------------------ // ----------------------------------------------------------------------------------------
}
} }
#endif // DLIB_SQLiTE_TOOLS_H_ #endif // DLIB_SQLiTE_TOOLS_H_
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment