Moved sqlite.hpp

Signed-off-by: K-ballo <k@fusionfenix.com>

Author: K-ballo

eggs/sqlite/sqlite.hpp renamed to eggs/sqlite.hpp

@@ -1,5 +1,5 @@
 /**
- * Eggs.SQLite <eggs/sqlite/sqlite.hpp>
+ * Eggs.SQLite <eggs/sqlite.hpp>
  * 
  * Copyright Agustín Bergé, Fusion Fenix 2012
  * 
@@ -9,8 +9,8 @@
  * Library home page: http://github.com/eggs-cpp/eggs-sqlite
  */
 
-#ifndef EGGS_SQLITE_SQLITE_HPP
-#define EGGS_SQLITE_SQLITE_HPP
+#ifndef EGGS_SQLITE_HPP
+#define EGGS_SQLITE_HPP
 
 #include <eggs/sqlite/blob.hpp>
 #include <eggs/sqlite/conversion_traits.hpp>
@@ -25,8 +25,4 @@
 #include <eggs/sqlite/statement_iterator.hpp>
 #include <eggs/sqlite/transaction.hpp>
 
-namespace eggs { namespace sqlite {
-
-} } // namespace eggs::sqlite
-
-#endif /*EGGS_SQLITE_SQLITE_HPP*/
+#endif /*EGGS_SQLITE_HPP*/

libs/sqlite/src/main.cpp

@@ -9,7 +9,7 @@
  * Library home page: http://github.com/eggs-cpp/eggs-sqlite
  */
 
-#include <eggs/sqlite/sqlite.hpp>
+#include <eggs/sqlite.hpp>
 
 #include <algorithm>
 #include <exception>
@@ -97,6 +97,9 @@ int main( int argc, char* argv[] )
             "ORDER BY year ASC"
         );
 
+        sqlite::istatement s2( books_db, "SELECT * FROM books" );
+        s2 = boost::move( books_by_author );
+
         // Core access
         books_by_author["author"] = "Bjarne Stroustrup";
         {

libs/sqlite/vs/sqlite.vcxproj

@@ -290,6 +290,7 @@
     <ClCompile Include="..\src\sqlite3\sqlite3.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\eggs\sqlite.hpp" />
     <ClInclude Include="..\..\..\eggs\sqlite\blob.hpp" />
     <ClInclude Include="..\..\..\eggs\sqlite\conversion_traits.hpp" />
     <ClInclude Include="..\..\..\eggs\sqlite\database.hpp" />
@@ -301,7 +302,6 @@
     <ClInclude Include="..\..\..\eggs\sqlite\raw_traits.hpp" />
     <ClInclude Include="..\..\..\eggs\sqlite\row.hpp" />
     <ClInclude Include="..\..\..\eggs\sqlite\sequence.hpp" />
-    <ClInclude Include="..\..\..\eggs\sqlite\sqlite.hpp" />
     <ClInclude Include="..\..\..\eggs\sqlite\statement.hpp" />
     <ClInclude Include="..\..\..\eggs\sqlite\statement_iterator.hpp" />
     <ClInclude Include="..\..\..\eggs\sqlite\transaction.hpp" />

libs/sqlite/vs/sqlite.vcxproj.filters

@@ -57,9 +57,6 @@
     <ClInclude Include="..\..\..\eggs\sqlite\sequence.hpp">
       <Filter>eggs\sqlite</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\eggs\sqlite\sqlite.hpp">
-      <Filter>eggs\sqlite</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\eggs\sqlite\statement.hpp">
       <Filter>eggs\sqlite</Filter>
     </ClInclude>
@@ -75,5 +72,8 @@
     <ClInclude Include="..\..\..\eggs\sqlite\mutex.hpp">
       <Filter>eggs\sqlite</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\eggs\sqlite.hpp">
+      <Filter>eggs</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>