Changes in src/graph.hpp [e138de:d4103c8]

File:

• src/graph.hpp (modified) (2 diffs)

src/graph.hpp

@@ -27 +27 @@
 class molecule;
 
-class Graph;
 class SubGraph;
 class Node;
@@ -34 +33 @@
 /********************************************** definitions *********************************/
 
-#define NodeMap pair < int, class Node* >
-#define EdgeMap multimap < class Node*, class Edge* >
+typedef std::pair < int, class Node* > NodeMap;
+typedef std::multimap < class Node*, class Edge* > EdgeMap;
 
-#define KeyStack deque<int>
-#define KeySet set<int>
-#define NumberValuePair pair<int, double>
-#define Graph map <KeySet, NumberValuePair, KeyCompare >
-#define GraphPair pair <KeySet, NumberValuePair >
-#define KeySetTestPair pair<KeySet::iterator, bool>
-#define GraphTestPair pair<Graph::iterator, bool>
+typedef std::deque<int> KeyStack;
+typedef std::set<int> KeySet;
+typedef std::pair<int, double> NumberValuePair;
 
-
-/******************************** Some small functions and/or structures **********************************/
-
+// needed for definition of Graph and GraphTestPair
 struct KeyCompare
 {
   bool operator() (const KeySet SubgraphA, const KeySet SubgraphB) const;
 };
+
+typedef std::map <KeySet, NumberValuePair, KeyCompare > Graph;
+typedef std::pair <KeySet, NumberValuePair > GraphPair;
+typedef std::pair<KeySet::iterator, bool> KeySetTestPair;
+typedef std::pair<Graph::iterator, bool> GraphTestPair;
+
+
+/******************************** Some small functions and/or structures **********************************/
 
 //bool operator < (KeySet SubgraphA, KeySet SubgraphB);   //note: this declaration is important, otherwise normal < is used (producing wrong order)