reapack

commit 418d9ed06ed6772cdd50641393ca24754c1c18a0
parent 1c91adfe043e227f9cb51f011d142ffc2bdb4dd1
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Sun, 12 Jun 2016 22:20:59 -0400

osx: add support for old OS X versions up to 10.7

fixes #3

Diffstat:
M
macosx.tup
 | 
2
+-
M
src/database.cpp
 | 
2
+-
M
src/registry.cpp
 | 
2
+-
M
test/database.cpp
 | 
2
+-

4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/macosx.tup b/macosx.tup
@@ -9,7 +9,7 @@ CXXFLAGS += -fdiagnostics-color -fstack-protector-strong -fvisibility=hidden
 CXXFLAGS += -pipe -fPIC -O2 -std=c++14
 CXXFLAGS += -Ivendor -Ivendor/WDL -Ivendor/WDL/WDL -Ivendor/WDL/WDL/swell
 CXXFLAGS += -DWDL_NO_DEFINE_MINMAX -DREAPACK_FILE=\"$(REAPACK_FILE)\"
-CXXFLAGS += -arch @(ARCH)
+CXXFLAGS += -arch @(ARCH) -mmacosx-version-min=10.7 -stdlib=libc++
 
 WDLFLAGS := -std=c++98 -w
 
diff --git a/src/database.cpp b/src/database.cpp
@@ -87,7 +87,7 @@ int Database::version() const
 
 int Database::errorCode() const
 {
-  return sqlite3_extended_errcode(m_db);
+  return sqlite3_errcode(m_db);
 }
 
 void Database::begin()
diff --git a/src/registry.cpp b/src/registry.cpp
@@ -169,7 +169,7 @@ auto Registry::push(const Version *ver, vector<Path> *conflicts) -> Entry
       m_insertFile->exec();
     }
     catch(const reapack_error &) {
-      if(conflicts && m_db.errorCode() == SQLITE_CONSTRAINT_UNIQUE) {
+      if(conflicts && m_db.errorCode() == SQLITE_CONSTRAINT) {
         hasConflicts = true;
         conflicts->push_back(path);
       }
diff --git a/test/database.cpp b/test/database.cpp
@@ -171,7 +171,7 @@ TEST_CASE("sqlite error code", M) {
   }
   catch(const reapack_error &) {}
 
-  REQUIRE(db.errorCode() == SQLITE_CONSTRAINT_UNIQUE);
+  REQUIRE(db.errorCode() == SQLITE_CONSTRAINT);
 }
 
 TEST_CASE("invalid string column", M) {