Changeset 1089 for trunk/gsdl/src/recpt/receptionist.cpp
- Timestamp:
- 2000-04-14T14:52:06+12:00 (24 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/src/recpt/receptionist.cpp
r950 r1089 28 28 /* 29 29 $Log$ 30 Revision 1.48 2000/04/14 02:52:06 sjboddie 31 tidied up error messaging and set up some debugging info to be output 32 when running library from command line 33 30 34 Revision 1.47 2000/02/17 22:26:17 sjboddie 31 35 set macros for displaying macrons in utf8 … … 1005 1009 text_t colmacrodir = filename_cat (configinfo.collectdir, "macros"); 1006 1010 1007 text_t arraymaindirs;1011 text_tset maindirs; 1008 1012 text_t gsdlmacrodir = filename_cat (configinfo.gsdlhome, "macros"); 1009 maindirs. push_back(gsdlmacrodir);1013 maindirs.insert (gsdlmacrodir); 1010 1014 colinfo_tmap::iterator colhere = configinfo.collectinfo.begin(); 1011 1015 colinfo_tmap::iterator colend = configinfo.collectinfo.end(); 1012 1016 while (colhere != colend) { 1013 1017 gsdlmacrodir = filename_cat ((*colhere).second.gsdl_gsdlhome, "macros"); 1014 maindirs. push_back(gsdlmacrodir);1018 maindirs.insert (gsdlmacrodir); 1015 1019 colhere ++; 1016 1020 } … … 1037 1041 // we'll load all copies 1038 1042 if (!foundfile) { 1039 text_t array::const_iterator dirhere = maindirs.begin();1040 text_t array::const_iterator dirend = maindirs.end();1043 text_tset::const_iterator dirhere = maindirs.begin(); 1044 text_tset::const_iterator dirend = maindirs.end(); 1041 1045 while (dirhere != dirend) { 1042 1046 filename = filename_cat (*dirhere, *arrhere);
Note:
See TracChangeset
for help on using the changeset viewer.