I hereby claim:
- I am mcs07 on github.
- I am mcs07 (https://keybase.io/mcs07) on keybase.
- I have a public key whose fingerprint is 9329 8D08 E4D2 F2B6 85FB 56B0 3872 03B9 4DFC 10FD
To claim this, I am signing this object:
diff --git a/include/iwaray.h b/include/iwaray.h | |
index 1b58e95..213f25a 100644 | |
--- a/include/iwaray.h | |
+++ b/include/iwaray.h | |
@@ -341,7 +341,7 @@ resizable_array_p<T>::resizable_array_p (int n) | |
template <typename T> | |
resizable_array_p<T>::resizable_array_p (T * item) | |
{ | |
- add (item); | |
+ this->add (item); |
diff --git a/makefile b/makefile | |
index 7afcae0..533b228 100644 | |
--- a/makefile | |
+++ b/makefile | |
@@ -2,13 +2,3 @@ OBJECTS =main.o SCA.o bitvector.o argv.o error.o mem_2.o label_vector.o linkedli | |
CFLAGS = -O | |
subset: $(OBJECTS) | |
$(CC) $(OBJECTS) -o subset -lm | |
- subset < Test/label_vector.tab | |
- subset -sim 0.5 < Test/label_vector.tab |
From c3abbddae78e654df9322ad1020ff79dd6332946 Mon Sep 17 00:00:00 2001 | |
From: Matt Swain <m.swain@me.com> | |
Date: Thu, 31 Oct 2013 15:25:53 +0000 | |
Subject: [PATCH] Detect libc++ as this is now the default in OS X Mavericks | |
--- | |
include/openbabel/obmolecformat.h | 7 ++++++- | |
include/openbabel/shared_ptr.h | 12 ++++++++++-- | |
src/ops/unique.cpp | 8 ++++++-- | |
3 files changed, 22 insertions(+), 5 deletions(-) |
I hereby claim:
To claim this, I am signing this object:
diff --git a/src/Makefile.in b/src/Makefile.in | |
index bf4181f..883fec2 | |
--- a/src/Makefile.in | |
+++ b/src/Makefile.in | |
@@ -10,7 +10,7 @@ PROGRAM = gocr$(EXEEXT) | |
PGMASCLIB = Pgm2asc | |
#LIBPGMASCLIB = lib$(PGMASCLIB).a | |
# ToDo: need a better pgm2asc.h for lib users | |
-#INCLUDEFILES = gocr.h | |
+INCLUDEFILES = pgm2asc.h output.h list.h unicode.h gocr.h pnm.h |
diff --git a/src/parsmart.cpp b/src/parsmart.cpp | |
index 120963e..22fe56e 100644 | |
--- a/src/parsmart.cpp | |
+++ b/src/parsmart.cpp | |
@@ -1181,7 +1181,6 @@ namespace OpenBabel | |
FreeAtomExpr(expr1); | |
return (AtomExpr*)0; | |
} | |
- delete expr1; | |
expr1 = BuildAtomBin(AE_ANDLO,expr1,expr2); |
diff --git a/Code/RDGeneral/Dict.h b/Code/RDGeneral/Dict.h | |
index 6d368a4..6f586a8 100644 | |
--- a/Code/RDGeneral/Dict.h | |
+++ b/Code/RDGeneral/Dict.h | |
@@ -32,14 +32,12 @@ | |
//! | |
class Dict { | |
public: | |
- typedef std::map<const std::string, boost::any> DataType; | |
+ typedef std::map<std::string, boost::any> DataType; |
diff --git a/character_r11.cc b/character_r11.cc | |
index 9b054e1..794e9c0 100644 | |
--- a/character_r11.cc | |
+++ b/character_r11.cc | |
@@ -18,6 +18,7 @@ | |
#include <algorithm> | |
#include <cstdio> | |
+#include <cstdlib> | |
#include <vector> |
diff --git a/common/cmake/GetSystemVersion.cmake b/common/cmake/GetSystemVersion.cmake | |
index 17615ab..794babd 100644 | |
--- a/common/cmake/GetSystemVersion.cmake | |
+++ b/common/cmake/GetSystemVersion.cmake | |
@@ -27,6 +27,8 @@ elseif(APPLE) | |
set(SUBSYSTEM_NAME "10.9") | |
elseif(DARWIN_VERSION MATCHES 14) | |
set(SUBSYSTEM_NAME "10.10") | |
+ elseif(DARWIN_VERSION MATCHES 15) | |
+ set(SUBSYSTEM_NAME "10.11") |