Merge pull request #320 from jmarshall/warnings4

Minor warning fixes
arq5x · Nov 9, 2015 · 3d31735 · 3d31735
2 parents e392a61 + 67aca77
commit 3d31735
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/split/splitBed.cpp b/src/split/splitBed.cpp
@@ -9,6 +9,8 @@
 ******************************************************************************/
 #include <cmath>
 #include <climits>
+#include <sstream>
+#include <iomanip>
 #include <inttypes.h>
 #include <getopt.h>
 #include "lineFileUtilities.h"
@@ -145,11 +147,10 @@ int BedSplit::main(int argc,char** argv)
 
 std::FILE* BedSplit::saveFileChunk(std::string& filename,size_t file_index)
    {
-
-    char tmp[10];
-    filename.assign(this->outfileprefix);
-    sprintf(tmp,"%05d",(file_index+1));
-    filename.append(".").append(tmp).append(".bed");
+    ostringstream name;
+    name << this->outfileprefix << '.'
+         << setfill('0') << setw(5) << file_index+1 << ".bed";
+    filename = name.str();
     FILE* out = fopen(filename.c_str(),"w");
 
     if(out==NULL)

diff --git a/src/utils/FileRecordTools/Records/PlusFields.h b/src/utils/FileRecordTools/Records/PlusFields.h
@@ -8,11 +8,11 @@
 #ifndef PLUSFIELDS_H_
 #define PLUSFIELDS_H_
 
-using namespace std;
-
 #include "QuickString.h"
 #include <vector>
 
+using namespace std;
+
 class SingleLineDelimTextFileReader;
 
 class PlusFields {