Small windows adjustements for std::mutex changes

src/utils/rclutil.cpp

@@ -263,7 +263,7 @@ bool maketmpdir(string& tdir, string& reason)
     // mkdir. try to make sure that we at least don't shoot ourselves
     // in the foot
     static std::mutex mmutex;
-    std::unique_lock lock(mmutex);
+    std::unique_lock<std::mutex> lock(mmutex);
     tdir = path_wingettempfilename(TEXT("rcltmp"));
 #endif
 

src/utils/smallut.cpp

@@ -1240,9 +1240,9 @@ public:
                    ((flags&SRE_NOSUB) ? regex_constants::nosubs : 0)
                    )), ok(true), nmatch(nm) {
     }
-    bool ok;
     std::regex expr;
     std::smatch res;
+    bool ok;
     int nmatch;
 };