Hmm, some standardization sitting around in a working copy since November...

diff --git a/strip-tags.cc b/strip-tags.cc
index 7a4d8f951e1b902683c8d3e807b1b6eb6966d933..610af686ebfa43e0d507ac5ec7a1c599b06a3103 100644 (file)
--- a/strip-tags.cc
+++ b/strip-tags.cc
@@ -1,8 +1,10 @@
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
+extern "C" {
 #include <unistd.h>
+}
 
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
 #include <set>
 
 #include <id3v2tag.h>
@@ -11,12 +13,12 @@
 // set::find didn't work...?!
 class ByteVectorSet {
 public:
-    ByteVectorSet(set<TagLib::ByteVector *> bv_set)
+    ByteVectorSet(std::set<TagLib::ByteVector *> bv_set)
         : set_(bv_set)
         { }
 
     bool has(TagLib::ByteVector *bv) {
-        for (set<TagLib::ByteVector *>::const_iterator it = set_.begin();
+        for (std::set<TagLib::ByteVector *>::const_iterator it = set_.begin();
              it != set_.end();
              ++it) {
             if (**it == *bv) {
@@ -27,7 +29,7 @@ public:
     }
 
 private:
-    set<TagLib::ByteVector *> set_;
+    std::set<TagLib::ByteVector *> set_;
 };
 
 static bool
@@ -66,7 +68,7 @@ strip_frames(TagLib::MPEG::File &f, ByteVectorSet &preserve)
 int
 main(int argc, char **argv)
 {
-    set<TagLib::ByteVector *> preserve_frames;
+    std::set<TagLib::ByteVector *> preserve_frames;
 
     int c;
     while ((c = getopt(argc, argv, "p:")) != -1) {