Ticket #38516: pymol-clang.diff

layer0/ShaderMgr.c

@@ -150 +150 @@
     while (replaceStrings[i]){
       slen = strlen(replaceStrings[i]);
       rlen = strlen(replaceStrings[i+1]);
-      while(rstr=strstr(dest_line, replaceStrings[i])){
+      while((rstr=strstr(dest_line, replaceStrings[i]))){
         strcpy(tmp_line, rstr + slen);
         strcpy(rstr, replaceStrings[i+1]);
         strcpy(rstr+rlen, tmp_line);
@@ -488 +488 @@
   if (I){
     GLenum err ;
     glBindAttribLocation(I->id, VERTEX_POS, "a_Vertex");
-    if (err = glGetError()){
+    if ((err = glGetError())){
       PRINTFB(G, FB_ShaderMgr, FB_Warnings) "GLERROR: a_Vertex: %d\n", err ENDFB(G);
     }
     glBindAttribLocation(I->id, VERTEX_NORMAL, "a_Normal");
-    if (err = glGetError()){
+    if ((err = glGetError())){
       PRINTFB(G, FB_ShaderMgr, FB_Warnings) "GLERROR: a_Normal: %d\n", err ENDFB(G);
     }
     glBindAttribLocation(I->id, VERTEX_COLOR, "a_Color");
-    if (err = glGetError()){
+    if ((err = glGetError())){
       PRINTFB(G, FB_ShaderMgr, FB_Warnings) "GLERROR: a_Color: %d\n", err ENDFB(G);
     }
     CShaderPrg_Link(I);
@@ -510 +510 @@
   if (I){
     GLenum err ;
     glBindAttribLocation(I->id, CYLINDER_ORIGIN, "attr_origin");
-    if (err = glGetError()){
+    if ((err = glGetError())){
       PRINTFB(G, FB_ShaderMgr, FB_Warnings) "GLERROR: attr_origin: %d\n", err ENDFB(G);
     }
     glBindAttribLocation(I->id, CYLINDER_AXIS, "attr_axis");
-    if (err = glGetError()){
+    if ((err = glGetError())){
       PRINTFB(G, FB_ShaderMgr, FB_Warnings) "GLERROR: attr_axis: %d\n", err ENDFB(G);
     }
     glBindAttribLocation(I->id, CYLINDER_COLOR, "attr_color");
-    if (err = glGetError()){
+    if ((err = glGetError())){
       PRINTFB(G, FB_ShaderMgr, FB_Warnings) "GLERROR: attr_color: %d\n", err ENDFB(G);
     }
     glBindAttribLocation(I->id, CYLINDER_COLOR2, "attr_color2");
-    if (err = glGetError()){
+    if ((err = glGetError())){
       PRINTFB(G, FB_ShaderMgr, FB_Warnings) "GLERROR: attr_color2: %d\n", err ENDFB(G);
     }
     CShaderPrg_Link(I);   
@@ -842 +842 @@
     if (indicatorShader){
       GLenum err ;
       glBindAttribLocation(indicatorShader->id, VERTEX_POS, "a_Vertex");
-      if (err = glGetError()){
+      if ((err = glGetError())){
         PRINTFB(G, FB_ShaderMgr, FB_Warnings) "GLERROR: a_Vertex: %d\n", err ENDFB(G);
       }
       glBindAttribLocation(indicatorShader->id, VERTEX_COLOR, "a_Color");
-      if (err = glGetError()){
+      if ((err = glGetError())){
         PRINTFB(G, FB_ShaderMgr, FB_Warnings) "GLERROR: a_Color: %d\n", err ENDFB(G);
       }
       CShaderPrg_Link(indicatorShader); 

layer0/Tetsurf.c

@@ -679 +679 @@
   if(I->Tri) {
     VLAFreeP(I->Tri);
   }
-  if(I->PtLink);
-  {
+  if(I->PtLink) {
     VLAFreeP(I->PtLink);
   }
   if(I->VertexCodes) {

layer0/Map.c

@@ -588 +588 @@
   register int *link = I->Link;
   register int st, flag;
   register int *i_ptr3, *i_ptr4, *i_ptr5;
-  register int *e_list;
+  register int *e_list = NULL;
 #ifdef _MemoryCache_ON
   register int block_offset = I->block_base + cCache_map_elist_offset;
   register int group_id = I->group_id;

layer1/Basis.c

@@ -2868 +2868 @@
   float ll;
   CPrimitive *prm;
   register int i;
-  register int *tempRef;
-  int n, h, q, x, y, z, j, k, l, e;
+  register int *tempRef = NULL;
+  int n = 0, h, q, x, y, z, j, k, l, e;
   int extra_vert = 0;
   float p[3], dd[3], *d1, *d2, vd[3], cx[3], cy[3];
-  float *tempVertex;
+  float *tempVertex = NULL;
   float xs, ys;
   int remapMode = true;         /* remap mode means that some objects will span more
                                  * than one voxel, so we have to worry about populating

layer1/CGO.c

@@ -47 +47 @@
 #define CLIP_NORMAL_VALUE(cv)  ((cv>1.f) ? 127 :  (cv < -1.f) ? -128 : pymol_roundf(((cv + 1.f)/2.f) * 255) - 128 )
 
 #define CHECK_GL_ERROR_OK(printstr)     \
-  if (err = glGetError()){    \
+  if ((err = glGetError())){    \
      PRINTFB(I->G, FB_CGO, FB_Errors) printstr, err ENDFB(I->G);           \
   }
 
@@ -2279 +2279 @@
   *num_total_vertices = 0;
   *num_total_indexes = 0;
 
-  while(op = (CGO_MASK & CGO_read_int(pc))) {
+  while((op = (CGO_MASK & CGO_read_int(pc)))) {
     save_pc = pc;
     err = 0;
     switch (op) {
@@ -4339 +4339 @@
     GL_C_INT_TYPE *indexVals = 0;
     int tot = 4 * 4 * 3 * num_total_cylinders;
     short copyToLeftOver, copyColorToLeftOver, copyPickColorToLeftOver, copyAlphaToLeftOver, copyToReturnCGO ;
-    float *org_originVals;
+    float *org_originVals= NULL;
     float *org_axisVals;
     float *org_colorVals;
     float *org_color2Vals = NULL;
@@ -7101 +7101 @@
   int  texture_id = CGO_get_int(*pc);
   float worldPos[4], screenMin[3], screenMax[3], textExtent[4];
   CShaderPrg * shaderPrg;
-  int buf1, buf2, attr_worldpos, attr_screenoffset, attr_texcoords;
+  int buf1 = 0, buf2 = 0, attr_worldpos, attr_screenoffset, attr_texcoords;
   copy3f(*pc, worldPos);  worldPos[3] = 1.f;
   copy3f(*pc+3, screenMin);
   copy3f(*pc+6, screenMax);
@@ -7142 +7142 @@
   int  texture_id = CGO_get_int(*pc);
   float worldPos[4], screenMin[3], screenMax[3], textExtent[4];
   CShaderPrg * shaderPrg;
-  int buf1, buf2, attr_worldpos, attr_screenoffset, attr_texcoords;
+  int buf1 = 0, buf2 = 0, attr_worldpos, attr_screenoffset, attr_texcoords;
   copy3f(*pc, worldPos);  worldPos[3] = 1.f;
   copy3f(*pc+3, screenMin);
   copy3f(*pc+6, screenMax);
@@ -9528 +9528 @@
 int CGOChangeShadersTo(CGO *I, int frommode, int tomode){
   register float *pc = I->op;
   int op = 0, totops = 0;
-  while(op = (CGO_MASK & CGO_read_int(pc))) {
+  while((op = (CGO_MASK & CGO_read_int(pc)))) {
     totops++;
     switch (op) {
     case CGO_ENABLE:

layer1/Ortho.c

@@ -1014 +1014 @@
         curLine = I->CurLine & OrthoSaveLines;
         if(I->PromptChar) {
           strcpy(buffer, I->Line[curLine]);
-          if(PComplete(G, buffer + I->PromptChar, sizeof(OrthoLineType) - I->PromptChar));      /* just print, don't complete */
+          PComplete(G, buffer + I->PromptChar, sizeof(OrthoLineType) - I->PromptChar);      /* just print, don't complete */
         }
       }
       break;
@@ -1394 +1394 @@
 
   {
     if (!I->bgCGO) {
-      CGO *cgo = CGONew(G), *cgo2;
+      CGO *cgo = CGONew(G), *cgo2 = NULL;
       ok &= CGOBegin(cgo, GL_TRIANGLE_STRIP);
       if (ok)
         ok &= CGOVertex(cgo, -1.f, -1.f, 0.98f);

layer1/P.c

@@ -2613 +2613 @@
       /* don't run if we're currently banned */
       char *buffer = 0;
       int size, curSize = 0;
-      while(size = OrthoCommandOutSize(G)){
+      while((size = OrthoCommandOutSize(G))){
         if (!curSize){
           buffer = VLACalloc(char, size);
           curSize = size;
@@ -2657 +2657 @@
   int did_work = false;
   char *buffer = 0;
   int size, curSize = 0;
-  while(size = OrthoCommandOutSize(G)){
+  while((size = OrthoCommandOutSize(G))){
     if (!curSize){
       buffer = VLACalloc(char, size);
       curSize = size;

layer1/Extrude.c

@@ -753 +753 @@
   float *v;
   float *n;
   float *c;
-  float *sv, *sn, *tv, *tn, *tv1, *tn1, *TV, *TN;
+  float *sv, *sn, *tv, *tn, *tv1, *tn1, *TV, *TN = NULL;
   float v0[3];
   int start, stop;
   int ok = true;
@@ -1683 +1683 @@
   float *v;
   float *n;
   float *c;
-  float *sv, *sn, *tv, *tn, *tv1, *tn1, *TV, *TN;
+  float *sv, *sn, *tv, *tn, *tv1, *tn1, *TV, *TN = NULL;
   float v0[3];
   int ok = true;
 
@@ -1737 +1737 @@
     for(b = 0; ok && b < I->Ns; b += 2) {
 #ifdef _PYMOL_CGO_DRAWARRAYS
       int nverts = 2*I->N, pl = 0, plc = 0, damode = CGO_VERTEX_ARRAY | CGO_NORMAL_ARRAY | CGO_PICK_COLOR_ARRAY, nxtn = 3;
-      float *vertexVals, *normalVals, *colorVals = 0, *nxtVals = 0, *tmp_ptr;
+      float *vertexVals = NULL, *normalVals, *colorVals = 0, *nxtVals = 0, *tmp_ptr;
       float *pickColorVals;
       GLenum mode = GL_LINE_STRIP;
       if(SettingGetGlobal_i(I->G, cSetting_cartoon_debug) < 1.5)
@@ -2048 +2048 @@
       i = I->i;
       if (ok){
         int nverts = 2*I->N, pl = 0, plc = 0, damode = CGO_VERTEX_ARRAY | CGO_NORMAL_ARRAY | CGO_PICK_COLOR_ARRAY, nxtn = 3;
-        float *vertexVals, *normalVals, *colorVals = 0, *nxtVals = 0, *tmp_ptr;
+        float *vertexVals = NULL, *normalVals, *colorVals = 0, *nxtVals = 0, *tmp_ptr;
         float *pickColorVals;
         if (color_override)
           ok &= CGOColorv(cgo, color_override);
@@ -2156 +2156 @@
   float *v;
   float *n;
   float *c;
-  float *sv, *sn, *tv, *tn, *tv1, *tn1, *TV, *TN;
+  float *sv, *sn, *tv, *tn, *tv1, *tn1, *TV, *TN = NULL;
   float v0[3], n0[3], s0[3], z[3] = { 1.0, 0.0, 1.0 };
   int subN;
   int ok = true;

layer1/Scene.c

@@ -7640 +7640 @@
       /* update all gadgets first (single-threaded since they're thread-unsafe) */
       rec = NULL;
       while(ListIterate(I->Obj, rec, next)) {
-        if((rec->obj->type == cObjectGadget)) {
+        if(rec->obj->type == cObjectGadget) {
           if(rec->obj->fUpdate)
             rec->obj->fUpdate(rec->obj);
         }

layer1/Control.c

@@ -637 +637 @@
       but_bottom = y - (cControlBoxSize - 1);
       but_height = cControlBoxSize;
 
-      if((but_num == I->Active)) {
+      if(but_num == I->Active) {
         draw_button(but_left, but_bottom,
                     but_width, but_height, lightEdge, darkEdge, pushed ORTHOCGOARGVAR);
       } else if(((but_num == 6) && (SettingGetGlobal_b(G, cSetting_seq_view))) ||

layer2/RepCylBond.c

@@ -1998 +1998 @@
             I->NSPC++;
           }
 
-          if(s2 && (!marked[b2]) && (!stick_ball_filter_single_atoms || (ord==1 || adjacent_atoms[a2] && adjacent_atoms[a2][0] > 1))) {
+          if(s2 && (!marked[b2]) && (!stick_ball_filter_single_atoms || (ord==1 || (adjacent_atoms[a2] && adjacent_atoms[a2][0] > 1)))) {
               /* just once for each atom..., if stick_ball_filter is on, then only for atoms that have more than one adjacent atom */
             float vdw =
               stick_ball_ratio * ((ati2->protons == cAN_H) ? bd_radius : bd_radius_full);

layer2/RepSphere.c

@@ -1991 +1991 @@
   int a;
   SphereRec *sp = I->SP;
   float alpha;
-  int n_quad_verts;
-  float radius;
+  int n_quad_verts = 0;
+  float radius = 0.0;
   int ok = true;
   short use_shader = SettingGetGlobal_b(G, cSetting_sphere_use_shader) & 
                      SettingGetGlobal_b(G, cSetting_use_shaders);

layer2/ObjectMolecule2.c

@@ -3678 +3678 @@
 #else
   int ok = true;
   ObjectMolecule *I = NULL;
-  int discrete_flag;
+  int discrete_flag = 0;
   int ll;
   (*result) = NULL;
 
@@ -4305 +4305 @@
   register int a, b;
   CoordSet *cs, **dcs;
   AtomInfoType *atInfo;
-  int *dAtmToIdx;
+  int *dAtmToIdx = NULL;
   int ok = true;
   if(!I->DiscreteFlag) {        /* currently, discrete objects are never sorted */
     int n_bytes = sizeof(int) * I->NAtom;

layer2/RepDot.c

@@ -192 +192 @@
               ok &= CGOColorv(cgo, v);
               v += 3;
             }
-           /*      if(normals)  /* NORMALS do not get set for points 
+           /*      if(normals)  NORMALS do not get set for points 
                    CGONormalv(cgo, v);*/
             v += 3;
             if (ok)
@@ -210 +210 @@
             I->shaderCGO = CGOOptimizeSpheresToVBONonIndexed(cgo, CGO_BOUNDING_BOX_SZ + CGO_DRAW_SPHERE_BUFFERS_SZ);
             CHECKOK(ok, I->shaderCGO);
           } else {
-            CGO *convertcgo = CGOCombineBeginEnd(cgo, 0), *tmpCGO;
+            CGO *convertcgo = CGOCombineBeginEnd(cgo, 0), *tmpCGO = NULL;
             CHECKOK(ok, convertcgo);
             if (ok)
               tmpCGO = CGOOptimizeToVBONotIndexed(convertcgo, CGO_BOUNDING_BOX_SZ + I->N * 3 + 7);
@@ -344 +344 @@
   float *countPtr = NULL;
   int colorCnt, lastColor;
   Vector3f v1;
-  MapType *map;
+  MapType *map = NULL;
   SphereRec *sp = G->Sphere->Sphere[0];
   int ds;
   float max_vdw = MAX_VDW;

layer2/RepSurface.c

@@ -3304 +3304 @@
             if (ok)
               convertcgo->use_shader = true;
           } else if (I->Type == 2) {
-            CGO *convertcgo2, *simple;
+            CGO *convertcgo2, *simple = NULL;
             convertcgo2 = CGOConvertLinesToShaderCylinders(I->shaderCGO, 0);
             CHECKOK(ok, convertcgo2);
             if (ok)
@@ -4503 +4503 @@
         }
         ok &= !G->Interrupt;
         if(ok) {
-          MapType *map, *solv_map;
+          MapType *map, *solv_map = NULL;
           map = MapNewFlagged(G, I->maxVdw + probe_rad_more,
                               I->coord, VLAGetSize(I->coord) / 3, NULL, NULL);
           CHECKOK(ok, map);
@@ -5747 +5747 @@
                 SurfaceJobAtomInfo *j_atom_info = atom_info + j;
                 if(j > a)       /* only check if this is atom trails */
                   if((!present) || present[j]) {
-                    if((j_atom_info->vdw == a_atom_info->vdw)) {        /* handle singularities */
+                    if(j_atom_info->vdw == a_atom_info->vdw) {        /* handle singularities */
                       float *v1 = coord + 3 * j;
                       if((v0[0] == v1[0]) && (v0[1] == v1[1]) && (v0[2] == v1[2]))
                         skip_flag = true;
@@ -5842 +5842 @@
                   SurfaceJobAtomInfo *j_atom_info = atom_info + j;
                   if(j > a)     /* only check if this is atom trails */
                     if((!present) || present[j]) {
-                      if((j_atom_info->vdw == a_atom_info->vdw)) {      /* handle singularities */
+                      if(j_atom_info->vdw == a_atom_info->vdw) {      /* handle singularities */
                         float *v2 = coord + 3 * j;
                         if((v0[0] == v2[0]) && (v0[1] == v2[1]) && (v0[2] == v2[2]))
                           skip_flag = true;
@@ -6002 +6002 @@
                   SurfaceJobAtomInfo *j_atom_info = atom_info + j;
                   if(j > a)       /* only check if this is atom trails */
                     if((!present) || present[j]) {
-                      if((j_atom_info->vdw == a_atom_info->vdw)) {        /* handle singularities */
+                      if(j_atom_info->vdw == a_atom_info->vdw) {        /* handle singularities */
                         float *v1 = coord + 3 * j;
                         if((v0[0] == v1[0]) && (v0[1] == v1[1]) && (v0[2] == v1[2]))
                           skip_flag = true;

layer2/RepCartoon.c

@@ -2615 +2615 @@
 
 #ifdef _PYMOL_CGO_DRAWARRAYS
         int nverts = nAt * 4, pl = 0;
-        float *vertexVals, *tmp_ptr;
+        float *vertexVals = NULL, *tmp_ptr;
         if (ok)
           vertexVals = CGODrawArrays(cgo, GL_LINES, CGO_VERTEX_ARRAY, nverts);      
         CHECKOK(ok, vertexVals);

layer2/ObjectMolecule.c

@@ -1448 +1448 @@
   int NPHIH, MPHIA, NHPARM, NPARM, NNB, NRES;
   int NBONA, NTHETA, NPHIA, NUMBND, NUMANG, NPTRA;
   int NATYP, NPHB, IFPERT, NBPER, NGPER, NDPER;
-  int MBPER, MGPER, MDPER, IFBOX, NMXRS, IFCAP;
+  int MBPER, MGPER, MDPER, IFBOX = 0, NMXRS, IFCAP;
   int NEXTRA, IPOL = 0;
   int wid, col;
   float BETA;
@@ -2076 +2076 @@
 
     if(IFBOX > 0) {
 
-      int IPTRES, NSPM, NSPSOL;
+      int IPTRES, NSPM = 0, NSPSOL;
 
       if(amber7) {
         p = findflag(G, buffer, "SOLVENT_POINTERS", "3I8");
@@ -4431 +4431 @@
   AtomInfoType *ai;
   int n, nn;
   float v[3], v0[3], d;
-  CoordSet *cs;
+  CoordSet *cs = NULL;
   int ok = true;
 
   ok &= ObjectMoleculeUpdateNeighbors(I);
@@ -9755 +9755 @@
                         CoordSet * cs, int bondSearchFlag, int aic_mask, int invalidate)
 {
   PyMOLGlobals *G = I->Obj.G;
-  int *index, *outdex, *a2i, *i2a;
+  int *index, *outdex, *a2i, *i2a = NULL;
   BondType *bond = NULL;
   register int a, b, lb = 0, ac;
   int c, nb, a1, a2;
@@ -10539 +10539 @@
                 rms = MatrixFitRMSTTTf(G, op->nvv1, op->vv1, vt, NULL, op->ttt);
               else
                 rms = MatrixGetRMS(G, op->nvv1, op->vv1, vt, NULL);
-              if((op->i1 == 2)) {
+              if(op->i1 == 2) {
                 ObjectMoleculeTransformTTTf(I, op->ttt, b);
 
                 if(op->i3) {

layer3/Selector.c

@@ -8615 +8615 @@
     for(a = cNDummyAtoms; a < I->NAtom; a++) {
       b = i_obj[i_table[a].model]->AtomInfo[i_table[a].atom].protons;
       base[0].sele[a] = (
-          b >  2 && b <  5 ||
-          b > 10 && b < 14 ||
-          b > 18 && b < 32 ||
-          b > 36 && b < 51 ||
-          b > 54 && b < 85 ||
+          (b >  2 && b <  5) ||
+          (b > 10 && b < 14) ||
+          (b > 18 && b < 32) ||
+          (b > 36 && b < 51) ||
+          (b > 54 && b < 85) ||
           b > 86);
     }
     break;

layer3/Executive.c

@@ -15915 +15915 @@
                           ExecutiveSpecSetVisibility(G, rec, true, mod, false);
                           I->LastChanged = rec;
                         }
-                        if((mod == (cOrthoSHIFT | cOrthoCTRL))) {
+                        if(mod == (cOrthoSHIFT | cOrthoCTRL)) {
                           if(rec != I->LastZoomed)
                             ExecutiveWindowZoom(G, rec->name, 0.0F, -1, false, -1.0F,
                                                 true);

layer3/PlugIOManager.c

@@ -225 +225 @@
                       ENDFB(G);
                   }
 
-                  if(stop > 0 && cnt >= stop || max > 0 && ncnt >= max) {
+                  if((stop > 0 && cnt >= stop) || (max > 0 && ncnt >= max)) {
                     cs = NULL;
                     break;
                   }

layer4/Cmd.c

@@ -1846 +1846 @@
 static PyObject *CmdGetRenderer(PyObject * self, PyObject * args)
 {
   PyMOLGlobals *G = NULL;
-  char *vendor, *renderer, *version;
+  char *vendor = NULL, *renderer = NULL, *version = NULL;
   int ok = false;
   ok = PyArg_ParseTuple(args, "O", &self);
   if(ok) {

contrib/uiuc/plugins/molfile_plugin/src/pbeqplugin.cpp

@@ -259 +259 @@
         int addr = z*nclx*ncly + y*nclx + x;
         if (fread(datablock + addr, 4, 1, fd) != 1) {
           printf("pbeqplugin) Error reading potential map cell: %d,%d,%d\n", x, y, z);
-          printf("pbeqplugin) offset: %d\n", ftell(fd));
+          printf("pbeqplugin) offset: %ld\n", ftell(fd));
           return MOLFILE_ERROR;
         }
         count++;

contrib/uiuc/plugins/molfile_plugin/src/moldenplugin.c

@@ -99 +99 @@
                               const char *filetype,
                               int *natoms) {
   FILE *fd;
-  qmdata_t *data;
+  qmdata_t *data = NULL;
   moldendata_t *moldendata;
   char buffer[1024];
   char keystring[20];

contrib/uiuc/plugins/molfile_plugin/src/gamessplugin.c

@@ -375 +375 @@
                   const char *filetype, int *natoms) {
 
   FILE *fd;
-  qmdata_t *data;
+  qmdata_t *data = NULL;
   gmsdata *gms;
 
   /* open the input file */

contrib/uiuc/plugins/molfile_plugin/src/maeffplugin.cpp

@@ -1983 +1983 @@
       }
     }
     catch (std::exception &e) {
-      fprintf(stderr, e.what());
+      fprintf(stderr, "%s", e.what());
       return MOLFILE_ERROR;
     }
     return MOLFILE_SUCCESS;

contrib/uiuc/plugins/molfile_plugin/src/graspplugin.cpp

@@ -104 +104 @@
 
   ///ojo aqui le quite el  !
   if ((grassp->flag)!=POTENTIALS) {
-    if (index >=0 && index <= 4) 
+    if (index <= 4) 
       printf("graspplugin) No data available for '%s' option\n", name[index]);
     else 
       printf("graspplugin) out of range property, flag: %d index: %d\n", grassp->flag, index);

modules/cealign/src/tnt/tnt_fortran_array1d.h

@@ -221 +221 @@
 #ifdef TNT_DEBUG
                 std::cout << "entered subarray. \n";
 #endif
-        if ((i0 > 0) && (i1 < n_) || (i0 <= i1))
+        if (((i0 > 0) && (i1 < n_)) || (i0 <= i1))
         {
                 Fortran_Array1D<T> X(*this);  /* create a new instance of this array. */
                 X.n_ = i1-i0+1;

modules/cealign/src/tnt/tnt_array1d.h

@@ -258 +258 @@
 template <class T>
 inline Array1D<T> Array1D<T>::subarray(int i0, int i1)
 {
-        if ((i0 >= 0) && (i1 < n_) || (i0 <= i1))
+        if (((i0 >= 0) && (i1 < n_)) || (i0 <= i1))
         {
                 Array1D<T> X(*this);  /* create a new instance of this array. */
                 X.n_ = i1-i0+1;