blender
/
blender
133
398
Fork 577
Code Issues 6.3k Pull Requests 740 Projects 19 Wiki Activity

Cleanup: Move std::deque to depsgraph_type.h 

Since `std::deque` is used in a few areas of the Depsgraph, and an
upcoming patch adds one more, it's time it's considered as "commonly
used type".

No functional changes.
This commit is contained in:
Sybren A. Stüvel 2020-03-05 17:31:40 +01:00
parent c43725e189
commit a874cfb858
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
View File

@ -28,7 +28,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <cstring> /* required for STREQ later on. */
#include <deque>
#include <unordered_set>
#include "MEM_guardedalloc.h"
@ -121,7 +120,6 @@ extern "C" {
namespace DEG {
using std::deque;
using std::unordered_set;
/* ***************** */

5
source/blender/depsgraph/intern/depsgraph_query_foreach.cc
View File

@ -23,9 +23,6 @@
* Implementation of Querying and Filtering API's
*/
// TODO(sergey): Use some sort of wrapper.
#include <deque>
#include "MEM_guardedalloc.h"
extern "C" {
@ -51,7 +48,7 @@ extern "C" {
namespace DEG {
namespace {
typedef std::deque<OperationNode *> TraversalQueue;
typedef deque<OperationNode *> TraversalQueue;
enum {
DEG_NODE_VISITED = (1 << 0),
};

2
source/blender/depsgraph/intern/depsgraph_type.h
View File

@ -34,6 +34,7 @@
/* TODO(sergey): Ideally we'll just use char* and statically allocated strings
* to avoid any possible overhead caused by string (re)allocation/formatting. */
#include <string>
#include <deque>
#include <vector>
#include <algorithm>
#include <map>
@ -47,6 +48,7 @@ struct CustomData_MeshMasks;
namespace DEG {
/* Commonly used types. */
using std::deque;
using std::map;
using std::pair;
using std::set;

5
source/blender/depsgraph/intern/eval/deg_eval_flush.cc
View File

@ -25,8 +25,6 @@
#include "intern/eval/deg_eval_flush.h"
// TODO(sergey): Use some sort of wrapper.
#include <deque>
#include <cmath>
#include "BLI_utildefines.h"
@ -50,6 +48,7 @@ extern "C" {
#include "intern/debug/deg_debug.h"
#include "intern/depsgraph.h"
#include "intern/depsgraph_relation.h"
#include "intern/depsgraph_type.h"
#include "intern/depsgraph_update.h"
#include "intern/node/deg_node.h"
#include "intern/node/deg_node_component.h"
@ -84,7 +83,7 @@ enum {
COMPONENT_STATE_DONE = 2,
};
typedef std::deque<OperationNode *> FlushQueue;
typedef deque<OperationNode *> FlushQueue;
namespace {