Changeset 209:765619b7cbb2 in lemon for lemon/concepts/maps.h

Timestamp:

07/13/08 20:51:02 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Apply unify-sources.sh to the source tree

File:

• lemon/concepts/maps.h (modified) (9 diffs)

lemon/concepts/maps.h

@@ -1 @@
-/* -*- C++ -*-
- *
- * This file is a part of LEMON, a generic C++ optimization library
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library.
  *
  * Copyright (C) 2003-2008
@@ -48 +48 @@
 
       /// Returns the value associated with the given key.
-      Value operator[](const Key &) const { 
+      Value operator[](const Key &) const {
         return *static_cast<Value *>(0);
       }
@@ -54 +54 @@
       template<typename _ReadMap>
       struct Constraints {
-        void constraints() {
-          Value val = m[key];
-          val = m[key];
-          typename _ReadMap::Value own_val = m[own_key];
-          own_val = m[own_key];
-
-          ignore_unused_variable_warning(key);
-          ignore_unused_variable_warning(val);
-          ignore_unused_variable_warning(own_key);
-          ignore_unused_variable_warning(own_val);
-        }
-        const Key& key;
-        const typename _ReadMap::Key& own_key;
-        const _ReadMap& m;
+        void constraints() {
+          Value val = m[key];
+          val = m[key];
+          typename _ReadMap::Value own_val = m[own_key];
+          own_val = m[own_key];
+
+          ignore_unused_variable_warning(key);
+          ignore_unused_variable_warning(val);
+          ignore_unused_variable_warning(own_key);
+          ignore_unused_variable_warning(own_val);
+        }
+        const Key& key;
+        const typename _ReadMap::Key& own_key;
+        const _ReadMap& m;
       };
 
@@ -94 +94 @@
       template <typename _WriteMap>
       struct Constraints {
-        void constraints() {
-          m.set(key, val);
-          m.set(own_key, own_val);
-
-          ignore_unused_variable_warning(key);
-          ignore_unused_variable_warning(val);
-          ignore_unused_variable_warning(own_key);
-          ignore_unused_variable_warning(own_val);
-        }
-        const Key& key;
-        const Value& val;
-        const typename _WriteMap::Key& own_key;
-        const typename _WriteMap::Value& own_val;
-        _WriteMap& m;
+        void constraints() {
+          m.set(key, val);
+          m.set(own_key, own_val);
+
+          ignore_unused_variable_warning(key);
+          ignore_unused_variable_warning(val);
+          ignore_unused_variable_warning(own_key);
+          ignore_unused_variable_warning(own_val);
+        }
+        const Key& key;
+        const Value& val;
+        const typename _WriteMap::Key& own_key;
+        const typename _WriteMap::Value& own_val;
+        _WriteMap& m;
       };
     };
@@ -117 +117 @@
     template<typename K, typename T>
     class ReadWriteMap : public ReadMap<K,T>,
-                         public WriteMap<K,T>
+                         public WriteMap<K,T>
     {
     public:
@@ -126 +126 @@
 
       /// Returns the value associated with the given key.
-      Value operator[](const Key &) const { 
+      Value operator[](const Key &) const {
         return *static_cast<Value *>(0);
       }
@@ -135 +135 @@
       template<typename _ReadWriteMap>
       struct Constraints {
-        void constraints() {
-          checkConcept<ReadMap<K, T>, _ReadWriteMap >();
-          checkConcept<WriteMap<K, T>, _ReadWriteMap >();
-        }
+        void constraints() {
+          checkConcept<ReadMap<K, T>, _ReadWriteMap >();
+          checkConcept<WriteMap<K, T>, _ReadWriteMap >();
+        }
       };
     };
@@ -165 +165 @@
 
       /// Returns a reference to the value associated with the given key.
-      Reference operator[](const Key &) { 
+      Reference operator[](const Key &) {
         return *static_cast<Value *>(0);
       }
@@ -179 +179 @@
       template<typename _ReferenceMap>
       struct Constraints {
-        void constraints() {
-          checkConcept<ReadWriteMap<K, T>, _ReferenceMap >();
-          ref = m[key];
-          m[key] = val;
-          m[key] = ref;
-          m[key] = cref;
-          own_ref = m[own_key];
-          m[own_key] = own_val;
-          m[own_key] = own_ref;
-          m[own_key] = own_cref;
-          m[key] = m[own_key];
-          m[own_key] = m[key];
-        }
-        const Key& key;
-        Value& val;
-        Reference ref;
-        ConstReference cref;
-        const typename _ReferenceMap::Key& own_key;
-        typename _ReferenceMap::Value& own_val;
-        typename _ReferenceMap::Reference own_ref;
-        typename _ReferenceMap::ConstReference own_cref;
-        _ReferenceMap& m;
+        void constraints() {
+          checkConcept<ReadWriteMap<K, T>, _ReferenceMap >();
+          ref = m[key];
+          m[key] = val;
+          m[key] = ref;
+          m[key] = cref;
+          own_ref = m[own_key];
+          m[own_key] = own_val;
+          m[own_key] = own_ref;
+          m[own_key] = own_cref;
+          m[key] = m[own_key];
+          m[own_key] = m[key];
+        }
+        const Key& key;
+        Value& val;
+        Reference ref;
+        ConstReference cref;
+        const typename _ReferenceMap::Key& own_key;
+        typename _ReferenceMap::Value& own_val;
+        typename _ReferenceMap::Reference own_ref;
+        typename _ReferenceMap::ConstReference own_cref;
+        _ReferenceMap& m;
       };
     };