Changeset 113 for cpp/frams

Timestamp:

01/26/14 05:47:49 (11 years ago)

Author:

sz

Message:

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

Location:

cpp/frams/param

Files:

• multiparamload.cpp (modified) (2 diffs)
• multiparamload.h (modified) (1 diff)

cpp/frams/param/multiparamload.cpp

@@ -126 +126 @@
                                 {
                                 SString filename(t+1,t2-t-1);
-                                include(filename);
+                                includeFile(filename);
                                 }
                         else
@@ -181 +181 @@
 }
 
-void MultiParamLoader::include(SString& filename)
+void MultiParamLoader::includeFile(SString& filename)
 {
 const char* thisfilename=file->VgetPath();

cpp/frams/param/multiparamload.h

@@ -133 +133 @@
 int run();
 
-void include(SString& filename);
+void includeFile(SString& filename);
 bool returnFromIncluded();
 bool alreadyIncluded(const char* filename);