From 02ef85faef15fb458f9009723d7d964fbd751b76 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 15 Dec 2009 09:37:09 +0100
Subject: [PATCH] Use first() and last() methods in primitiveEntry.

---
 .../primitiveEntry/primitiveEntry.C           | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
index be5977ee06..d3f69ddb4d 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
@@ -60,34 +60,39 @@ Foam::primitiveEntry::primitiveEntry
 
 Foam::label Foam::primitiveEntry::startLineNumber() const
 {
-    if (size())
+    const tokenList& tokens = *this;
+
+    if (tokens.empty())
     {
-        return operator[](0).lineNumber();
+        return -1;
     }
     else
     {
-        return -1;
+        return tokens.first().lineNumber();
     }
 }
 
+
 Foam::label Foam::primitiveEntry::endLineNumber() const
 {
-    if (size())
+    const tokenList& tokens = *this;
+
+    if (tokens.empty())
     {
-        return operator[](size()-1).lineNumber();
+        return -1;
     }
     else
     {
-        return -1;
+        return tokens.last().lineNumber();
     }
 }
 
 
 Foam::ITstream& Foam::primitiveEntry::stream() const
 {
-    ITstream& dataStream = const_cast<primitiveEntry&>(*this);
-    dataStream.rewind();
-    return dataStream;
+    ITstream& is = const_cast<primitiveEntry&>(*this);
+    is.rewind();
+    return is;
 }
 
 
@@ -125,7 +130,7 @@ void Foam::primitiveEntry::insert
     {
         label end = tokens.size() - 1;
 
-        for (label j=posI; j<end; j++)
+        for (label j = posI; j < end; j++)
         {
             tokens[j] = tokens[j+1];
         }
@@ -139,7 +144,7 @@ void Foam::primitiveEntry::insert
         label end = tokens.size() - 1;
         label offset = varTokens.size() - 1;
 
-        for (label j=end; j>posI; j--)
+        for (label j = end; j > posI; j--)
         {
             tokens[j] = tokens[j-offset];
         }