recoll / Code / Diff of /src/utils/transcode.cpp

Diff of /src/utils/transcode.cpp [d8f215] .. [c1fad4]

Switch to side-by-side view

--- a/src/utils/transcode.cpp
+++ b/src/utils/transcode.cpp
@@ -20,7 +20,7 @@
 
 #include <string>
 #include <iostream>
-
+#include <mutex>
 using std::string;
 
 #include <errno.h>
@@ -28,7 +28,7 @@
 
 #include "transcode.h"
 #include "log.h"
-#include "ptmutex.h"
+
 #ifdef RCL_ICONV_INBUF_CONST
 #define ICV_P2_TYPE const char**
 #else
@@ -53,8 +53,8 @@
     static iconv_t ic = (iconv_t)-1;
     static string cachedicode;
     static string cachedocode;
-    static PTMutexInit o_cachediconv_mutex;
-    PTMutexLocker locker(o_cachediconv_mutex);
+    static std::mutex o_cachediconv_mutex;
+    std::unique_lock<std::mutex> lock(o_cachediconv_mutex);
 #else 
     iconv_t ic;
 #endif