Merge branch 'master' into asset-uuid--archivedasset-uuid--archived

1 files changed, 8 insertions, 4 deletions

diff --git a/source/blender/io/alembic/intern/abc_reader_curves.h b/source/blender/io/alembic/intern/abc_reader_curves.h
index eb0538308f8..7488adb9b24 100644
--- a/source/blender/io/alembic/intern/abc_reader_curves.h
+++ b/source/blender/io/alembic/intern/abc_reader_curves.h
@@ -16,14 +16,12 @@
  * The Original Code is Copyright (C) 2016 Kévin Dietrich.
  * All rights reserved.
  */
+#pragma once
 
 /** \file
  * \ingroup balembic
  */
 
-#ifndef __ABC_READER_CURVES_H__
-#define __ABC_READER_CURVES_H__
-
 #include "abc_reader_mesh.h"
 #include "abc_reader_object.h"
 
@@ -31,6 +29,10 @@ struct Curve;
 
 #define ABC_CURVE_RESOLUTION_U_PROPNAME "blender:resolution"
 
+namespace blender {
+namespace io {
+namespace alembic {
+
 class AbcCurveReader : public AbcObjectReader {
   Alembic::AbcGeom::ICurvesSchema m_curves_schema;
 
@@ -53,4 +55,6 @@ class AbcCurveReader : public AbcObjectReader {
                          const Alembic::Abc::ISampleSelector &sample_selector);
 };
 
-#endif /* __ABC_READER_CURVES_H__ */
+}  // namespace alembic
+}  // namespace io
+}  // namespace blender