Switch to unified view

a/src/utils/conftree.h b/src/utils/conftree.h
...
...
469
        }
469
        }
470
        if (shallow && skfound)
470
        if (shallow && skfound)
471
        break;
471
        break;
472
    }
472
    }
473
    sort(nms.begin(), nms.end());
473
    sort(nms.begin(), nms.end());
474
  unique(nms.begin(), nms.end());
474
  vector<string>::iterator uit = unique(nms.begin(), nms.end());
475
  nms.resize(uit - nms.begin());
475
    return nms;
476
    return nms;
476
    }
477
    }
477
478
478
    virtual vector<string> getSubKeys(){return getSubKeys(false);}
479
    virtual vector<string> getSubKeys(){return getSubKeys(false);}
479
    virtual vector<string> getSubKeys(bool shallow)
480
    virtual vector<string> getSubKeys(bool shallow)
...
...
486
        sks.insert(sks.end(), lst.begin(), lst.end());
487
        sks.insert(sks.end(), lst.begin(), lst.end());
487
        if (shallow)
488
        if (shallow)
488
        break;
489
        break;
489
    }
490
    }
490
    sort(sks.begin(), sks.end());
491
    sort(sks.begin(), sks.end());
491
  unique(sks.begin(), sks.end());
492
  vector<string>::iterator uit = unique(sks.begin(), sks.end());
493
  sks.resize(uit - sks.begin());
492
    return sks;
494
    return sks;
493
    }
495
    }
494
496
495
    virtual bool ok() const {return m_ok;}
497
    virtual bool ok() const {return m_ok;}
496
498