Use C++11 std::mutex and std::lock_guard instead of our RAII wrapper.

[cubemap] / httpinput.h

diff --git a/httpinput.h b/httpinput.h
index 0e29453fb4bdab7aabcc6f7f092940bcf7d8b353..31819f947ec54f4e225e95609e6fb86562867898 100644 (file)
--- a/httpinput.h
+++ b/httpinput.h
@@ -1,8 +1,8 @@
 #ifndef _HTTPINPUT_H
 #define _HTTPINPUT_H 1
 
-#include <pthread.h>
 #include <stddef.h>
+#include <mutex>
 #include <string>
 #include <vector>
 
@@ -87,27 +87,27 @@ private:
 
        // If <pending_data> starts with a Metacube header,
        // this is true.
-       bool has_metacube_header;
+       bool has_metacube_header = false;
 
        // The socket we are downloading on (or -1).
-       int sock;
+       int sock = -1;
 
        // Mutex protecting <stats>.
-       mutable pthread_mutex_t stats_mutex;
+       mutable std::mutex stats_mutex;
 
        // The current statistics for this connection. Protected by <stats_mutex>.
        InputStats stats;
 
        // Number of (started) connection attempts since last data byte was successfully read.
-       unsigned num_connection_attempts;
+       unsigned num_connection_attempts = 0;
 
        // If set, don't log anything related to connections.
        // (Only set if we've had enough unsuccessful connection attempts.)
-       bool suppress_logging;
+       bool suppress_logging = false;
 
        // Last time we made a connection with logging enabled.
        // (Initially at some point before the epoch.)
-       timespec last_verbose_connection;
+       timespec last_verbose_connection { -3600, 0 };
 };
 
 #endif  // !defined(_HTTPINPUT_H)