Commits

Jed Brown  committed 5f6f7f9 Merge with conflicts

Merge branch 'jed/fix-chaco-default' into maint

Fixes warning with clang-3.3.

* jed/fix-chaco-default:
Mat Chaco: remove another case of PETSC_DEFAULT out of range of enum

Conflicts:
src/mat/partition/impls/chaco/chaco.c

  • Participants
  • Parent commits a071802, 3c924e8

Comments (0)

Files changed (1)

File src/mat/partition/impls/chaco/chaco.c

   MatPartitioning_Chaco *chaco = (MatPartitioning_Chaco*)part->data;
 
   PetscFunctionBegin;
-  if (method==PETSC_DEFAULT) chaco->local_method = MP_CHACO_KERNIGHAN;
-  else {
-    switch (method) {
-    case MP_CHACO_KERNIGHAN:
-    case MP_CHACO_NONE:
-      chaco->local_method = method; break;
-    default:
-      SETERRQ(PETSC_COMM_SELF,PETSC_ERR_ARG_WRONG,"Chaco: Unknown or unsupported option");
-    }
+  switch (method) {
+  case MP_CHACO_KERNIGHAN:
+  case MP_CHACO_NONE:
+    chaco->local_method = method; break;
+  default:
+    SETERRQ(PETSC_COMM_SELF,PETSC_ERR_ARG_WRONG,"Chaco: Unknown or unsupported option");
   }
   PetscFunctionReturn(0);
 }