Skip to content

Commit 9d7b8a0

Browse files
committed
Removed bool test for IntSet
1 parent f51bced commit 9d7b8a0

File tree

3 files changed

+24
-1
lines changed

3 files changed

+24
-1
lines changed

changelog.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,15 @@ Date: ?-?-?
6868
[DESCRIPTION]
6969
New stuff!
7070

71+
[ENTRY]
72+
Module: int
73+
What: removed
74+
Rank: minor
75+
[DESCRIPTION]
76+
The bool test operator has been removed from IntSet (it created
77+
problems and is actually useless for IntSet as they are always
78+
initialized).
79+
7180
[ENTRY]
7281
Module: other
7382
What: new

configure

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,7 @@ infodir
763763
docdir
764764
oldincludedir
765765
includedir
766+
runstatedir
766767
localstatedir
767768
sharedstatedir
768769
sysconfdir
@@ -881,6 +882,7 @@ datadir='${datarootdir}'
881882
sysconfdir='${prefix}/etc'
882883
sharedstatedir='${prefix}/com'
883884
localstatedir='${prefix}/var'
885+
runstatedir='${localstatedir}/run'
884886
includedir='${prefix}/include'
885887
oldincludedir='/usr/include'
886888
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1133,6 +1135,15 @@ do
11331135
| -silent | --silent | --silen | --sile | --sil)
11341136
silent=yes ;;
11351137

1138+
-runstatedir | --runstatedir | --runstatedi | --runstated \
1139+
| --runstate | --runstat | --runsta | --runst | --runs \
1140+
| --run | --ru | --r)
1141+
ac_prev=runstatedir ;;
1142+
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1143+
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1144+
| --run=* | --ru=* | --r=*)
1145+
runstatedir=$ac_optarg ;;
1146+
11361147
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
11371148
ac_prev=sbindir ;;
11381149
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1270,7 +1281,7 @@ fi
12701281
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
12711282
datadir sysconfdir sharedstatedir localstatedir includedir \
12721283
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1273-
libdir localedir mandir
1284+
libdir localedir mandir runstatedir
12741285
do
12751286
eval ac_val=\$$ac_var
12761287
# Remove trailing slashes.
@@ -1423,6 +1434,7 @@ Fine tuning of the installation directories:
14231434
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
14241435
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
14251436
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
1437+
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
14261438
--libdir=DIR object code libraries [EPREFIX/lib]
14271439
--includedir=DIR C header files [PREFIX/include]
14281440
--oldincludedir=DIR C header files for non-gcc [/usr/include]

gecode/int.hh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ namespace Gecode {
208208
/// Initialize with \a n ranges from array \a r
209209
GECODE_INT_EXPORT void init(const int r[][2], int n);
210210
public:
211+
/// Remove initialization test
212+
operator bool(void) const = delete;
211213
/// \name Constructors and initialization
212214
//@{
213215
/// Initialize as empty set

0 commit comments

Comments
 (0)