Handle merge conflict

ianhinder · Jan 17, 2013 · ef0e9bb · ef0e9bb
1 parent df375e9
commit ef0e9bb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Tools/CodeGen/Differencing.m b/Tools/CodeGen/Differencing.m
@@ -461,7 +461,7 @@ A GridFunctionDerivative (GFD) is an expression of the form
       If[StringMatchQ[rhs, RegularExpression[".*\\bdir\\d\\b.*"]],
          { "{ assert(0); return ToReal(1e30); /* ERROR */ }\n" },
          { "{\n",
-           "  ptrdiff_t const cdi=sizeof(CCTK_REAL);\n",
+           "  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);\n",
            "  return ", rhs, ";\n",
            "}\n" }],
       "#endif\n"
@@ -480,7 +480,7 @@ A GridFunctionDerivative (GFD) is an expression of the form
         "static CCTK_REAL ", macroName, "_impl(CCTK_REAL const* restrict const u, CCTK_REAL const ", liName, ", ptrdiff_t const cdj, ptrdiff_t const cdk) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;\n",
         "static CCTK_REAL ", macroName, "_impl(CCTK_REAL const* restrict const u, CCTK_REAL const ", liName, ", ptrdiff_t const cdj, ptrdiff_t const cdk)\n",
         "{\n",
-        "  ptrdiff_t const cdi=sizeof(CCTK_REAL);\n",
+        "  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);\n",
         "  return ", rhs, ";\n",
         "}\n"
       },
@@ -490,7 +490,7 @@ A GridFunctionDerivative (GFD) is an expression of the form
         "static CCTK_REAL ", macroName, "_impl(CCTK_REAL const* restrict const u, CCTK_REAL const ", liName, ", ptrdiff_t const cdj, ptrdiff_t const cdk, ptrdiff_t const dir1, ptrdiff_t const dir2, ptrdiff_t const dir3) CCTK_ATTRIBUTE_NOINLINE CCTK_ATTRIBUTE_UNUSED;\n",
         "static CCTK_REAL ", macroName, "_impl(CCTK_REAL const* restrict const u, CCTK_REAL const ", liName, ", ptrdiff_t const cdj, ptrdiff_t const cdk, ptrdiff_t const dir1, ptrdiff_t const dir2, ptrdiff_t const dir3)\n",
         "{\n",
-        "  ptrdiff_t const cdi=sizeof(CCTK_REAL);\n",
+        "  ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL);\n",
         "  return ", rhs, ";\n",
         "}\n"
       }],

diff --git a/Tools/CodeGen/Jacobian.m b/Tools/CodeGen/Jacobian.m
@@ -117,7 +117,7 @@
    derivatives groups *)
 CreateJacobianVariables[] :=
 CommentedBlock["Jacobian variable pointers",
-  {"bool const use_jacobian = (!CCTK_IsFunctionAliased(\"MultiPatch_GetMap\") || MultiPatch_GetMap(cctkGH) != jacobian_identity_map)\n                     && strlen(jacobian_group) > 0;\n",
+  {"bool const use_jacobian CCTK_ATTRIBUTE_UNUSED = (!CCTK_IsFunctionAliased(\"MultiPatch_GetMap\") || MultiPatch_GetMap(cctkGH) != jacobian_identity_map)\n                     && strlen(jacobian_group) > 0;\n",
    "if (use_jacobian && strlen(jacobian_derivative_group) == 0)\n",
    "{\n",
    "  CCTK_WARN (1, \"GenericFD::jacobian_group and GenericFD::jacobian_derivative_group must both be set to valid group names\");\n",