Fixing Mojave Build (unitaryfund#129)

* Fixing function overload warning * Builds on Mojave (tested) * Removing and gitignore-ing .DS_Store
mphschmitt · Jan 19, 2019 · 0191f86 · 0191f86
1 parent f13483f
commit 0191f86
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /doc/*
+.DS_Store
 *.o
 *.a
 qregistercl.hpp

diff --git a/include/bitbuffer.hpp b/include/bitbuffer.hpp
@@ -42,6 +42,10 @@ struct BitBuffer {
     {
         // Intentionally left blank.
     }
+
+    virtual ~BitBuffer() {
+        // Intentionally left blank.
+    }
 
     virtual void Apply(QInterfacePtr qReg, const bitLenInt& qubitIndex, std::vector<BitBufferPtr>* bitBuffers) = 0;
 

diff --git a/include/common/oclengine.hpp b/include/common/oclengine.hpp
@@ -23,6 +23,7 @@
 #include <mutex>
 
 #ifdef __APPLE__
+#define CL_SILENCE_DEPRECATION
 #include <OpenCL/cl.hpp>
 #else
 #include <CL/cl.hpp>

diff --git a/include/qengine_opencl.hpp b/include/qengine_opencl.hpp
@@ -116,6 +116,7 @@ class QEngineOCL : public QEngine {
     using QEngine::Swap;
     virtual void Swap(bitLenInt start1, bitLenInt start2, bitLenInt length);
 
+    using QEngine::Compose;
     virtual bitLenInt Compose(QEngineOCLPtr toCopy);
     virtual bitLenInt Compose(QInterfacePtr toCopy) { return Compose(std::dynamic_pointer_cast<QEngineOCL>(toCopy)); }
     virtual bitLenInt Compose(QEngineOCLPtr toCopy, bitLenInt start);

diff --git a/include/qunitmulti.hpp b/include/qunitmulti.hpp
@@ -36,7 +36,7 @@ struct QEngineInfo {
         // Intentionally left blank
     }
 
-    bool operator<(const QEngineInfo& other)
+    bool operator<(const QEngineInfo& other) const
     {
         if (size == other.size) {
             return deviceID < other.deviceID;

diff --git a/src/qengine/opencl.cpp b/src/qengine/opencl.cpp
@@ -314,7 +314,7 @@ void QEngineOCL::SetDevice(const int& dID, const bool& forceReInit)
 
     if (!didInit) {
 #ifdef __APPLE__
-        posix_memalign(&nrmArray, ALIGN_SIZE, nrmVecAlignSize);
+        posix_memalign((void**)&nrmArray, ALIGN_SIZE, nrmVecAlignSize);
 #else
         nrmArray = (real1*)aligned_alloc(ALIGN_SIZE, nrmVecAlignSize);
 #endif
@@ -323,7 +323,7 @@ void QEngineOCL::SetDevice(const int& dID, const bool& forceReInit)
         free(nrmArray);
         nrmArray = NULL;
 #ifdef __APPLE__
-        posix_memalign(&nrmArray, ALIGN_SIZE, nrmVecAlignSize);
+        posix_memalign((void**)&nrmArray, ALIGN_SIZE, nrmVecAlignSize);
 #else
         nrmArray = (real1*)aligned_alloc(ALIGN_SIZE, nrmVecAlignSize);
 #endif

diff --git a/test/tests.hpp b/test/tests.hpp
@@ -161,7 +161,7 @@ class ProbPattern : public Catch::MatcherBase<Qrack::QInterfacePtr> {
         return true;
     }
 
-    virtual std::string describe() const
+    virtual std::string describe() const override
     {
         std::ostringstream ss;
         ss << "matches bit pattern [" << (int)start << "," << start + length << "]: " << (int)length << "/";