Changeset 37 for branches/slurm-drmaa-1.2.0/slurm_drmaa/job.c

Timestamp:

06/18/14 17:30:11 (11 years ago)

Author:

pkopta

Message:

code cleanup

File:

• branches/slurm-drmaa-1.2.0/slurm_drmaa/job.c (modified) (2 diffs)

branches/slurm-drmaa-1.2.0/slurm_drmaa/job.c

@@ -133 +133 @@
                                         switch(job_info->job_array[0].state_reason)
                                         {
-                                                #if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(2,2,0)
                                                 case WAIT_HELD_USER:   /* job is held by user */
                                                         fsd_log_debug(("interpreting as DRMAA_PS_USER_ON_HOLD"));
                                                         self->state = DRMAA_PS_USER_ON_HOLD;
                                                         break;
-                                                #endif
                                                 case WAIT_HELD:  /* job is held by administrator */
                                                         fsd_log_debug(("interpreting as DRMAA_PS_SYSTEM_ON_HOLD"));
@@ -174 +172 @@
                                 case JOB_TIMEOUT:
                                 case JOB_NODE_FAIL:
-                                #if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(2,3,0)
                                 case JOB_PREEMPTED:
-                                #endif
                                         fsd_log_debug(("interpreting as DRMAA_PS_FAILED"));
                                         self->state = DRMAA_PS_FAILED;