Commit 9dd2f734 authored by Denis Chapligin's avatar Denis Chapligin

Added DB2 backend

parent 6850d63e
...@@ -28,13 +28,10 @@ ...@@ -28,13 +28,10 @@
#include <cstddef> #include <cstddef>
#include <string> #include <string>
<<<<<<< HEAD
#include <vector> #include <vector>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <cstring> #include <cstring>
=======
>>>>>>> Ignored ide files
#include <sqlcli1.h> #include <sqlcli1.h>
......
...@@ -6,11 +6,7 @@ ...@@ -6,11 +6,7 @@
// //
#include "soci.h" #include "soci.h"
<<<<<<< HEAD
#include "soci-db2.h" #include "soci-db2.h"
=======
#include "soci-empty.h"
>>>>>>> Ignored ide files
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <cassert> #include <cassert>
...@@ -20,11 +16,7 @@ ...@@ -20,11 +16,7 @@
using namespace soci; using namespace soci;
std::string connectString; std::string connectString;
<<<<<<< HEAD
backend_factory const &backEnd = *soci::factory_db2(); backend_factory const &backEnd = *soci::factory_db2();
=======
backend_factory const &backEnd = *soci::factory_empty();
>>>>>>> Ignored ide files
// NOTE: // NOTE:
......
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