fixes namespace conflicts

src/ofxLSLReceiver.h

@@ -32,7 +32,7 @@ class BaseReceiver : public ofThread {
   void run();
   virtual void pull() = 0;
 
-  atomic<bool> active;
+  std::atomic<bool> active;
   std::mutex runMutex;
   std::unique_ptr<std::thread> pullThread;
   std::condition_variable pullSignal;
@@ -42,7 +42,7 @@ class BaseReceiver : public ofThread {
   std::string sourceId;
   std::shared_ptr<lsl::stream_inlet> inlet;
 
-  atomic<int> sampleCapacity;
+  std::atomic<int> sampleCapacity;
 };
 
 

src/ofxLSLResolver.cpp

@@ -1,12 +1,12 @@
-#include "ofxLSLResolver.h"
+#include "ofxLSLResolver.h"
 
 using namespace lsl;
 using namespace ofxLSL;
 
 
 Resolver::Resolver() {
   running = true;
-  resolver = make_unique<continuous_resolver>();
+  resolver = std::make_unique<continuous_resolver>();
   auto libMajor = library_version() / 100;
   auto libMinor = library_version() % 100;
   auto protMajor = lsl_protocol_version() / 100;

src/ofxLSLResolver.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "lsl_cpp.h"
 #include "ofLog.h"
@@ -38,7 +38,7 @@ class Resolver {
 
   bool isEqual(stream_info _infoA, stream_info _infoB);
 
-  atomic<bool> running;
+  std::atomic<bool> running;
   std::unique_ptr<std::thread> runThread;
   std::condition_variable runSignal;
   std::mutex runMutex;