commiting changed mutex to merge

2026-09-11 07:03:33 +02:00 · 2013-10-02 20:00:42 +05:30
parent 5a5b02d79c 7dc0bbcc17
commit 37df1f14c7
1 changed files with 7 additions and 0 deletions
@@ -43,11 +43,18 @@ struct atomic_flag_init {
 static const atomic_flag_init NATIVE_ATOMIC_FLAG_INIT;

 class atomic_flag {
+<<<<<<< HEAD
 public:
 	atomic_flag() {
 	}
 	
 	atomic_flag(const atomic_flag_init &v) : value(0) {
+=======
+	atomic_flag() {
+	}
+
+	atomic_flag(atomic_flag_init &v) : value(0) {
+>>>>>>> upstream/master
 	}

 	void clear() {