[med-svn] [SCM] filo branch, master, updated. 4b44baff897511afee0b03ea03ae8f29ab864c22

[Aaron Quinlan]

The following commit has been merged in the master branch:
commit dab25c87575674d064f71f92a773ba7dd18c8b4b
Author: Aaron Quinlan <aaronquinlan at gmail.com>
Date:   Sun Apr 17 12:52:12 2011 -0400

    Silence compiler warnings.  Thanks to Jason Stajich.

diff --git a/src/common/version/version.h b/src/common/version/version.h
index a3e541f..c4fce5d 100644
--- a/src/common/version/version.h
+++ b/src/common/version/version.h
@@ -5,4 +5,4 @@
 // suite carry the same version number.
 #define VERSION "1.1.0"
 
-#endif /* VERSION_H */
\ No newline at end of file
+#endif /* VERSION_H */
diff --git a/src/shuffle/shuffle.cpp b/src/shuffle/shuffle.cpp
index b50b1b5..eccfcdf 100755
--- a/src/shuffle/shuffle.cpp
+++ b/src/shuffle/shuffle.cpp
@@ -66,7 +66,7 @@ int main(int argc, char* argv[]) {
     long totalLines = 0;
 
     vector<string> linesVector;
-    linesVector.reserve(1E6);   // allocate 1 mill lines of input.
+    linesVector.reserve((int) 1E6);   // allocate 1 mill lines of input.
 
     // 0. Are we dealing with a stream or a proper file? Default to a stream.
     istream *in = &cin;

-- 
useful FILe and stream Operations