Commit: 11f4e8d5ea63acaeb35e81d9f1b3b718d1f8e1f9
Author: Sergey Sharybin
Date: Thu May 26 15:42:34 2016 +0200
Branches: depsgraph_cleanup
https://developer.blender.org/rB11f4e8d5ea63acaeb35e81d9f1b3b718d1f8e1f9
Depsgraph: Remove unordered map utility
Is not in use anymore.
Hopefully speed still stays at the same level.
===================================================================
M source/blender/depsgraph/CMakeLists.txt
M source/blender/depsgraph/intern/nodes/deg_node.h
M source/blender/depsgraph/intern/nodes/deg_node_component.h
D source/blender/depsgraph/util/deg_util_map.h
===================================================================
diff --git a/source/blender/depsgraph/CMakeLists.txt
b/source/blender/depsgraph/CMakeLists.txt
index 8c25b45..134164e 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_map.h
util/deg_util_set.h
)
diff --git a/source/blender/depsgraph/intern/nodes/deg_node.h
b/source/blender/depsgraph/intern/nodes/deg_node.h
index 1092997..334fe96 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node.h
@@ -33,7 +33,6 @@
#include "intern/depsgraph_types.h"
#include "util/deg_util_hash.h"
-#include "util/deg_util_map.h"
#include "util/deg_util_set.h"
struct ID;
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.h
b/source/blender/depsgraph/intern/nodes/deg_node_component.h
index b41aed6..313e470 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.h
@@ -33,7 +33,6 @@
#include "intern/nodes/deg_node.h"
#include "util/deg_util_hash.h"
-#include "util/deg_util_map.h"
#include "util/deg_util_set.h"
#include "BLI_utildefines.h"
diff --git a/source/blender/depsgraph/util/deg_util_map.h
b/source/blender/depsgraph/util/deg_util_map.h
deleted file mode 100644
index ffc2160..0000000
--- a/source/blender/depsgraph/util/deg_util_map.h
+++ /dev/null
@@ -1,62 +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_map.h
- * \ingroup depsgraph
- */
-
-#pragma once
-
-#include <map>
-
-//using std::map;
-//using std::pair;
-
-#if defined(DEG_NO_UNORDERED_MAP)
-# include <map>
-typedef std::map unordered_map;
-#endif
-
-#if defined(DEG_TR1_UNORDERED_MAP)
-# include <tr1/unordered_map>
-using std::tr1::unordered_map;
-#endif
-
-#if defined(DEG_STD_UNORDERED_MAP)
-# include <unordered_map>
-using std::unordered_map;
-#endif
-
-#if defined(DEG_STD_UNORDERED_MAP_IN_TR1_NAMESPACE)
-# include <unordered_map>
-using std::tr1::unordered_map;
-#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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
