Merge pull request #44 from LLNL/bugfix/taylor/slic-enum

Fix enum values in slic
LLNL · May 23, 2019 · 9017f6c · 9017f6c
2 parents 6d8f3cf + 895620c
commit 9017f6c
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git a/src/axom/quest/interface/c_fortran/wrapfquest.F b/src/axom/quest/interface/c_fortran/wrapfquest.F
@@ -1,5 +1,6 @@
 ! wrapfquest.F
 ! This is generated code, do not edit
+!
 ! Copyright (c) 2017-2019, Lawrence Livermore National Security, LLC and
 ! other Axom Project Developers. See the top-level COPYRIGHT file for details.
 !

diff --git a/src/axom/quest/interface/quest_shroud.yaml b/src/axom/quest/interface/quest_shroud.yaml
@@ -7,8 +7,7 @@ copyright:
   - Copyright (c) 2017-2019, Lawrence Livermore National Security, LLC and
   - other Axom Project Developers. See the top-level COPYRIGHT file for details.
   -
-  - SPDX-License-Identifier (BSD-3-Clause)
-  -
+  - "SPDX-License-Identifier: (BSD-3-Clause)"
 
 library: QUEST
 cxx_header: axom/quest/interface/inout.hpp axom/quest/interface/signed_distance.hpp

diff --git a/src/axom/sidre/interface/c_fortran/wrapfsidre.F b/src/axom/sidre/interface/c_fortran/wrapfsidre.F
@@ -1,5 +1,6 @@
 ! wrapfsidre.F
 ! This is generated code, do not edit
+!
 ! Copyright (c) 2017-2019, Lawrence Livermore National Security, LLC and
 ! other Axom Project Developers. See the top-level COPYRIGHT file for details.
 !

diff --git a/src/axom/sidre/interface/sidre_shroud.yaml b/src/axom/sidre/interface/sidre_shroud.yaml
@@ -6,8 +6,7 @@ copyright:
   - Copyright (c) 2017-2019, Lawrence Livermore National Security, LLC and
   - other Axom Project Developers. See the top-level COPYRIGHT file for details.
   -
-  - SPDX-License-Identifier (BSD-3-Clause)
-  -
+  - "SPDX-License-Identifier: (BSD-3-Clause)"
 
 library: Sidre
 # cxx_header: each class has its own header file

diff --git a/src/axom/sidre/interface/yaml/sidre_types.yaml b/src/axom/sidre/interface/yaml/sidre_types.yaml
@@ -5,7 +5,6 @@
 # other Axom Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
-#
 # Types generated by Shroud for library Sidre
 declarations:
   - namespace: axom

diff --git a/src/axom/sidre/spio/interface/c_fortran/wrapfspio.f b/src/axom/sidre/spio/interface/c_fortran/wrapfspio.f
@@ -1,5 +1,6 @@
 ! wrapfspio.f
 ! This is generated code, do not edit
+!
 ! Copyright (c) 2017-2019, Lawrence Livermore National Security, LLC and
 ! other Axom Project Developers. See the top-level COPYRIGHT file for details.
 !

diff --git a/src/axom/sidre/spio/interface/spio_shroud.yaml b/src/axom/sidre/spio/interface/spio_shroud.yaml
@@ -6,8 +6,7 @@ copyright:
   - Copyright (c) 2017-2019, Lawrence Livermore National Security, LLC and
   - other Axom Project Developers. See the top-level COPYRIGHT file for details.
   -
-  - SPDX-License-Identifier (BSD-3-Clause)
-  -
+  - "SPDX-License-Identifier: (BSD-3-Clause)"
 
 library: SPIO
 namespace: axom sidre

diff --git a/src/axom/sidre/spio/interface/yaml/spio_types.yaml b/src/axom/sidre/spio/interface/yaml/spio_types.yaml
@@ -5,7 +5,6 @@
 # other Axom Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
-#
 # Types generated by Shroud for library SPIO
 declarations:
   - namespace: axom

diff --git a/src/axom/slic/interface/c_fortran/wrapSLIC.h b/src/axom/slic/interface/c_fortran/wrapSLIC.h
@@ -26,11 +26,11 @@ extern "C" {
 //  Level
 enum SLIC_Level
 {
-  Error,
-  Warning,
-  Info,
-  Debug,
-  Num_Levels
+  SLIC_Error,
+  SLIC_Warning,
+  SLIC_Info,
+  SLIC_Debug,
+  SLIC_Num_Levels
 };
 
 // splicer begin C_declarations

diff --git a/src/axom/slic/interface/c_fortran/wrapfslic.f b/src/axom/slic/interface/c_fortran/wrapfslic.f
@@ -1,5 +1,6 @@
 ! wrapfslic.f
 ! This is generated code, do not edit
+!
 ! Copyright (c) 2017-2019, Lawrence Livermore National Security, LLC and
 ! other Axom Project Developers. See the top-level COPYRIGHT file for details.
 !

diff --git a/src/axom/slic/interface/slic_shroud.yaml b/src/axom/slic/interface/slic_shroud.yaml
@@ -6,8 +6,7 @@ copyright:
   - Copyright (c) 2017-2019, Lawrence Livermore National Security, LLC and
   - other Axom Project Developers. See the top-level COPYRIGHT file for details.
   -
-  - SPDX-License-Identifier (BSD-3-Clause)
-  -
+  - "SPDX-License-Identifier: (BSD-3-Clause)"
 
 library: SLIC
 cxx_header: axom/slic/interface/slic.hpp
@@ -19,6 +18,8 @@ options:
 #  F_module_per_class: False
   # Change the default template for Fortran functions to include the library name.
   F_name_impl_template: "{library_lower}_{class_prefix}{underscore_name}{function_suffix}"
+  # XXX - This will eventually become the default in Shroud
+  C_enum_member_template: "{C_prefix}{enum_member_name}"
 
 format:
   C_prefix: SLIC_