[Bf-blender-cvs] [23940ff1e1b] master: Cleanup: conform header guards to Blender's style
Campbell Barton
noreply at git.blender.org
Tue Dec 17 01:43:44 CET 2019
Commit: 23940ff1e1beef735cdb89da53aeb14684284825
Author: Campbell Barton
Date: Tue Dec 17 11:42:19 2019 +1100
Branches: master
https://developer.blender.org/rB23940ff1e1beef735cdb89da53aeb14684284825
Cleanup: conform header guards to Blender's style
===================================================================
M source/blender/collada/ExtraTags.h
M source/blender/modifiers/intern/MOD_solidify_util.h
M source/blender/usd/intern/abstract_hierarchy_iterator.h
M source/blender/usd/intern/usd_exporter_context.h
M source/blender/usd/intern/usd_hierarchy_iterator.h
M source/blender/usd/intern/usd_writer_abstract.h
M source/blender/usd/intern/usd_writer_camera.h
M source/blender/usd/intern/usd_writer_hair.h
M source/blender/usd/intern/usd_writer_light.h
M source/blender/usd/intern/usd_writer_mesh.h
M source/blender/usd/intern/usd_writer_transform.h
M source/blender/usd/usd.h
===================================================================
diff --git a/source/blender/collada/ExtraTags.h b/source/blender/collada/ExtraTags.h
index 2d827159af8..9191182c757 100644
--- a/source/blender/collada/ExtraTags.h
+++ b/source/blender/collada/ExtraTags.h
@@ -18,6 +18,9 @@
* \ingroup collada
*/
+#ifndef __EXTRATAGS_H__
+#define __EXTRATAGS_H__
+
#include <string>
#include <map>
#include <vector>
@@ -70,3 +73,5 @@ class ExtraTags {
/** Get text data for tag as a string. */
std::string asString(std::string tag, bool *ok);
};
+
+#endif /* __EXTRATAGS_H__ */
diff --git a/source/blender/modifiers/intern/MOD_solidify_util.h b/source/blender/modifiers/intern/MOD_solidify_util.h
index dba360dc1ce..3a9608861dc 100644
--- a/source/blender/modifiers/intern/MOD_solidify_util.h
+++ b/source/blender/modifiers/intern/MOD_solidify_util.h
@@ -18,8 +18,8 @@
* \ingroup modifiers
*/
-#ifndef __MOD_MESHCACHE_UTIL_H__
-#define __MOD_MESHCACHE_UTIL_H__
+#ifndef __MOD_SOLIDIFY_UTIL_H__
+#define __MOD_SOLIDIFY_UTIL_H__
/* MOD_solidify_extrude.c */
Mesh *MOD_solidify_extrude_applyModifier(ModifierData *md,
@@ -31,4 +31,4 @@ Mesh *MOD_solidify_nonmanifold_applyModifier(ModifierData *md,
const ModifierEvalContext *ctx,
Mesh *mesh);
-#endif /* __MOD_MESHCACHE_UTIL_H__ */
+#endif /* __MOD_SOLIDIFY_UTIL_H__ */
diff --git a/source/blender/usd/intern/abstract_hierarchy_iterator.h b/source/blender/usd/intern/abstract_hierarchy_iterator.h
index db1e4248cab..ea31e94cf9b 100644
--- a/source/blender/usd/intern/abstract_hierarchy_iterator.h
+++ b/source/blender/usd/intern/abstract_hierarchy_iterator.h
@@ -33,8 +33,8 @@
* Selections like "selected only" or "no hair systems" are left to concrete subclasses.
*/
-#ifndef __USD__ABSTRACT_HIERARCHY_ITERATOR_H__
-#define __USD__ABSTRACT_HIERARCHY_ITERATOR_H__
+#ifndef __ABSTRACT_HIERARCHY_ITERATOR_H__
+#define __ABSTRACT_HIERARCHY_ITERATOR_H__
#include <map>
#include <string>
@@ -245,4 +245,4 @@ class AbstractHierarchyIterator {
} // namespace USD
-#endif /* __USD__ABSTRACT_HIERARCHY_ITERATOR_H__ */
+#endif /* __ABSTRACT_HIERARCHY_ITERATOR_H__ */
diff --git a/source/blender/usd/intern/usd_exporter_context.h b/source/blender/usd/intern/usd_exporter_context.h
index aaa0121807c..35ff13b2e91 100644
--- a/source/blender/usd/intern/usd_exporter_context.h
+++ b/source/blender/usd/intern/usd_exporter_context.h
@@ -16,8 +16,8 @@
* The Original Code is Copyright (C) 2019 Blender Foundation.
* All rights reserved.
*/
-#ifndef __USD__USD_EXPORTER_CONTEXT_H__
-#define __USD__USD_EXPORTER_CONTEXT_H__
+#ifndef __USD_EXPORTER_CONTEXT_H__
+#define __USD_EXPORTER_CONTEXT_H__
#include "usd.h"
@@ -41,4 +41,4 @@ struct USDExporterContext {
} // namespace USD
-#endif /* __USD__USD_EXPORTER_CONTEXT_H__ */
+#endif /* __USD_EXPORTER_CONTEXT_H__ */
diff --git a/source/blender/usd/intern/usd_hierarchy_iterator.h b/source/blender/usd/intern/usd_hierarchy_iterator.h
index a937df8f15b..90c82c6e551 100644
--- a/source/blender/usd/intern/usd_hierarchy_iterator.h
+++ b/source/blender/usd/intern/usd_hierarchy_iterator.h
@@ -16,8 +16,8 @@
* The Original Code is Copyright (C) 2019 Blender Foundation.
* All rights reserved.
*/
-#ifndef __USD__USD_HIERARCHY_ITERATOR_H__
-#define __USD__USD_HIERARCHY_ITERATOR_H__
+#ifndef __USD_HIERARCHY_ITERATOR_H__
+#define __USD_HIERARCHY_ITERATOR_H__
#include "abstract_hierarchy_iterator.h"
#include "usd_exporter_context.h"
@@ -68,4 +68,4 @@ class USDHierarchyIterator : public AbstractHierarchyIterator {
} // namespace USD
-#endif /* __USD__USD_HIERARCHY_ITERATOR_H__ */
+#endif /* __USD_HIERARCHY_ITERATOR_H__ */
diff --git a/source/blender/usd/intern/usd_writer_abstract.h b/source/blender/usd/intern/usd_writer_abstract.h
index cea4685c806..8f727638704 100644
--- a/source/blender/usd/intern/usd_writer_abstract.h
+++ b/source/blender/usd/intern/usd_writer_abstract.h
@@ -16,8 +16,8 @@
* The Original Code is Copyright (C) 2019 Blender Foundation.
* All rights reserved.
*/
-#ifndef __USD__USD_WRITER_ABSTRACT_H__
-#define __USD__USD_WRITER_ABSTRACT_H__
+#ifndef __USD_WRITER_ABSTRACT_H__
+#define __USD_WRITER_ABSTRACT_H__
#include "usd_exporter_context.h"
#include "abstract_hierarchy_iterator.h"
@@ -75,4 +75,4 @@ class USDAbstractWriter : public AbstractHierarchyWriter {
} // namespace USD
-#endif /* __USD__USD_WRITER_ABSTRACT_H__ */
+#endif /* __USD_WRITER_ABSTRACT_H__ */
diff --git a/source/blender/usd/intern/usd_writer_camera.h b/source/blender/usd/intern/usd_writer_camera.h
index 86b5ed464b0..971264ef11e 100644
--- a/source/blender/usd/intern/usd_writer_camera.h
+++ b/source/blender/usd/intern/usd_writer_camera.h
@@ -16,8 +16,8 @@
* The Original Code is Copyright (C) 2019 Blender Foundation.
* All rights reserved.
*/
-#ifndef __USD__USD_WRITER_CAMERA_H__
-#define __USD__USD_WRITER_CAMERA_H__
+#ifndef __USD_WRITER_CAMERA_H__
+#define __USD_WRITER_CAMERA_H__
#include "usd_writer_abstract.h"
@@ -35,4 +35,4 @@ class USDCameraWriter : public USDAbstractWriter {
} // namespace USD
-#endif /* __USD__USD_WRITER_CAMERA_H__ */
+#endif /* __USD_WRITER_CAMERA_H__ */
diff --git a/source/blender/usd/intern/usd_writer_hair.h b/source/blender/usd/intern/usd_writer_hair.h
index ccb5af76099..1e882fa1654 100644
--- a/source/blender/usd/intern/usd_writer_hair.h
+++ b/source/blender/usd/intern/usd_writer_hair.h
@@ -16,8 +16,8 @@
* The Original Code is Copyright (C) 2019 Blender Foundation.
* All rights reserved.
*/
-#ifndef __USD__USD_WRITER_HAIR_H__
-#define __USD__USD_WRITER_HAIR_H__
+#ifndef __USD_WRITER_HAIR_H__
+#define __USD_WRITER_HAIR_H__
#include "usd_writer_abstract.h"
@@ -35,4 +35,4 @@ class USDHairWriter : public USDAbstractWriter {
} // namespace USD
-#endif /* __USD__USD_WRITER_HAIR_H__ */
+#endif /* __USD_WRITER_HAIR_H__ */
diff --git a/source/blender/usd/intern/usd_writer_light.h b/source/blender/usd/intern/usd_writer_light.h
index 3813412c330..349c034b6bc 100644
--- a/source/blender/usd/intern/usd_writer_light.h
+++ b/source/blender/usd/intern/usd_writer_light.h
@@ -16,8 +16,8 @@
* The Original Code is Copyright (C) 2019 Blender Foundation.
* All rights reserved.
*/
-#ifndef __USD__USD_WRITER_LIGHT_H__
-#define __USD__USD_WRITER_LIGHT_H__
+#ifndef __USD_WRITER_LIGHT_H__
+#define __USD_WRITER_LIGHT_H__
#include "usd_writer_abstract.h"
@@ -34,4 +34,4 @@ class USDLightWriter : public USDAbstractWriter {
} // namespace USD
-#endif /* __USD__USD_WRITER_LIGHT_H__ */
+#endif /* __USD_WRITER_LIGHT_H__ */
diff --git a/source/blender/usd/intern/usd_writer_mesh.h b/source/blender/usd/intern/usd_writer_mesh.h
index 0f03c8d20ae..56738e9747d 100644
--- a/source/blender/usd/intern/usd_writer_mesh.h
+++ b/source/blender/usd/intern/usd_writer_mesh.h
@@ -16,8 +16,8 @@
* The Original Code is Copyright (C) 2019 Blender Foundation.
* All rights reserved.
*/
-#ifndef __USD__USD_WRITER_MESH_H__
-#define __USD__USD_WRITER_MESH_H__
+#ifndef __USD_WRITER_MESH_H__
+#define __USD_WRITER_MESH_H__
#include "usd_writer_abstract.h"
@@ -63,4 +63,4 @@ class USDMeshWriter : public USDGenericMeshWriter {
} // namespace USD
-#endif /* __USD__USD_WRITER_MESH_H__ */
+#endif /* __USD_WRITER_MESH_H__ */
diff --git a/source/blender/usd/intern/usd_writer_transform.h b/source/blender/usd/intern/usd_writer_transform.h
index fb591998e6a..52c4a657f33 100644
--- a/source/blender/usd/intern/usd_writer_transform.h
+++ b/source/blender/usd/intern/usd_writer_transform.h
@@ -16,8 +16,8 @@
* The Original Code is Copyright (C) 2019 Blender Foundation.
* All rights reserved.
*/
-#ifndef __USD__USD_WRITER_TRANSFORM_H__
-#define __USD__USD_WRITER_TRANSFORM_H__
+#ifndef __USD_WRITER_TRANSFORM_H__
+#define __USD_WRITER_TRANSFORM_H__
#include "usd_writer_abstract.h"
@@ -39,4 +39,4 @@ class USDTransformWriter : public USDAbstractWriter {
} // namespace USD
-#endif /* __USD__USD_WRITER_TRANSFORM_H__ */
+#endif /* __USD_WRITER_TRANSFORM_H__ */
diff --git a/source/blender/usd/usd.h b/source/blender/usd/usd.h
index 412a51b8061..1a6f5819e21 100644
--- a/source/blender/usd/usd.h
+++ b/source/blender/usd/usd.h
@@ -17,8 +17,8 @@
* All rights reserved.
*/
-#ifndef __BLENDER_USD_H__
-#define __BLENDER_USD_H__
+#ifndef __USD_H__
+#define __USD_H__
#ifdef __cplusplus
extern "C" {
@@ -59,4 +59,4 @@ bool USD_export(struct bContext *C,
}
#endif
-#endif /* __BLENDER_USD_H__ */
+#endif /* __USD_H__ */
More information about the Bf-blender-cvs
mailing list