diff options
author | Gereon Kremer <gereon.kremer@cs.rwth-aachen.de> | 2021-03-09 13:48:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-09 13:48:43 +0100 |
commit | 540ef6910a2b7ffeb67bac18dfc489fb4a6115d6 (patch) | |
tree | 23b0c78b126cb5b1584b75eca14fe648624a023a /src/context | |
parent | b302cb1f92aae1c0954c86065469e5c2b7206e74 (diff) |
Some more cleanup of includes (#6083)
This PR does some more cleanup of the includes.
Diffstat (limited to 'src/context')
-rw-r--r-- | src/context/cdhashmap.h | 1 | ||||
-rw-r--r-- | src/context/cdlist.h | 2 | ||||
-rw-r--r-- | src/context/cdtrail_queue.h | 3 | ||||
-rw-r--r-- | src/context/context_mm.cpp | 10 | ||||
-rw-r--r-- | src/context/context_mm.h | 8 |
5 files changed, 14 insertions, 10 deletions
diff --git a/src/context/cdhashmap.h b/src/context/cdhashmap.h index e25945291..4ab552001 100644 --- a/src/context/cdhashmap.h +++ b/src/context/cdhashmap.h @@ -86,7 +86,6 @@ #include <functional> #include <iterator> #include <unordered_map> -#include <vector> #include "base/check.h" #include "context/cdhashmap_forward.h" diff --git a/src/context/cdlist.h b/src/context/cdlist.h index 2abd0b824..b1c8229f0 100644 --- a/src/context/cdlist.h +++ b/src/context/cdlist.h @@ -22,9 +22,7 @@ #include <cstring> #include <iterator> -#include <memory> #include <string> -#include <sstream> #include "base/check.h" #include "context/cdlist_forward.h" diff --git a/src/context/cdtrail_queue.h b/src/context/cdtrail_queue.h index cf36156cf..f505004cb 100644 --- a/src/context/cdtrail_queue.h +++ b/src/context/cdtrail_queue.h @@ -22,12 +22,13 @@ #ifndef CVC4__CONTEXT__CDTRAIL_QUEUE_H #define CVC4__CONTEXT__CDTRAIL_QUEUE_H -#include "context/context.h" #include "context/cdlist.h" +#include "context/cdo.h" namespace CVC4 { namespace context { +class Context; template <class T> class CDTrailQueue { diff --git a/src/context/context_mm.cpp b/src/context/context_mm.cpp index db9d89dd1..4d9413320 100644 --- a/src/context/context_mm.cpp +++ b/src/context/context_mm.cpp @@ -15,9 +15,11 @@ **/ #include <cstdlib> -#include <vector> #include <deque> +#include <limits> #include <new> +#include <ostream> +#include <vector> #ifdef CVC4_VALGRIND #include <valgrind/memcheck.h> @@ -166,6 +168,12 @@ void ContextMemoryManager::pop() { d_freeChunks.pop_front(); } } +#else + +unsigned ContextMemoryManager::getMaxAllocationSize() +{ + return std::numeric_limits<unsigned>::max(); +} #endif /* CVC4_DEBUG_CONTEXT_MEMORY_MANAGER */ diff --git a/src/context/context_mm.h b/src/context/context_mm.h index 43e0e1f94..e20b9fdb9 100644 --- a/src/context/context_mm.h +++ b/src/context/context_mm.h @@ -20,8 +20,9 @@ #ifndef CVC4__CONTEXT__CONTEXT_MM_H #define CVC4__CONTEXT__CONTEXT_MM_H +#ifndef CVC4_DEBUG_CONTEXT_MEMORY_MANAGER #include <deque> -#include <limits> +#endif #include <vector> namespace CVC4 { @@ -161,10 +162,7 @@ class ContextMemoryManager { class ContextMemoryManager { public: - static unsigned getMaxAllocationSize() - { - return std::numeric_limits<unsigned>::max(); - } + static unsigned getMaxAllocationSize(); ContextMemoryManager() { d_allocations.push_back(std::vector<char*>()); } ~ContextMemoryManager() |