Commits

Jed Brown committed 4d7b11b Merge with conflicts

Merge branch 'maint'

Conflicts:
conf/rules
include/petsclog.h

Comments (0)

Files changed (2)

bin/petscnagupgrade.py

 #
 #
 if __name__ ==  '__main__':
-  if os.environ.has_key('PETSC_DIR'):
+  if 'PETSC_DIR' in os.environ:
     petscdir = os.environ['PETSC_DIR']
   elif os.path.exists(os.path.join('.', 'include', 'petscversion.h')):
     petscdir  = '.'

include/petsclog.h

 } PetscStageInfo;
 
 typedef struct _n_PetscStageLog *PetscStageLog;
-PETSC_EXTERN PetscStageLog petsc_stageLog;
 struct _n_PetscStageLog {
   int              numStages;   /* The number of registered stages */
   int              maxStages;   /* The maximum number of stages */
 
 
 #if defined(PETSC_USE_LOG)  /* --- Logging is turned on --------------------------------*/
+PETSC_EXTERN PetscStageLog petsc_stageLog;
 
 /*
    Flop counting:  We count each arithmetic operation (e.g., addition, multiplication) separately.