Skip to content

Commit 19630a3

Browse files
Merge branch 'QPR-11186' into 'master'
Resolve QPR-11186 Closes QPR-11186 See merge request qs/quantlib!29
2 parents 7beb594 + 6623fbe commit 19630a3

18 files changed

Lines changed: 251 additions & 2705 deletions

.github/workflows/linux-full-tests.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
tag: rolling
9898
cc: gcc
9999
cxx: g++
100-
cxxflags: "-std=c++11"
100+
cxxflags: "-std=c++11 -Wno-cpp"
101101
- name: "C++14 mode"
102102
shortname: c++14
103103
tag: rolling
@@ -164,6 +164,12 @@ jobs:
164164
cc: gcc
165165
cxx: g++
166166
configureflags: --enable-openmp
167+
- name: "Null as function template"
168+
shortname: nullfunctions
169+
tag: rolling
170+
cc: gcc
171+
cxx: g++
172+
configureflags: --enable-null-as-functions
167173
container: ghcr.io/lballabio/quantlib-devenv:${{ matrix.tag }}
168174
steps:
169175
- uses: actions/checkout@v3

.github/workflows/linux-nondefault.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
- name: Build
150150
run: |
151151
./autogen.sh
152-
./configure --disable-static --enable-error-lines --enable-error-functions --enable-tracing --enable-indexed-coupons --enable-extra-safety-checks --enable-sessions --enable-thread-safe-observer-pattern --enable-intraday ${{ matrix.configureflags }} CC="ccache ${{ matrix.cc }}" CXX="ccache ${{ matrix.cxx }}" CXXFLAGS="-O2 -g0 -Wall -Wno-unknown-pragmas -Werror ${{ matrix.cxxflags }}"
152+
./configure --disable-static --enable-error-lines --enable-error-functions --enable-tracing --enable-indexed-coupons --enable-extra-safety-checks --enable-sessions --enable-thread-safe-observer-pattern --enable-intraday --enable-null-as-functions ${{ matrix.configureflags }} CC="ccache ${{ matrix.cc }}" CXX="ccache ${{ matrix.cxx }}" CXXFLAGS="-O2 -g0 -Wall -Wno-unknown-pragmas -Werror ${{ matrix.cxxflags }}"
153153
make -j 2
154154
- name: Run tests
155155
run: |

.github/workflows/linux.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
tag: rolling
100100
cc: gcc
101101
cxx: g++
102-
cxxflags: "-std=c++11"
102+
cxxflags: "-std=c++11 -Wno-cpp"
103103
- name: "C++14 mode"
104104
shortname: c++14
105105
tag: rolling
@@ -180,6 +180,13 @@ jobs:
180180
cxx: g++
181181
configureflags: --enable-parallel-unit-test-runner
182182
moreflags: -lrt
183+
- name: "Null as function template"
184+
shortname: nullfunctions
185+
tag: rolling
186+
cc: gcc
187+
cxx: g++
188+
configureflags: --enable-null-as-functions
189+
tests: true
183190
container: ghcr.io/lballabio/quantlib-devenv:${{ matrix.tag }}
184191
steps:
185192
- uses: actions/checkout@v3

.github/workflows/macos-nondefault.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Build
4444
run: |
4545
./autogen.sh
46-
./configure --disable-shared --enable-error-lines --enable-error-functions --enable-tracing --enable-indexed-coupons --enable-extra-safety-checks --enable-sessions --enable-thread-safe-observer-pattern --enable-intraday ${{ matrix.configureflags }} CC="ccache clang" CXX="ccache clang++" CXXFLAGS="-O2 -g0 -Wall -Werror -stdlib=libc++ -mmacosx-version-min=10.9 ${{ matrix.cxxflags }}" LDFLAGS="-stdlib=libc++ -mmacosx-version-min=10.9"
46+
./configure --disable-shared --enable-error-lines --enable-error-functions --enable-tracing --enable-indexed-coupons --enable-extra-safety-checks --enable-sessions --enable-thread-safe-observer-pattern --enable-intraday --enable-null-as-functions ${{ matrix.configureflags }} CC="ccache clang" CXX="ccache clang++" CXXFLAGS="-O2 -g0 -Wall -Werror -stdlib=libc++ -mmacosx-version-min=10.9 ${{ matrix.cxxflags }}" LDFLAGS="-stdlib=libc++ -mmacosx-version-min=10.9"
4747
make -j 2
4848
- name: Run tests
4949
run: |

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ cmake_policy(SET CMP0091 NEW)
66
# Version info
77
set(QUANTLIB_VERSION_MAJOR 1)
88
set(QUANTLIB_VERSION_MINOR 27)
9-
set(QUANTLIB_VERSION_PATCH 0)
9+
set(QUANTLIB_VERSION_PATCH 1)
1010
set(QUANTLIB_VERSION ${QUANTLIB_VERSION_MAJOR}.${QUANTLIB_VERSION_MINOR}.${QUANTLIB_VERSION_PATCH})
1111

1212
# Project Info
1313
set(PACKAGE_NAME "QuantLib")
1414
set(PACKAGE_VERSION "${QUANTLIB_VERSION}")
15-
set(PACKAGE_VERSION_HEX "0x012700f0")
15+
set(PACKAGE_VERSION_HEX "0x012701f0")
1616
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
1717
set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}")
1818
set(PACKAGE_BUGREPORT "https://github.com/lballabio/QuantLib/issues/")
@@ -52,6 +52,7 @@ option(QL_ERROR_FUNCTIONS "Error messages should include current function inform
5252
option(QL_ERROR_LINES "Error messages should include file and line information" OFF)
5353
option(QL_EXTRA_SAFETY_CHECKS "Extra safety checks should be performed" OFF)
5454
option(QL_HIGH_RESOLUTION_DATE "Enable date resolution down to microseconds" OFF)
55+
option(QL_NULL_AS_FUNCTIONS "Enable the implementation of Null as template functions" OFF)
5556
option(QL_INSTALL_BENCHMARK "Install benchmark" ON)
5657
option(QL_INSTALL_EXAMPLES "Install examples" ON)
5758
option(QL_INSTALL_TEST_SUITE "Install test suite" ON)

CMakePresets.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
"QL_ENABLE_SESSIONS": "ON",
110110
"QL_ENABLE_THREAD_SAFE_OBSERVER_PATTERN": "ON",
111111
"QL_HIGH_RESOLUTION_DATE": "ON",
112+
"QL_NULL_AS_FUNCTIONS": "ON",
112113
"QL_USE_INDEXED_COUPON": "ON",
113114
"QL_USE_STD_CLASSES": "ON"
114115
}
@@ -126,6 +127,7 @@
126127
"QL_ENABLE_SESSIONS": "ON",
127128
"QL_ENABLE_THREAD_SAFE_OBSERVER_PATTERN": "ON",
128129
"QL_HIGH_RESOLUTION_DATE": "ON",
130+
"QL_NULL_AS_FUNCTIONS": "ON",
129131
"QL_USE_INDEXED_COUPON": "ON",
130132
"QL_USE_STD_CLASSES": "ON"
131133
},

0 commit comments

Comments
 (0)