Merge #13236: break circular dependency: random/sync -> util -> random/sync

84f41946b9 break circular dependency: random/sync -> util -> random/sync (Chun Kuan Lee)

Pull request description:

  LogPrintf  has acutally been moved to logging.h

Tree-SHA512: a7135f5fea421e62f010f2e434873bd1c1738f115453377dada7d24900b3b095535d8aa0462c3acffdacf2f4e819e05ad39b13f2de5a36ac8f7b8467c639a0db
This commit is contained in:
MarcoFalke 2018-05-17 12:25:09 -04:00
commit 1b53e4f67c
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25
2 changed files with 8 additions and 5 deletions

View File

@ -11,14 +11,15 @@
#include <compat.h> // for Windows API
#include <wincrypt.h>
#endif
#include <util.h> // for LogPrint()
#include <utilstrencodings.h> // for GetTime()
#include <logging.h> // for LogPrint()
#include <utiltime.h> // for GetTime()
#include <stdlib.h>
#include <chrono>
#include <thread>
#ifndef WIN32
#include <fcntl.h>
#include <sys/time.h>
#endif

View File

@ -4,13 +4,15 @@
#include <sync.h>
#include <memory>
#include <set>
#include <util.h>
#include <logging.h>
#include <utilstrencodings.h>
#include <stdio.h>
#include <map>
#include <memory>
#include <set>
#ifdef DEBUG_LOCKCONTENTION
#if !defined(HAVE_THREAD_LOCAL)
static_assert(false, "thread_local is not supported");