[Bf-blender-cvs] [18c6d7b0663] newboolean: Use #pragma in newboolean branch.
Howard Trickey
noreply at git.blender.org
Sun Aug 9 13:32:56 CEST 2020
Commit: 18c6d7b06630b3589a1753690cb333549899d474
Author: Howard Trickey
Date: Sun Aug 9 07:32:33 2020 -0400
Branches: newboolean
https://developer.blender.org/rB18c6d7b06630b3589a1753690cb333549899d474
Use #pragma in newboolean branch.
===================================================================
M source/blender/blenlib/BLI_boolean.hh
M source/blender/blenlib/BLI_double2.hh
M source/blender/blenlib/BLI_double3.hh
M source/blender/blenlib/BLI_math_mpq.hh
M source/blender/blenlib/BLI_mesh_intersect.hh
M source/blender/blenlib/BLI_mpq2.hh
M source/blender/blenlib/BLI_mpq3.hh
===================================================================
diff --git a/source/blender/blenlib/BLI_boolean.hh b/source/blender/blenlib/BLI_boolean.hh
index 2b39f494950..b9b57216345 100644
--- a/source/blender/blenlib/BLI_boolean.hh
+++ b/source/blender/blenlib/BLI_boolean.hh
@@ -14,8 +14,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __BLI_BOOLEAN_HH__
-#define __BLI_BOOLEAN_HH__
+#pragma once
/** \file
* \ingroup bli
@@ -75,4 +74,3 @@ Mesh boolean_trimesh(Mesh &tm,
} // namespace blender::meshintersect
#endif /* WITH_GMP */
-#endif /* __BLI_BOOLEAN_HH__ */
diff --git a/source/blender/blenlib/BLI_double2.hh b/source/blender/blenlib/BLI_double2.hh
index 2685cdc29ab..a85f74ee442 100644
--- a/source/blender/blenlib/BLI_double2.hh
+++ b/source/blender/blenlib/BLI_double2.hh
@@ -14,8 +14,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __BLI_DOUBLE2_HH__
-#define __BLI_DOUBLE2_HH__
+#pragma once
#include "BLI_double3.hh"
@@ -141,5 +140,3 @@ struct double2 {
};
} // namespace blender
-
-#endif /* __BLI_DOUBLE_HH__ */
diff --git a/source/blender/blenlib/BLI_double3.hh b/source/blender/blenlib/BLI_double3.hh
index 5531066ca36..11a88e121ca 100644
--- a/source/blender/blenlib/BLI_double3.hh
+++ b/source/blender/blenlib/BLI_double3.hh
@@ -14,8 +14,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __BLI_DOUBLE3_HH__
-#define __BLI_DOUBLE3_HH__
+#pragma once
#include <iostream>
@@ -239,5 +238,3 @@ struct double3 {
};
} // namespace blender
-
-#endif /* __BLI_DOUBLE3_HH__ */
diff --git a/source/blender/blenlib/BLI_math_mpq.hh b/source/blender/blenlib/BLI_math_mpq.hh
index cec2a8956f2..2ed0c9549c8 100644
--- a/source/blender/blenlib/BLI_math_mpq.hh
+++ b/source/blender/blenlib/BLI_math_mpq.hh
@@ -14,8 +14,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __BLI_MATH_MPQ_HH__
-#define __BLI_MATH_MPQ_HH__
+#pragma once
#ifdef WITH_GMP
@@ -31,4 +30,3 @@
# include "gmpxx.h"
#endif /* WITH_GMP */
-#endif /* __BLI_MATH_MPQ_HH__ */
diff --git a/source/blender/blenlib/BLI_mesh_intersect.hh b/source/blender/blenlib/BLI_mesh_intersect.hh
index 6a1007e5a1a..39738376b1a 100644
--- a/source/blender/blenlib/BLI_mesh_intersect.hh
+++ b/source/blender/blenlib/BLI_mesh_intersect.hh
@@ -14,8 +14,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __BLI_MESH_INTERSECT_HH__
-#define __BLI_MESH_INTERSECT_HH__
+#pragma once
/** \file
* \ingroup bli
@@ -357,4 +356,3 @@ void write_obj_mesh(Mesh &m, const std::string &objname);
} /* namespace blender::meshintersect */
#endif /* WITH_GMP */
-#endif /* __BLI_MESH_INTERSECT_HH__ */
diff --git a/source/blender/blenlib/BLI_mpq2.hh b/source/blender/blenlib/BLI_mpq2.hh
index a78ffaaa32d..a37140da5ec 100644
--- a/source/blender/blenlib/BLI_mpq2.hh
+++ b/source/blender/blenlib/BLI_mpq2.hh
@@ -14,8 +14,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __BLI_MPQ2_HH__
-#define __BLI_MPQ2_HH__
+#pragma once
#ifdef WITH_GMP
@@ -177,4 +176,3 @@ struct mpq2 {
} // namespace blender
#endif /* WITH_GMP */
-#endif /* __BLI_MPQ_HH__ */
diff --git a/source/blender/blenlib/BLI_mpq3.hh b/source/blender/blenlib/BLI_mpq3.hh
index 0c9edb5a440..fd47abe3dde 100644
--- a/source/blender/blenlib/BLI_mpq3.hh
+++ b/source/blender/blenlib/BLI_mpq3.hh
@@ -14,8 +14,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __BLI_MPQ3_HH__
-#define __BLI_MPQ3_HH__
+#pragma once
#ifdef WITH_GMP
@@ -273,4 +272,3 @@ uint64_t hash_mpq_class(const mpq_class &value);
} // namespace blender
#endif /* WITH_GMP */
-#endif /* __BLI_MPQ3_HH__ */
More information about the Bf-blender-cvs
mailing list