From 100b814069c516cf390b184c57f00c2763e04bce Mon Sep 17 00:00:00 2001
From: Bartosz Taudul <wolf.pld@gmail.com>
Date: Wed, 15 Nov 2017 21:42:55 +0100
Subject: [PATCH] Wrap benaphore in tracy namespace, etc.

---
 server/tracy_benaphore.h | 9 ++++++---
 server/tracy_sema.h      | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/server/tracy_benaphore.h b/server/tracy_benaphore.h
index ff66fd36..1d464f29 100644
--- a/server/tracy_benaphore.h
+++ b/server/tracy_benaphore.h
@@ -3,14 +3,16 @@
 // https://github.com/preshing/cpp11-on-multicore/blob/master/LICENSE
 //---------------------------------------------------------
 
-#ifndef __CPP11OM_BENAPHORE_H__
-#define __CPP11OM_BENAPHORE_H__
+#ifndef __TRACY_CPP11OM_BENAPHORE_H__
+#define __TRACY_CPP11OM_BENAPHORE_H__
 
 #include <cassert>
 #include <thread>
 #include <atomic>
-#include "sema.h"
+#include "tracy_sema.h"
 
+namespace tracy
+{
 
 //---------------------------------------------------------
 // NonRecursiveBenaphore
@@ -138,5 +140,6 @@ public:
     }
 };
 
+}
 
 #endif // __CPP11OM_BENAPHORE_H__
diff --git a/server/tracy_sema.h b/server/tracy_sema.h
index 62d17ba7..dc40141c 100644
--- a/server/tracy_sema.h
+++ b/server/tracy_sema.h
@@ -3,12 +3,14 @@
 // https://github.com/preshing/cpp11-on-multicore/blob/master/LICENSE
 //---------------------------------------------------------
 
-#ifndef __CPP11OM_SEMAPHORE_H__
-#define __CPP11OM_SEMAPHORE_H__
+#ifndef __TRACY_CPP11OM_SEMAPHORE_H__
+#define __TRACY_CPP11OM_SEMAPHORE_H__
 
 #include <atomic>
 #include <cassert>
 
+namespace tracy
+{
 
 #if defined(_WIN32)
 //---------------------------------------------------------
@@ -221,5 +223,6 @@ public:
 
 typedef LightweightSemaphore DefaultSemaphoreType;
 
+}
 
 #endif // __CPP11OM_SEMAPHORE_H__