Skip to content

refactor: use std::unique_ptr (C++11) instead of deprecated std::auto_ptr #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janholstjensen merged 2 commits into from
Apr 10, 2025
Merged

refactor: use std::unique_ptr (C++11) instead of deprecated std::auto_ptr #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a59bcfa
fix: fix detection of Linux
e-kwsm Apr 5, 2025
e3c080a
refactor: use std::unique_ptr (C++11) instead of deprecated std::auto…
e-kwsm Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/example_apps/c_api_usage/Makefile-32bit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -m32 -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m32 -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m32 -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../../rinchi_lib -I../../lib -I../../parsers -I../../rinchi -I../../writers -I../../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
2 changes: 1 addition & 1 deletion src/example_apps/c_api_usage/Makefile-64bit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -m64 -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../../rinchi_lib -I../../lib -I../../parsers -I../../rinchi -I../../writers -I../../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
2 changes: 1 addition & 1 deletion src/example_apps/c_api_usage/Makefile-Mac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -m64 -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../../rinchi_lib -I../../lib -I../../parsers -I../../rinchi -I../../writers -I../../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
2 changes: 1 addition & 1 deletion src/example_apps/c_api_usage/Makefile-Raspberry
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../../rinchi_lib -I../../lib -I../../parsers -I../../rinchi -I../../writers -I../../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
1 change: 1 addition & 0 deletions src/example_apps/c_api_usage/c_api_usage_qt.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ TEMPLATE = app
# InChI 1.0.6 required target definition.
DEFINES += TARGET_API_LIB
QMAKE_CFLAGS += -ansi -DCOMPILE_ANSI_ONLY
QMAKE_CXXFLAGS += -std=c++11

DEPENDPATH += \
./../../rinchi_lib/ \
Expand Down
2 changes: 1 addition & 1 deletion src/example_apps/rinchi_cmdline/Makefile-32bit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -m32 -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m32 -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m32 -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../../lib -I../../parsers -I../../rinchi -I../../writers -I../../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
2 changes: 1 addition & 1 deletion src/example_apps/rinchi_cmdline/Makefile-64bit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -m64 -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../../lib -I../../parsers -I../../rinchi -I../../writers -I../../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
2 changes: 1 addition & 1 deletion src/example_apps/rinchi_cmdline/Makefile-Mac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -m64 -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../../lib -I../../parsers -I../../rinchi -I../../writers -I../../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
2 changes: 1 addition & 1 deletion src/example_apps/rinchi_cmdline/Makefile-Raspberry
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../../lib -I../../parsers -I../../rinchi -I../../writers -I../../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
1 change: 1 addition & 0 deletions src/example_apps/rinchi_cmdline/rinchi_cmdline_qt.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ TEMPLATE = app
# InChI 1.0.6 required target definition.
DEFINES += TARGET_API_LIB
QMAKE_CFLAGS += -ansi -DCOMPILE_ANSI_ONLY
QMAKE_CXXFLAGS += -std=c++11

DEPENDPATH += \
./../../lib/ \
Expand Down
2 changes: 1 addition & 1 deletion src/example_apps/rxn_from_molfiles/Makefile-32bit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -m32 -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m32 -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m32 -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../../lib -I../../parsers -I../../rinchi -I../../writers -I../../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
2 changes: 1 addition & 1 deletion src/example_apps/rxn_from_molfiles/Makefile-64bit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -m64 -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../../lib -I../../parsers -I../../rinchi -I../../writers -I../../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
2 changes: 1 addition & 1 deletion src/example_apps/rxn_from_molfiles/Makefile-Mac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -m64 -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../../lib -I../../parsers -I../../rinchi -I../../writers -I../../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
2 changes: 1 addition & 1 deletion src/example_apps/rxn_from_molfiles/Makefile-Raspberry
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../../lib -I../../parsers -I../../rinchi -I../../writers -I../../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
1 change: 1 addition & 0 deletions src/example_apps/rxn_from_molfiles/rxn_from_molfiles_qt.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ TEMPLATE = app
# InChI 1.0.6 required target definition.
DEFINES += TARGET_API_LIB
QMAKE_CFLAGS += -ansi -DCOMPILE_ANSI_ONLY
QMAKE_CXXFLAGS += -std=c++11

DEPENDPATH += \
./../../lib/ \
Expand Down
2 changes: 1 addition & 1 deletion src/lib/rinchi_platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#define ON_WINDOWS
// TODO: Define MSVC appropriately. And use that condition directly above.
const char DIR_SEPARATOR = '\\';
#elif defined(linux)
#elif defined(__linux__)
#define ON_LINUX
const char DIR_SEPARATOR = '/';
#if defined(__i386__) || defined(__x86_64__)
Expand Down
4 changes: 2 additions & 2 deletions src/parsers/rinchi_reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ namespace rinchi {
// Validate and cleanup InChI input.
InChIGenerator().validate_inchi(inchi_string);

std::auto_ptr<ReactionComponent> cmp (new ReactionComponent());
std::unique_ptr<ReactionComponent> cmp (new ReactionComponent());
components.push_back(cmp.get());
ReactionComponent* tmp_cmp = cmp.release();
tmp_cmp->m_inchi_string = inchi_string;
Expand Down Expand Up @@ -389,7 +389,7 @@ void RInChIReader::split_into_reaction(const std::string& rinchi_string, const s

for (int i = 0; i < RINCHI_NUM_GROUPS; i++) {
for (int k = 0; k < rxn.m_nostruct_counts[i]; k++) {
std::auto_ptr<ReactionComponent> cmp (new ReactionComponent());
std::unique_ptr<ReactionComponent> cmp (new ReactionComponent());
rc_lists[i]->push_back(cmp.get());
ReactionComponent* tmp_cmp = cmp.release();
tmp_cmp->m_inchi_string = NOSTRUCT_INCHI;
Expand Down
2 changes: 1 addition & 1 deletion src/rinchi/rinchi_reaction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ namespace {

ReactionComponent* add_new_component_to_list(ReactionComponentList& list)
{
std::auto_ptr<ReactionComponent> cmp (new ReactionComponent());
std::unique_ptr<ReactionComponent> cmp (new ReactionComponent());
list.push_back(cmp.get());
return cmp.release();
}
Expand Down
2 changes: 1 addition & 1 deletion src/rinchi_lib/Makefile-32bit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -m32 -pipe -ansi -DCOMPILE_ANSI_ONLY -fvisibility=hidden -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m32 -pipe -fvisibility=hidden -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m32 -pipe -std=c++11 -fvisibility=hidden -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../lib -I../parsers -I../rinchi -I../writers -I../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
2 changes: 1 addition & 1 deletion src/rinchi_lib/Makefile-64bit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -m64 -pipe -ansi -DCOMPILE_ANSI_ONLY -fvisibility=hidden -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -fvisibility=hidden -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -std=c++11 -fvisibility=hidden -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../lib -I../parsers -I../rinchi -I../writers -I../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
2 changes: 1 addition & 1 deletion src/rinchi_lib/Makefile-Mac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -m64 -pipe -ansi -DCOMPILE_ANSI_ONLY -fvisibility=hidden -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -fvisibility=hidden -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -std=c++11 -fvisibility=hidden -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../lib -I../parsers -I../rinchi -I../writers -I../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
2 changes: 1 addition & 1 deletion src/rinchi_lib/Makefile-Mac-arm64-with-x86-Python
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -arch x86_64 -m64 -pipe -ansi -DCOMPILE_ANSI_ONLY -fvisibility=hidden -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -arch x86_64 -m64 -pipe -fvisibility=hidden -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -arch x86_64 -m64 -pipe -std=c++11 -fvisibility=hidden -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../lib -I../parsers -I../rinchi -I../writers -I../../INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
2 changes: 1 addition & 1 deletion src/rinchi_lib/Makefile-Raspberry
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -pipe -ansi -DCOMPILE_ANSI_ONLY -fvisibility=hidden -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -pipe -fvisibility=hidden -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -pipe -std=c++11 -fvisibility=hidden -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../lib -I../parsers -I../rinchi -I../writers -I../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
1 change: 1 addition & 0 deletions src/rinchi_lib/librinchi_qt.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ TEMPLATE = lib
# InChI 1.0.6 required target definition.
DEFINES += TARGET_API_LIB
QMAKE_CFLAGS += -ansi -DCOMPILE_ANSI_ONLY
QMAKE_CXXFLAGS += -std=c++11

# Ensure that only explicitly exported functions are present in symbol table.
QMAKE_CXXFLAGS += -fvisibility=hidden
Expand Down
2 changes: 1 addition & 1 deletion src/rinchi_ora_cartridge/Makefile-32bit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -m32 -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m32 -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m32 -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../lib -I../parsers -I../rinchi -I../writers -I../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
2 changes: 1 addition & 1 deletion src/rinchi_ora_cartridge/Makefile-64bit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -m64 -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../lib -I../parsers -I../rinchi -I../writers -I../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
2 changes: 1 addition & 1 deletion src/rinchi_ora_cartridge/Makefile-Mac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -m64 -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../lib -I../parsers -I../rinchi -I../writers -I../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
2 changes: 1 addition & 1 deletion src/rinchi_ora_cartridge/Makefile-Raspberry
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DTARGET_API_LIB
CFLAGS = -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../lib -I../parsers -I../rinchi -I../writers -I../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
1 change: 1 addition & 0 deletions src/rinchi_ora_cartridge/rinchi_ora_cartridge_qt.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ TEMPLATE = lib
# InChI 1.0.6 required target definition.
DEFINES += TARGET_API_LIB
QMAKE_CFLAGS += -ansi -DCOMPILE_ANSI_ONLY
QMAKE_CXXFLAGS += -std=c++11

DEPENDPATH += \
./../lib/ \
Expand Down
2 changes: 1 addition & 1 deletion src/test/test_suite/Makefile-32bit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DIN_RINCHI_TEST_SUITE -DTARGET_API_LIB
CFLAGS = -m32 -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m32 -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m32 -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../../lib -I../../parsers -I../../rinchi -I../../writers -Itests -I../../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
2 changes: 1 addition & 1 deletion src/test/test_suite/Makefile-64bit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DIN_RINCHI_TEST_SUITE -DTARGET_API_LIB
CFLAGS = -m64 -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../../lib -I../../parsers -I../../rinchi -I../../writers -Itests -I../../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
2 changes: 1 addition & 1 deletion src/test/test_suite/Makefile-Mac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DIN_RINCHI_TEST_SUITE -DTARGET_API_LIB
CFLAGS = -m64 -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -m64 -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../../lib -I../../parsers -I../../rinchi -I../../writers -Itests -I../../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
2 changes: 1 addition & 1 deletion src/test/test_suite/Makefile-Raspberry
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CC = gcc
CXX = g++
DEFINES = -DIN_RINCHI_TEST_SUITE -DTARGET_API_LIB
CFLAGS = -pipe -ansi -DCOMPILE_ANSI_ONLY -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -pipe -std=c++11 -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I../../lib -I../../parsers -I../../rinchi -I../../writers -Itests -I../../../../InChI/INCHI-1-SRC/INCHI_BASE/src
QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
DEL_FILE = rm -f
Expand Down
1 change: 1 addition & 0 deletions src/test/test_suite/rinchi_test_suite_qt.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ DEFINES += IN_RINCHI_TEST_SUITE
# InChI 1.0.6 required target definition.
DEFINES += TARGET_API_LIB
QMAKE_CFLAGS += -ansi -DCOMPILE_ANSI_ONLY
QMAKE_CXXFLAGS += -std=c++11

TEMPLATE = app

Expand Down