diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2017-07-01 23:12:37 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2017-07-01 23:12:37 +0100 |
| commit | 8f214507614041a18c182c789f8c0610de03c200 (patch) | |
| tree | 4b247b4bfac4b030b28c782bb17794f279b8a1b7 | |
| parent | Add tests over blob operator== (diff) | |
| download | libdbpp-1.1.3.1.tar.bz2 libdbpp-1.1.3.1.tar.xz libdbpp-1.1.3.1.zip | |
Rename types.* to avoid name clasheslibdbpp-1.1.3.1
| -rw-r--r-- | libdbpp/column.h | 2 | ||||
| -rw-r--r-- | libdbpp/command.h | 2 | ||||
| -rw-r--r-- | libdbpp/dbTypes.cpp (renamed from libdbpp/types.cpp) | 2 | ||||
| -rw-r--r-- | libdbpp/dbTypes.h (renamed from libdbpp/types.h) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/libdbpp/column.h b/libdbpp/column.h index acfb2f3..cfe5ab5 100644 --- a/libdbpp/column.h +++ b/libdbpp/column.h @@ -7,7 +7,7 @@ #include <boost/optional.hpp> #include <visibility.h> #include <exception.h> -#include "types.h" +#include "dbTypes.h" #include "error.h" namespace DB { diff --git a/libdbpp/command.h b/libdbpp/command.h index e80a523..1647e50 100644 --- a/libdbpp/command.h +++ b/libdbpp/command.h @@ -8,7 +8,7 @@ #include <visibility.h> #include <factory.h> #include <type_traits> -#include "types.h" +#include "dbTypes.h" #include "error.h" namespace DB { diff --git a/libdbpp/types.cpp b/libdbpp/dbTypes.cpp index 325a24c..66e514a 100644 --- a/libdbpp/types.cpp +++ b/libdbpp/dbTypes.cpp @@ -1,4 +1,4 @@ -#include "types.h" +#include "dbTypes.h" #include <memory.h> DB::Blob::Blob() : diff --git a/libdbpp/types.h b/libdbpp/dbTypes.h index a75f0d3..a75f0d3 100644 --- a/libdbpp/types.h +++ b/libdbpp/dbTypes.h |