Skip to content
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.

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

Fix -Wshadow warning #35

Closed
wants to merge 51 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
92dc447
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Sep 5, 2016
cfde61c
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Sep 5, 2016
f3d7bea
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Sep 10, 2016
2db206b
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Sep 15, 2016
cfe8fd1
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Sep 17, 2016
d63c4c2
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Sep 17, 2016
5728bb1
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Sep 26, 2016
94214bf
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Sep 26, 2016
4164836
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Sep 27, 2016
46b918c
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Sep 28, 2016
83645a6
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 2, 2016
67718cb
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 2, 2016
47b91ed
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 2, 2016
a945f92
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 2, 2016
8605c9f
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 2, 2016
7787264
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 2, 2016
2634a0b
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 3, 2016
5fbbe49
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 4, 2016
d86f6da
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 5, 2016
b3f673f
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 5, 2016
9a269be
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 9, 2016
6b0dfbc
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 10, 2016
a4fd5ce
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 10, 2016
ee00464
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 10, 2016
e7bf0da
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 10, 2016
4e8e9b9
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 11, 2016
57041af
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 12, 2016
c57053f
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 13, 2016
bf5e55f
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 14, 2016
165e10a
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 16, 2016
3209f74
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 18, 2016
bf24f1f
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 19, 2016
e21b7d2
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 19, 2016
6db84b6
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 19, 2016
fca5cde
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Oct 26, 2016
d296b0b
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Dec 14, 2016
54c9235
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Dec 18, 2016
bf0b538
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Dec 18, 2016
85c4183
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Dec 18, 2016
9211ae8
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Feb 6, 2017
27c041d
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Feb 11, 2017
ecc414d
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Feb 11, 2017
dc25136
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Feb 14, 2017
f78f1ae
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Feb 15, 2017
b579791
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Feb 21, 2017
64bfc51
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Mar 1, 2017
c3c6fe1
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow May 5, 2017
f32d2b4
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Jan 1, 2018
c7c2194
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Jan 1, 2020
7135f4d
C++ Mathematical Expression Library (ExprTk) http://www.partow.net/p…
ArashPartow Jan 1, 2021
bb1e4c3
Fix -Wshadow warning
jschueller Jun 10, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 37 additions & 0 deletions .circleci/config.yml
@@ -0,0 +1,37 @@
version: 2.1
jobs:

build_gcc_6:
docker:
- image: gcc:6
steps:
- checkout
- run: c++ --version
- run: make all -j 2
- run: ./exprtk_test

build_gcc_7:
docker:
- image: gcc:7
steps:
- checkout
- run: c++ --version
- run: make all -j 2
- run: ./exprtk_test

build_gcc_latest:
docker:
- image: gcc:latest
steps:
- checkout
- run: c++ --version
- run: make all -j 2
- run: ./exprtk_test

workflows:
version: 2
build_and_test:
jobs:
- build_gcc_6
- build_gcc_7
- build_gcc_latest
12 changes: 0 additions & 12 deletions .travis.yml

This file was deleted.

44 changes: 15 additions & 29 deletions Makefile
Expand Up @@ -2,45 +2,31 @@
# **************************************************************
# * C++ Mathematical Expression Toolkit Library *
# * *
# * Author: Arash Partow (1999-2016) *
# * Author: Arash Partow (1999-2021) *
# * URL: http://www.partow.net/programming/exprtk/index.html *
# * *
# * Copyright notice: *
# * Free use of the Mathematical Expression Toolkit Library is *
# * permitted under the guidelines and in accordance with the *
# * most current version of the Common Public License. *
# * http://www.opensource.org/licenses/cpl1.0.php *
# * most current version of the MIT License. *
# * http://www.opensource.org/licenses/MIT *
# * *
# **************************************************************
#


COMPILER = -c++
#COMPILER = -clang
OPTIMIZATION_OPT = -O1
BASE_OPTIONS = -pedantic-errors -Wall -Wextra -Werror -Wno-long-long
OPTIONS = $(BASE_OPTIONS) $(OPTIMIZATION_OPT)
LINKER_OPT = -L/usr/lib -lstdc++ -lm

BUILD_LIST+=exprtk_test
BUILD_LIST+=exprtk_benchmark
BUILD_LIST+=exprtk_simple_example_01
BUILD_LIST+=exprtk_simple_example_02
BUILD_LIST+=exprtk_simple_example_03
BUILD_LIST+=exprtk_simple_example_04
BUILD_LIST+=exprtk_simple_example_05
BUILD_LIST+=exprtk_simple_example_06
BUILD_LIST+=exprtk_simple_example_07
BUILD_LIST+=exprtk_simple_example_08
BUILD_LIST+=exprtk_simple_example_09
BUILD_LIST+=exprtk_simple_example_10
BUILD_LIST+=exprtk_simple_example_11
BUILD_LIST+=exprtk_simple_example_12
BUILD_LIST+=exprtk_simple_example_13
BUILD_LIST+=exprtk_simple_example_14
BUILD_LIST+=exprtk_simple_example_15
BUILD_LIST+=exprtk_simple_example_16
BUILD_LIST+=exprtk_simple_example_17
COMPILER := -c++
#COMPILER := -clang++
OPTIMIZATION_OPT := -O1
BASE_OPTIONS := -pedantic-errors -Wall -Wextra -Werror -Wno-long-long
OPTIONS := $(BASE_OPTIONS) $(OPTIMIZATION_OPT)
LINKER_OPT := -L/usr/lib -lstdc++ -lm
ASAN_OPT := -g -fsanitize=address -fno-omit-frame-pointer
MSAN_OPT := -g -fsanitize=memory -fno-omit-frame-pointer
LSAN_OPT := -g -fsanitize=leak -fno-omit-frame-pointer
USAN_OPT := -g -fsanitize=undefined -fno-omit-frame-pointer
BUILD_SRC := $(sort $(wildcard exprtk_*.cpp))
BUILD_LIST := $(BUILD_SRC:%.cpp=%)


all: $(BUILD_LIST)
Expand Down