Differential D1185 Diff 3766 intern/cycles/util/util_map.h

Changeset View

Standalone View

intern/cycles/util/util_map.h

	Show All 12 Lines
	* See the License for the specific language governing permissions and			* See the License for the specific language governing permissions and
	* limitations under the License.			* limitations under the License.
	*/			*/

	#ifndef __UTIL_MAP_H__			#ifndef __UTIL_MAP_H__
	#define __UTIL_MAP_H__			#define __UTIL_MAP_H__

	#include <map>			#include <map>
	#include <boost/tr1/unordered_map.hpp>
				#if defined(CYCLES_TR1_UNORDERED_MAP)
				# include <tr1/unordered_map>
				#endif
				sergeyUnsubmitted Not Done Inline Actions This we could also get rid of, see https://developer.blender.org/diffusion/B/browse/depsgraph_refactor/source/blender/depsgraph/util/depsgraph_util_map.h Could be done as a separate change as well. sergey: This we could also get rid of, see https://developer.blender.

				#if defined(CYCLES_STD_UNORDERED_MAP) \|\| defined(CYCLES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE)
				# include <unordered_map>
				#endif

				#if !defined(CYCLES_NO_UNORDERED_MAP) && !defined(CYCLES_TR1_UNORDERED_MAP) && \
				!defined(CYCLES_STD_UNORDERED_MAP) && !defined(CYCLES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE) // NOLINT
				# error One of: CYCLES_NO_UNORDERED_MAP, CYCLES_TR1_UNORDERED_MAP,\
				CYCLES_STD_UNORDERED_MAP, CYCLES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE must be defined! // NOLINT
				#endif


	CCL_NAMESPACE_BEGIN			CCL_NAMESPACE_BEGIN

	using std::map;			using std::map;
	using std::pair;			using std::pair;

				#if defined(CYCLES_NO_UNORDERED_MAP)
				typedef std::map unordered_map;
				#endif

				#if defined(CYCLES_TR1_UNORDERED_MAP) \|\| defined(CYCLES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE)
	using std::tr1::unordered_map;			using std::tr1::unordered_map;
				#endif

				#if defined(CYCLES_STD_UNORDERED_MAP)
				using std::unordered_map;
				#endif

	CCL_NAMESPACE_END			CCL_NAMESPACE_END

	#endif /* __UTIL_MAP_H__ */			#endif /* __UTIL_MAP_H__ */