Skip to content

Commit 9bfbefe

Browse files
authored
Merge pull request #3075 from ERGO-Code/pr-3072-
Pr 3072 with latest in
2 parents 5d33d27 + 1c67683 commit 9bfbefe

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ cc_library(
8888
copts = select({
8989
"@rules_cc//cc/compiler:msvc-cl": [],
9090
"//conditions:default": [
91+
"-fexceptions",
9192
"-Wno-unused-variable",
9293
"-Wno-unused-but-set-variable",
9394
],
@@ -240,6 +241,7 @@ TEST_NAMES = [
240241
copts = ["-Iextern"] + select({
241242
"@rules_cc//cc/compiler:msvc-cl": [],
242243
"//conditions:default": [
244+
"-fexceptions",
243245
"-Wno-unused-variable",
244246
"-Wno-unused-but-set-variable",
245247
],

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ You can raise an [issue](https://github.com/ERGO-Code/HiGHS/issues) with HiGHS i
2222

2323
HiGHS is open source for distribution rather than contribution. This applies particularly to the core C++ code of the solvers. However, there is definitely scope for external contribution to interfaces and documentation. If you want to contribute in this way, please open an issue before making a pull request, since pull requests to the HiGHS solvers will not normally be accepted.
2424

25-
Please note that any pull requests to HiGHS must be made to the `latest` branch, so that full testing can take place befor updating `master`. This ensures that `master` is always good to be downloaded by users.
25+
Please note that any pull requests to HiGHS must be made to the `latest` branch, so that full testing can take place befor updating `master`. This ensures that `master` is always good to be downloaded by users. As a consequence, any changes should be developed as a branch of `latest` to reduce the chance of merge conflicts.
2626

2727
Note that, under the terms of the MIT license, by contributing to HiGHS you assign away your rights to the content of your contribution.
2828

0 commit comments

Comments
 (0)