gitMirror/spdlog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v1.x' into std-format

Browse Source
This commit is contained in:
Charles Milette
2021-11-14 16:02:38 -05:00
committed by GitHub
parent d75de3d3b2 85bdfc8695
commit 8e359baaec
6 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/spdlog/details/mpmc_blocking_q.h
View File

@@ -49,7 +49,7 @@ public:
push_cv_.notify_one();
}
// try to dequeue item. if no item found. wait upto timeout and try again
// try to dequeue item. if no item found. wait up to timeout and try again
// Return true, if succeeded dequeue item, false otherwise
bool dequeue_for(T &popped_item, std::chrono::milliseconds wait_duration)
{
@@ -87,7 +87,7 @@ public:
push_cv_.notify_one();
}
// try to dequeue item. if no item found. wait upto timeout and try again
// try to dequeue item. if no item found. wait up to timeout and try again
// Return true, if succeeded dequeue item, false otherwise
bool dequeue_for(T &popped_item, std::chrono::milliseconds wait_duration)
{

3
include/spdlog/details/udp_client.h
View File

@@ -14,6 +14,7 @@
#include <spdlog/details/os.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <unistd.h>
#include <netdb.h>
@@ -90,4 +91,4 @@ public:
}
};
} // namespace details
} // namespace spdlog
} // namespace spdlog