another compile fix from herbert

[lyx.git] / src / chset.C

diff --git a/src/chset.C b/src/chset.C
index 737c2eeefd28c83b68f35832d9c07bee9839a407..20e28319c5bb4b3b01cbb0ff5178bfb123de6015 100644 (file)
--- a/src/chset.C
+++ b/src/chset.C
@@ -20,7 +20,14 @@ using std::make_pair;
 using std::endl;
 using boost::regex;
 using boost::regex_match;
+
+#ifndef USE_INCLUDED_STRING
 using boost::smatch;
+#else
+using boost::cmatch;
+#endif
+
+
 
 bool CharacterSet::loadFile(string const & fname)
 {
@@ -49,10 +56,14 @@ bool CharacterSet::loadFile(string const & fname)
        // without the use of a keyword table.
        regex reg("^([12][0-9][0-9])[ \t]+\"([^ ]+)\".*");
        while (getline(ifs, line)) {
+#ifndef USE_INCLUDED_STRING
                smatch sub;
-               if (regex_match(line, sub, reg)) {
-                       int const n = lyx::atoi(sub[1]);
-                       string const str = sub[2];
+#else
+               cmatch sub;
+#endif
+               if (regex_match(STRCONV(line), sub, reg)) {
+                       int const n = lyx::atoi(STRCONV(sub.str(1)));
+                       string const str = STRCONV(sub.str(2));
                        if (lyxerr.debugging(Debug::KBMAP))
                                lyxerr << "Chardef: " << n
                                       << " to [" << str << "]" << endl;