Changeset 1502 for trunk


Ignore:
Timestamp:
Aug 28, 2012, 12:33:19 PM (8 years ago)
Author:
Peter Johansson
Message:

refs #519. add missing include and prefer using std::string

Location:
trunk/lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/Configuration.cc

    r1459 r1502  
    114114    for (String2Codons::const_iterator i(string2codons_.begin());
    115115         i!=string2codons_.end(); ++i) {
    116       if (fnmatch(i->first.c_str(), file_name.c_str()))
     116      if (fnmatch(i->first, file_name))
    117117        return &i->second;
    118118    }
     
    136136  {
    137137    for (size_t i=0; i<dictionary_.size(); ++i)
    138       if (fnmatch(lhs.c_str(), dictionary_[i].first.c_str()))
     138      if (fnmatch(lhs, dictionary_[i].first))
    139139        return &dictionary_[i];
    140140    return NULL;
     
    291291          for (String2Codons::const_iterator i(string2codons_.begin());
    292292               i!=string2codons_.end(); ++i) {
    293             if (fnmatch(lhs.c_str(), i->first.c_str())) {
     293            if (fnmatch(lhs, i->first)) {
    294294              mess << "'" << i->first << "'";
    295295              break;
  • trunk/lib/Configuration.h

    r1378 r1502  
    2525
    2626#include "Alias.h"
     27#include "utility.h"
    2728
    2829#include <iostream>
     
    269270  {
    270271    for( ; first!=last; ++first) {
    271       if (fnmatch(first->first.c_str(), filename.c_str()))
     272      if (fnmatch(first->first, filename))
    272273        return first;
    273274    }
Note: See TracChangeset for help on using the changeset viewer.