diff options
-rw-r--r-- | include/odhtdb/DataView.hpp (renamed from include/DataView.hpp) | 0 | ||||
-rw-r--r-- | include/odhtdb/Database.hpp (renamed from include/Database.hpp) | 0 | ||||
-rw-r--r-- | include/odhtdb/DatabaseNode.hpp (renamed from include/DatabaseNode.hpp) | 0 | ||||
-rw-r--r-- | include/odhtdb/DatabaseStorage.hpp (renamed from include/DatabaseStorage.hpp) | 0 | ||||
-rw-r--r-- | include/odhtdb/DhtKey.hpp (renamed from include/DhtKey.hpp) | 0 | ||||
-rw-r--r-- | include/odhtdb/Encryption.hpp (renamed from include/Encryption.hpp) | 0 | ||||
-rw-r--r-- | include/odhtdb/Group.hpp (renamed from include/Group.hpp) | 0 | ||||
-rw-r--r-- | include/odhtdb/Hash.hpp (renamed from include/Hash.hpp) | 0 | ||||
-rw-r--r-- | include/odhtdb/Key.hpp (renamed from include/Key.hpp) | 0 | ||||
-rw-r--r-- | include/odhtdb/LocalUser.hpp (renamed from include/LocalUser.hpp) | 0 | ||||
-rw-r--r-- | include/odhtdb/Log.hpp (renamed from include/Log.hpp) | 0 | ||||
-rw-r--r-- | include/odhtdb/Permission.hpp (renamed from include/Permission.hpp) | 0 | ||||
-rw-r--r-- | include/odhtdb/RemoteUser.hpp (renamed from include/RemoteUser.hpp) | 0 | ||||
-rw-r--r-- | include/odhtdb/Signature.hpp (renamed from include/Signature.hpp) | 0 | ||||
-rw-r--r-- | include/odhtdb/StagedObject.hpp (renamed from include/StagedObject.hpp) | 0 | ||||
-rw-r--r-- | include/odhtdb/User.hpp (renamed from include/User.hpp) | 0 | ||||
-rw-r--r-- | include/odhtdb/bin2hex.hpp (renamed from include/bin2hex.hpp) | 0 | ||||
-rw-r--r-- | include/odhtdb/types.hpp (renamed from include/types.hpp) | 0 | ||||
-rwxr-xr-x | include/odhtdb/utils.hpp (renamed from include/utils.hpp) | 0 | ||||
-rw-r--r-- | project.conf | 3 | ||||
-rw-r--r-- | src/DataView.cpp | 2 | ||||
-rw-r--r-- | src/Database.cpp | 16 | ||||
-rw-r--r-- | src/DatabaseStorage.cpp | 6 | ||||
-rw-r--r-- | src/DhtKey.cpp | 4 | ||||
-rw-r--r-- | src/Encryption.cpp | 2 | ||||
-rw-r--r-- | src/Group.cpp | 4 | ||||
-rw-r--r-- | src/Hash.cpp | 4 | ||||
-rw-r--r-- | src/Log.cpp | 2 | ||||
-rw-r--r-- | src/Permission.cpp | 2 | ||||
-rw-r--r-- | src/Signature.cpp | 4 | ||||
-rw-r--r-- | src/User.cpp | 4 | ||||
-rw-r--r-- | tests/main.cpp | 12 |
32 files changed, 34 insertions, 31 deletions
diff --git a/include/DataView.hpp b/include/odhtdb/DataView.hpp index 0ecf9fb..0ecf9fb 100644 --- a/include/DataView.hpp +++ b/include/odhtdb/DataView.hpp diff --git a/include/Database.hpp b/include/odhtdb/Database.hpp index 6bc7bc5..6bc7bc5 100644 --- a/include/Database.hpp +++ b/include/odhtdb/Database.hpp diff --git a/include/DatabaseNode.hpp b/include/odhtdb/DatabaseNode.hpp index 3ca4be3..3ca4be3 100644 --- a/include/DatabaseNode.hpp +++ b/include/odhtdb/DatabaseNode.hpp diff --git a/include/DatabaseStorage.hpp b/include/odhtdb/DatabaseStorage.hpp index ad4f70b..ad4f70b 100644 --- a/include/DatabaseStorage.hpp +++ b/include/odhtdb/DatabaseStorage.hpp diff --git a/include/DhtKey.hpp b/include/odhtdb/DhtKey.hpp index 7c30ee3..7c30ee3 100644 --- a/include/DhtKey.hpp +++ b/include/odhtdb/DhtKey.hpp diff --git a/include/Encryption.hpp b/include/odhtdb/Encryption.hpp index 4697b35..4697b35 100644 --- a/include/Encryption.hpp +++ b/include/odhtdb/Encryption.hpp diff --git a/include/Group.hpp b/include/odhtdb/Group.hpp index 315961d..315961d 100644 --- a/include/Group.hpp +++ b/include/odhtdb/Group.hpp diff --git a/include/Hash.hpp b/include/odhtdb/Hash.hpp index 9dce168..9dce168 100644 --- a/include/Hash.hpp +++ b/include/odhtdb/Hash.hpp diff --git a/include/Key.hpp b/include/odhtdb/Key.hpp index 18971d1..18971d1 100644 --- a/include/Key.hpp +++ b/include/odhtdb/Key.hpp diff --git a/include/LocalUser.hpp b/include/odhtdb/LocalUser.hpp index d60cb38..d60cb38 100644 --- a/include/LocalUser.hpp +++ b/include/odhtdb/LocalUser.hpp diff --git a/include/Log.hpp b/include/odhtdb/Log.hpp index d09c2a2..d09c2a2 100644 --- a/include/Log.hpp +++ b/include/odhtdb/Log.hpp diff --git a/include/Permission.hpp b/include/odhtdb/Permission.hpp index 1ae2642..1ae2642 100644 --- a/include/Permission.hpp +++ b/include/odhtdb/Permission.hpp diff --git a/include/RemoteUser.hpp b/include/odhtdb/RemoteUser.hpp index 181a4c4..181a4c4 100644 --- a/include/RemoteUser.hpp +++ b/include/odhtdb/RemoteUser.hpp diff --git a/include/Signature.hpp b/include/odhtdb/Signature.hpp index 62c41c3..62c41c3 100644 --- a/include/Signature.hpp +++ b/include/odhtdb/Signature.hpp diff --git a/include/StagedObject.hpp b/include/odhtdb/StagedObject.hpp index 0c9b534..0c9b534 100644 --- a/include/StagedObject.hpp +++ b/include/odhtdb/StagedObject.hpp diff --git a/include/User.hpp b/include/odhtdb/User.hpp index fb37876..fb37876 100644 --- a/include/User.hpp +++ b/include/odhtdb/User.hpp diff --git a/include/bin2hex.hpp b/include/odhtdb/bin2hex.hpp index 72b57c1..72b57c1 100644 --- a/include/bin2hex.hpp +++ b/include/odhtdb/bin2hex.hpp diff --git a/include/types.hpp b/include/odhtdb/types.hpp index 3cf7f02..3cf7f02 100644 --- a/include/types.hpp +++ b/include/odhtdb/types.hpp diff --git a/include/utils.hpp b/include/odhtdb/utils.hpp index 01e478d..01e478d 100755 --- a/include/utils.hpp +++ b/include/odhtdb/utils.hpp diff --git a/project.conf b/project.conf index 23be0cc..93dfd0c 100644 --- a/project.conf +++ b/project.conf @@ -5,6 +5,9 @@ type = "library" platforms = ["linux32", "linux64"] tests = "tests" +[config] +expose_include_dirs = ["include"] + [dependencies] opendht = "1.5.0" fmt = "4.1.0" diff --git a/src/DataView.cpp b/src/DataView.cpp index 63c4f07..b9cef47 100644 --- a/src/DataView.cpp +++ b/src/DataView.cpp @@ -1,4 +1,4 @@ -#include "../include/DataView.hpp" +#include "../include/odhtdb/DataView.hpp" #include <cstring> namespace odhtdb diff --git a/src/Database.cpp b/src/Database.cpp index 6f53f1d..5d082d1 100644 --- a/src/Database.cpp +++ b/src/Database.cpp @@ -1,11 +1,11 @@ -#include "../include/Database.hpp" -#include "../include/Group.hpp" -#include "../include/LocalUser.hpp" -#include "../include/RemoteUser.hpp" -#include "../include/Encryption.hpp" -#include "../include/DhtKey.hpp" -#include "../include/bin2hex.hpp" -#include "../include/Log.hpp" +#include "../include/odhtdb/Database.hpp" +#include "../include/odhtdb/Group.hpp" +#include "../include/odhtdb/LocalUser.hpp" +#include "../include/odhtdb/RemoteUser.hpp" +#include "../include/odhtdb/Encryption.hpp" +#include "../include/odhtdb/DhtKey.hpp" +#include "../include/odhtdb/bin2hex.hpp" +#include "../include/odhtdb/Log.hpp" #include <boost/uuid/uuid_generators.hpp> #include <opendht.h> #include <fmt/format.h> diff --git a/src/DatabaseStorage.cpp b/src/DatabaseStorage.cpp index 5e43d1a..212ca0f 100644 --- a/src/DatabaseStorage.cpp +++ b/src/DatabaseStorage.cpp @@ -1,6 +1,6 @@ -#include "../include/DatabaseStorage.hpp" -#include "../include/User.hpp" -#include "../include/Group.hpp" +#include "../include/odhtdb/DatabaseStorage.hpp" +#include "../include/odhtdb/User.hpp" +#include "../include/odhtdb/Group.hpp" #include <cstring> #include <chrono> diff --git a/src/DhtKey.cpp b/src/DhtKey.cpp index ea59740..7bd6acf 100644 --- a/src/DhtKey.cpp +++ b/src/DhtKey.cpp @@ -1,5 +1,5 @@ -#include "../include/DhtKey.hpp" -#include "../include/types.hpp" +#include "../include/odhtdb/DhtKey.hpp" +#include "../include/odhtdb/types.hpp" namespace odhtdb { diff --git a/src/Encryption.cpp b/src/Encryption.cpp index 238861f..7f8700b 100644 --- a/src/Encryption.cpp +++ b/src/Encryption.cpp @@ -1,4 +1,4 @@ -#include "../include/Encryption.hpp" +#include "../include/odhtdb/Encryption.hpp" #include <sodium/crypto_aead_xchacha20poly1305.h> #include <sodium/randombytes.h> #include <cstring> diff --git a/src/Group.cpp b/src/Group.cpp index 12b50ed..caf3e05 100644 --- a/src/Group.cpp +++ b/src/Group.cpp @@ -1,5 +1,5 @@ -#include "../include/Group.hpp" -#include "../include/User.hpp" +#include "../include/odhtdb/Group.hpp" +#include "../include/odhtdb/User.hpp" #include <cstring> using namespace std; diff --git a/src/Hash.cpp b/src/Hash.cpp index 91bc062..e46e5ba 100644 --- a/src/Hash.cpp +++ b/src/Hash.cpp @@ -1,5 +1,5 @@ -#include "../include/Hash.hpp" -#include "../include/bin2hex.hpp" +#include "../include/odhtdb/Hash.hpp" +#include "../include/odhtdb/bin2hex.hpp" #include <sodium/crypto_generichash_blake2b.h> #include <sodium/core.h> #include <cstring> diff --git a/src/Log.cpp b/src/Log.cpp index 5d77d73..28a2784 100644 --- a/src/Log.cpp +++ b/src/Log.cpp @@ -1,4 +1,4 @@ -#include "../include/Log.hpp" +#include "../include/odhtdb/Log.hpp" #include <cstdarg> #include <mutex> diff --git a/src/Permission.cpp b/src/Permission.cpp index de0a747..57c1f11 100644 --- a/src/Permission.cpp +++ b/src/Permission.cpp @@ -1,4 +1,4 @@ -#include "../include/Permission.hpp" +#include "../include/odhtdb/Permission.hpp" namespace odhtdb { diff --git a/src/Signature.cpp b/src/Signature.cpp index d328b58..cba5954 100644 --- a/src/Signature.cpp +++ b/src/Signature.cpp @@ -1,5 +1,5 @@ -#include "../include/Signature.hpp" -#include "../include/Hash.hpp" +#include "../include/odhtdb/Signature.hpp" +#include "../include/odhtdb/Hash.hpp" #include <sodium/crypto_sign_ed25519.h> #include <sodium/utils.h> #include <cstring> diff --git a/src/User.cpp b/src/User.cpp index 4ec93cd..7b90872 100644 --- a/src/User.cpp +++ b/src/User.cpp @@ -1,5 +1,5 @@ -#include "../include/User.hpp" -#include "../include/Group.hpp" +#include "../include/odhtdb/User.hpp" +#include "../include/odhtdb/Group.hpp" namespace odhtdb { diff --git a/tests/main.cpp b/tests/main.cpp index 9992eee..30703ea 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -1,10 +1,10 @@ #include "assert.hpp" -#include "../include/Log.hpp" -#include "../include/Database.hpp" -#include "../include/Group.hpp" -#include "../include/LocalUser.hpp" -#include "../include/Encryption.hpp" -#include "../include/Hash.hpp" +#include "../include/odhtdb/Log.hpp" +#include "../include/odhtdb/Database.hpp" +#include "../include/odhtdb/Group.hpp" +#include "../include/odhtdb/LocalUser.hpp" +#include "../include/odhtdb/Encryption.hpp" +#include "../include/odhtdb/Hash.hpp" #include <vector> #include <chrono> #include <thread> |