Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-02-17 22:59:41 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-02-17 22:59:41 +0400
commit2b7ca2304a9b17568fac57a0bceba72b9c9ab580 (patch)
tree0cb3492a7d6624bca9390375a5b20bd5b86f76d5 /intern/container
parent99d0ba6299d9f2acdf2446b2f52e812877ebcc70 (diff)
unify include guard defines, __$FILENAME__
without the underscores these clogged up the namespace for autocompleation which was annoying.
Diffstat (limited to 'intern/container')
-rw-r--r--intern/container/CTR_TaggedIndex.h4
-rw-r--r--intern/container/CTR_TaggedSetOps.h4
-rw-r--r--intern/container/CTR_UHeap.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/intern/container/CTR_TaggedIndex.h b/intern/container/CTR_TaggedIndex.h
index 00a24d07760..8420414d6c7 100644
--- a/intern/container/CTR_TaggedIndex.h
+++ b/intern/container/CTR_TaggedIndex.h
@@ -36,8 +36,8 @@
* Simple tagged index class.
*/
-#ifndef NAN_INCLUDED_CTR_TaggedIndex_h
-#define NAN_INCLUDED_CTR_TaggedIndex_h
+#ifndef __CTR_TAGGEDINDEX_H__
+#define __CTR_TAGGEDINDEX_H__
/**
* This class is supposed to be a simple tagged index class. If these
diff --git a/intern/container/CTR_TaggedSetOps.h b/intern/container/CTR_TaggedSetOps.h
index 9dc4e4f00db..d30081d2d60 100644
--- a/intern/container/CTR_TaggedSetOps.h
+++ b/intern/container/CTR_TaggedSetOps.h
@@ -30,8 +30,8 @@
*/
-#ifndef NAN_INCLUDED_LOD_TaggedSetOps_h
-#define NAN_INCLUDED_LOD_TaggedSetOps_h
+#ifndef __CTR_TAGGEDSETOPS_H__
+#define __CTR_TAGGEDSETOPS_H__
#include "MEM_NonCopyable.h"
#include <vector>
diff --git a/intern/container/CTR_UHeap.h b/intern/container/CTR_UHeap.h
index 11813c48331..ad3d7d2bb02 100644
--- a/intern/container/CTR_UHeap.h
+++ b/intern/container/CTR_UHeap.h
@@ -44,8 +44,8 @@
*
*/
-#ifndef NAN_INCLUDED_CTR_UHeap_h
-#define NAN_INCLUDED_CTR_UHeap_h
+#ifndef __CTR_UHEAP_H__
+#define __CTR_UHEAP_H__
#include <vector>