[Bf-blender-cvs] [05cc6d9] depsgraph_cleanup: Depsgraph: Remove unordered set header

[Sergey Sharybin]

Commit: 05cc6d9364f7dae86bcaaf7f0d3dbc025b50e5ac
Author: Sergey Sharybin
Date:   Thu May 26 17:02:47 2016 +0200
Branches: depsgraph_cleanup
https://developer.blender.org/rB05cc6d9364f7dae86bcaaf7f0d3dbc025b50e5ac

Depsgraph: Remove unordered set header

Once again it became unused and obsolete.

===================================================================

M	source/blender/depsgraph/CMakeLists.txt
M	source/blender/depsgraph/intern/depsgraph.h
M	source/blender/depsgraph/intern/depsgraph_build.cc
M	source/blender/depsgraph/intern/depsgraph_eval.cc
M	source/blender/depsgraph/intern/eval/deg_eval.cc
M	source/blender/depsgraph/intern/eval/deg_eval_flush.cc
M	source/blender/depsgraph/intern/nodes/deg_node.cc
M	source/blender/depsgraph/intern/nodes/deg_node.h
M	source/blender/depsgraph/intern/nodes/deg_node_component.cc
M	source/blender/depsgraph/intern/nodes/deg_node_component.h
M	source/blender/depsgraph/intern/nodes/deg_node_operation.cc
D	source/blender/depsgraph/util/deg_util_set.h

===================================================================

diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt
index 134164e..fd2a521 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -84,7 +84,6 @@ set(SRC
 
 	util/deg_util_function.h
 	util/deg_util_hash.h
-	util/deg_util_set.h
 )
 
 if(WITH_CXX11)
diff --git a/source/blender/depsgraph/intern/depsgraph.h b/source/blender/depsgraph/intern/depsgraph.h
index 5064d18..213bb30 100644
--- a/source/blender/depsgraph/intern/depsgraph.h
+++ b/source/blender/depsgraph/intern/depsgraph.h
@@ -40,8 +40,6 @@
 
 #include "intern/depsgraph_types.h"
 
-#include "util/deg_util_set.h"
-
 struct ID;
 struct GHash;
 struct GSet;
diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc
index b5c4085..b1271c3 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build.cc
@@ -36,6 +36,9 @@ extern "C" {
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
+#include "BLI_utildefines.h"
+#include "BLI_ghash.h"
+
 #include "BKE_main.h"
 
 #include "DEG_depsgraph.h"
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc
index 2668646..f8d40d0 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.cc
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cc
@@ -34,6 +34,7 @@
 
 extern "C" {
 #include "BLI_utildefines.h"
+#include "BLI_ghash.h"
 
 #include "BKE_depsgraph.h"
 #include "BKE_scene.h"
diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc
index 21742c0..198cd34 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@ -35,7 +35,9 @@
 #include "PIL_time.h"
 
 extern "C" {
+#include "BLI_utildefines.h"
 #include "BLI_task.h"
+#include "BLI_ghash.h"
 
 #include "BKE_depsgraph.h"
 #include "BKE_global.h"
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
index 28502b4..726da76 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@ -38,7 +38,9 @@
 extern "C" {
 #include "DNA_object_types.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_task.h"
+#include "BLI_ghash.h"
 
 #include "DEG_depsgraph.h"
 } /* extern "C" */
diff --git a/source/blender/depsgraph/intern/nodes/deg_node.cc b/source/blender/depsgraph/intern/nodes/deg_node.cc
index 94a8e60..6f85578 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node.cc
@@ -49,6 +49,7 @@ extern "C" {
 #include "intern/nodes/deg_node_operation.h"
 #include "intern/depsgraph_intern.h"
 #include "util/deg_util_foreach.h"
+#include "util/deg_util_hash.h"
 
 namespace DEG {
 
diff --git a/source/blender/depsgraph/intern/nodes/deg_node.h b/source/blender/depsgraph/intern/nodes/deg_node.h
index 334fe96..d7a36d2 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node.h
@@ -32,9 +32,6 @@
 
 #include "intern/depsgraph_types.h"
 
-#include "util/deg_util_hash.h"
-#include "util/deg_util_set.h"
-
 struct ID;
 struct GHash;
 struct Scene;
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.cc b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
index 4bc5c45..0ae1928 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
@@ -43,6 +43,7 @@ extern "C" {
 
 #include "intern/nodes/deg_node_operation.h"
 #include "intern/depsgraph_intern.h"
+#include "util/deg_util_hash.h"
 
 namespace DEG {
 
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.h b/source/blender/depsgraph/intern/nodes/deg_node_component.h
index 313e470..97091ff 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.h
@@ -32,9 +32,6 @@
 
 #include "intern/nodes/deg_node.h"
 
-#include "util/deg_util_hash.h"
-#include "util/deg_util_set.h"
-
 #include "BLI_utildefines.h"
 #include "BLI_string.h"
 
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_operation.cc b/source/blender/depsgraph/intern/nodes/deg_node_operation.cc
index f1eb75b..a9f9703 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_operation.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_operation.cc
@@ -38,6 +38,7 @@ extern "C" {
 
 #include "intern/depsgraph.h"
 #include "intern/depsgraph_intern.h"
+#include "util/deg_util_hash.h"
 
 namespace DEG {
 
diff --git a/source/blender/depsgraph/util/deg_util_set.h b/source/blender/depsgraph/util/deg_util_set.h
deleted file mode 100644
index 3b30574..0000000
--- a/source/blender/depsgraph/util/deg_util_set.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2014 Blender Foundation.
- * All rights reserved.
- *
- * Original Author: Brecht van Lommel
- * Contributor(s): Lukas Toenne
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/depsgraph/util/deg_util_set.h
- *  \ingroup depsgraph
- */
-
-#pragma once
-
-#include <set>
-
-using std::set;
-
-#if defined(DEG_NO_UNORDERED_MAP)
-#  include <set>
-typedef std::set unordered_set;
-#endif
-
-#if defined(DEG_TR1_UNORDERED_MAP)
-#  include <tr1/unordered_set>
-using std::tr1::unordered_set;
-#endif
-
-#if defined(DEG_STD_UNORDERED_MAP)
-#  include <unordered_set>
-using std::unordered_set;
-#endif
-
-#if defined(DEG_STD_UNORDERED_MAP_IN_TR1_NAMESPACE)
-#  include <unordered_set>
-using std::tr1::unordered_set;
-#endif
-
-#if !defined(DEG_NO_UNORDERED_MAP) && !defined(DEG_TR1_UNORDERED_MAP) && \
-    !defined(DEG_STD_UNORDERED_MAP) && !defined(DEG_STD_UNORDERED_MAP_IN_TR1_NAMESPACE)  // NOLINT
-#  error One of: DEG_NO_UNORDERED_MAP, DEG_TR1_UNORDERED_MAP,\
- DEG_STD_UNORDERED_MAP, DEG_STD_UNORDERED_MAP_IN_TR1_NAMESPACE must be defined!  // NOLINT
-#endif