Changeset 1502

Timestamp:

Aug 28, 2012, 12:33:19 PM (11 years ago)

Author:

Peter Johansson

Message:

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

Location:

trunk/lib

Files:

• Configuration.cc (modified) (3 diffs)
• Configuration.h (modified) (2 diffs)

trunk/lib/Configuration.cc

@@ -114 +114 @@
     for (String2Codons::const_iterator i(string2codons_.begin());
          i!=string2codons_.end(); ++i) {
-      if (fnmatch(i->first.c_str(), file_name.c_str()))
+      if (fnmatch(i->first, file_name))
         return &i->second;
     }
@@ -136 +136 @@
   {
     for (size_t i=0; i<dictionary_.size(); ++i)
-      if (fnmatch(lhs.c_str(), dictionary_[i].first.c_str()))
+      if (fnmatch(lhs, dictionary_[i].first))
         return &dictionary_[i];
     return NULL;
@@ -291 +291 @@
           for (String2Codons::const_iterator i(string2codons_.begin());
                i!=string2codons_.end(); ++i) {
-            if (fnmatch(lhs.c_str(), i->first.c_str())) {
+            if (fnmatch(lhs, i->first)) {
               mess << "'" << i->first << "'";
               break;

trunk/lib/Configuration.h

@@ -25 +25 @@
 
 #include "Alias.h"
+#include "utility.h"
 
 #include <iostream>
@@ -269 +270 @@
   {
     for( ; first!=last; ++first) {
-      if (fnmatch(first->first.c_str(), filename.c_str()))
+      if (fnmatch(first->first, filename))
         return first;
     }