Changeset a6e314

Timestamp:

May 21, 2008, 11:18:11 AM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

6c96f4

Parents:

3ce105

Message:

ParseMatrix(): char * to string, Contains() hat KeySetContainer:: still in front (new g++ of hardy complained)

Location:

molecuilder/src

Files:

• parser.cpp (modified) (1 diff)
• parser.hpp (modified) (2 diffs)

molecuilder/src/parser.cpp

@@ -96 +96 @@
  * \return parsing successful 
  */
-bool MatrixContainer::ParseMatrix(char *name, char *prefix, char *suffix, int skiplines, int skipcolumns)
+bool MatrixContainer::ParseMatrix(char *name, char *prefix, string suffix, int skiplines, int skipcolumns)
 {
   char filename[1023];

molecuilder/src/parser.hpp

@@ -50 +50 @@
   ~MatrixContainer();
   
-  bool ParseMatrix(char *name, char *prefix, char *suffix, int skiplines, int skipcolumns);
+  bool ParseMatrix(char *name, char *prefix, string suffix, int skiplines, int skipcolumns);
   bool AllocateMatrix(char *GivenHeader, int MCounter, int *RCounter, int CCounter);
   bool ResetMatrix();
@@ -94 +94 @@
   bool ParseKeySets(const char *name, const int *ACounter, const int FCounter);
   bool ParseManyBodyTerms();
-  bool KeySetsContainer::Contains(const int GreaterSet, const int SmallerSet);
+  bool Contains(const int GreaterSet, const int SmallerSet);
 };