Previous to branching

Toni Cebrián · Toni Cebrián · commit 83051999e031 · 2011-12-23T13:50:30.000+01:00
diff --git a/include/csv_iterator.hpp b/include/csv_iterator.hpp
@@ -1,4 +1,3 @@
-#ifndef _CSV_ITERATOR_HPP_
 #define _CSV_ITERATOR_HPP_
 
 #include <string>
@@ -49,13 +48,12 @@ namespace csv {
                             m_bad = true;
                             throw(ex);
                         } catch (std::out_of_range& ex){
-                            // Execption when not enough columns in the record
+                            // Exception when not enough columns in the record
                             m_bad = true;
                             throw(ex);
                         }
                         m_currentDirty = false;
                     }
-                    
                     return currentResult;
                 }
 
@@ -67,7 +65,6 @@ namespace csv {
                     return !(*this == other);
                 }
 
-                
                 iterator& operator++() {
                     bool res = std::getline(*m_in, currentLine);
                     m_bad = !res;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#ifndef _CSV_ITERATOR_HPP_`
`2`	`1`	`#define _CSV_ITERATOR_HPP_`
`3`	`2`
`4`	`3`	`#include <string>`
`@@ -49,13 +48,12 @@ namespace csv {`
`49`	`48`	`m_bad = true;`
`50`	`49`	`throw(ex);`
`51`	`50`	`} catch (std::out_of_range& ex){`
`52`		`- // Execption when not enough columns in the record`
	`51`	`+ // Exception when not enough columns in the record`
`53`	`52`	`m_bad = true;`
`54`	`53`	`throw(ex);`
`55`	`54`	`}`
`56`	`55`	`m_currentDirty = false;`
`57`	`56`	`}`
`58`		`-`
`59`	`57`	`return currentResult;`
`60`	`58`	`}`
`61`	`59`
`@@ -67,7 +65,6 @@ namespace csv {`
`67`	`65`	`return !(*this == other);`
`68`	`66`	`}`
`69`	`67`
`70`		`-`
`71`	`68`	`iterator& operator++() {`
`72`	`69`	`bool res = std::getline(*m_in, currentLine);`
`73`	`70`	`m_bad = !res;`