Merge branch 'adam/1.16' of github.com:/zerotier/ZeroTierOne into adam/1.16
Some checks are pending
/ build_macos (push) Waiting to run
/ build_windows (push) Waiting to run
/ build_ubuntu (push) Waiting to run

This commit is contained in:
Adam Ierymenko 2025-08-20 17:27:03 -04:00
commit 6bf7b4d9ba
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3

View file

@ -2,7 +2,7 @@
* See LICENSE.txt in nonfree/
*/
include "DB.hpp"
#include "DB.hpp"
#ifdef ZT_CONTROLLER_USE_LIBPQ
@ -19,9 +19,8 @@ include "DB.hpp"
#include <pqxx/pqxx>
#include <redis++/redis++.h>
namespace ZeroTier
{
class CV2 : public DB {
namespace ZeroTier {
class CV2 : public DB {
friend class MemberNotificationReceiver<CV2>;
friend class NetworkNotificationReceiver<CV2>;
@ -92,7 +91,7 @@ include "DB.hpp"
int _listenPort;
uint8_t _ssoPsk[48];
};
};
} // namespace ZeroTier