Changeset 308a766 in git for Singular/Cache.h

Timestamp:

Nov 29, 2012, 11:02:36 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

05c3b87378ab3e8310b306f10a0eec4bd579ca9c894604cd8e2bd80d9c29cfc35d194404eaa0d476

Parents:

4b5098278b256cb9f73dc0b32dedd20101972d76

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-11-29 23:02:36+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-11-29 23:08:28+01:00

Message:

Fixing Frank's Minor stuff

add: forward declarations
fix: includes
fix: assert -> assume
fix: cout, printf -> use Print(S)
fix: removed using namespace std: in headers use std::

File:

• Singular/Cache.h (modified) (8 diffs)

Singular/Cache.h

@@ -4 +4 @@
 #include <string>
 #include <list>
-#include <assert.h>
-
-using namespace std;
+
+// #include <assert.h>
+// using namespace std;
 
 /*! \class Cache
@@ -75 +75 @@
      * as long as the pair <c>key(_rank(i)) -->  value(_rank(i))</c>.
      */
-     list<int> _rank;
+   std::list<int> _rank;
   
      /**
@@ -83 +83 @@
      * in KeyClass.
      */
-     list<KeyClass> _key;
+     std::list<KeyClass> _key;
   
      /**
@@ -91 +91 @@
      * argument \c _key[i]).
      */
-     list<ValueClass> _value;
+     std::list<ValueClass> _value;
      
      /**
      * container for the weights of all cached values
      */
-     list<int> _weights;
+     std::list<int> _weights;
   
      /**
@@ -104 +104 @@
      * const, as the user would expect for these methods.
      */
-     mutable typename list<KeyClass>::const_iterator _itKey;
+     mutable typename std::list<KeyClass>::const_iterator _itKey;
      
      /**
@@ -112 +112 @@
      * const, as the user would expect for these methods.
      */
-     mutable typename list<ValueClass>::const_iterator _itValue;
+     mutable typename std::list<ValueClass>::const_iterator _itValue;
   
      /**
@@ -314 +314 @@
      *         string
      */
-     string toString () const;
+   std::string toString () const;
   
      /**
@@ -324 +324 @@
 };
 
-#include <CacheImplementation.h>
+#include "CacheImplementation.h"
 
 #endif