Changeset 2386:81b47fc5c444 in lemon-0.x for lemon/bits/variant.h

Timestamp:

03/02/07 19:04:28 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3217

Message:

Hard Warning checking

• based on the remark of the ZIB user
• we do not use -Winline

File:

• lemon/bits/variant.h (modified) (4 diffs)

lemon/bits/variant.h

@@ -74 +74 @@
     /// This constructor initalizes to the given value of the \c First
     /// type.
-    BiVariant(const First& first) {
+    BiVariant(const First& f) {
       flag = true;
-      new(reinterpret_cast<First*>(data)) First(first);
+      new(reinterpret_cast<First*>(data)) First(f);
     }
 
@@ -83 +83 @@
     /// This constructor initalizes to the given value of the \c
     /// Second type.
-    BiVariant(const Second& second) {
+    BiVariant(const Second& s) {
       flag = false;
-      new(reinterpret_cast<Second*>(data)) Second(second);
+      new(reinterpret_cast<Second*>(data)) Second(s);
     }
 
@@ -122 +122 @@
     /// This function sets the variant to the given value of the \c
     /// First type.
-    BiVariant& setFirst(const First& first) {
+    BiVariant& setFirst(const First& f) {
       destroy();
       flag = true;
-      new(reinterpret_cast<First*>(data)) First(first);   
+      new(reinterpret_cast<First*>(data)) First(f);   
       return *this;
     }
@@ -144 +144 @@
     /// This function sets the variant to the given value of the \c
     /// Second type.
-    BiVariant& setSecond(const Second& second) {
+    BiVariant& setSecond(const Second& s) {
       destroy();
       flag = false;
-      new(reinterpret_cast<Second*>(data)) Second(second);   
+      new(reinterpret_cast<Second*>(data)) Second(s);   
       return *this;
     }
 
     /// \brief Operator form of the \c setFirst()
-    BiVariant& operator=(const First& first) {
-      return setFirst(first);
+    BiVariant& operator=(const First& f) {
+      return setFirst(f);
     }
 
     /// \brief Operator form of the \c setSecond()
-    BiVariant& operator=(const Second& second) {
-      return setSecond(second);
+    BiVariant& operator=(const Second& s) {
+      return setSecond(s);
     }