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_archive.h b/source/blender/io/alembic/intern/abc_reader_archive.h
index 304c876adce..aea62b46cce 100644
--- a/source/blender/io/alembic/intern/abc_reader_archive.h
+++ b/source/blender/io/alembic/intern/abc_reader_archive.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_ARCHIVE_H__
-#define __ABC_READER_ARCHIVE_H__
-
 #include <Alembic/Abc/All.h>
 #include <Alembic/AbcCoreOgawa/All.h>
 
@@ -32,6 +30,10 @@
 struct Main;
 struct Scene;
 
+namespace blender {
+namespace io {
+namespace alembic {
+
 /* Wrappers around input and output archives. The goal is to be able to use
  * streams so that unicode paths work on Windows (T49112), and to make sure that
  * the stream objects remain valid as long as the archives are open.
@@ -50,4 +52,6 @@ class ArchiveReader {
   Alembic::Abc::IObject getTop();
 };
 
-#endif /* __ABC_READER_ARCHIVE_H__ */
+}  // namespace alembic
+}  // namespace io
+}  // namespace blender