Changeset 113


Ignore:
Timestamp:
01/26/14 05:47:49 (6 years ago)
Author:
sz
Message:

some compilers don't like functions called 'include()'

Location:
cpp/frams/param
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/param/multiparamload.cpp

    r109 r113  
    126126                                {
    127127                                SString filename(t+1,t2-t-1);
    128                                 include(filename);
     128                                includeFile(filename);
    129129                                }
    130130                        else
     
    181181}
    182182
    183 void MultiParamLoader::include(SString& filename)
     183void MultiParamLoader::includeFile(SString& filename)
    184184{
    185185const char* thisfilename=file->VgetPath();
  • cpp/frams/param/multiparamload.h

    r109 r113  
    133133int run();
    134134
    135 void include(SString& filename);
     135void includeFile(SString& filename);
    136136bool returnFromIncluded();
    137137bool alreadyIncluded(const char* filename);
Note: See TracChangeset for help on using the changeset viewer.