Skip to content

Commit abe6b02

Browse files
committed
build: resolve FTBFS when GLIBCXX_DEBUG is set
exch/ews/structures.cpp: In member function 'const TAGGED_PROPVAL* gromox::EWS::Structures::sShape::writes(uint32_t) const': exch/ews/structures.cpp:897:34: error: operands to '?:' have different types '__gnu_cxx::__normal_iterator<const TAGGED_PROPVAL*, std::__cxx1998::vector<TAGGED_PROPVAL, std::allocator<TAGGED_PROPVAL>>>' and 'std::nullptr_t'
1 parent 1925901 commit abe6b02

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ jobs:
3535
- name: buildall
3636
run: |
3737
set -e
38-
pushd vmime && cmake . -DVMIME_SENDMAIL_PATH:STRING="/usr/sbin/sendmail" -DVMIME_BUILD_SAMPLES:BOOL=OFF -DVMIME_HAVE_TLS_SUPPORT:BOOL=ON -DVMIME_BUILD_STATIC_LIBRARY:BOOL=OFF && make "-j$(nproc)" && sudo make install && popd
39-
pushd libHX && ./qconf && make "-j$(nproc)" && sudo make install && popd
38+
cd vmime && cmake . -DVMIME_SENDMAIL_PATH:STRING="/usr/sbin/sendmail" -DVMIME_BUILD_SAMPLES:BOOL=OFF -DVMIME_HAVE_TLS_SUPPORT:BOOL=ON -DVMIME_BUILD_STATIC_LIBRARY:BOOL=OFF && make "-j$(nproc)" && sudo make install && cd -
39+
cd libHX && ./qconf && make "-j$(nproc)" && sudo make install && cd -
4040
./qconf
4141
LD_LIBRARY_PATH=/usr/local/lib make "-j$(nproc)"
4242
LD_LIBRARY_PATH=/usr/local/lib make install DESTDIR="$PWD/rt" && rm -Rf rt
4343
make clean
44-
LD_LIBRARY_PATH=/usr/local/lib make "-j$(nproc)" CPPFLAGS=-DCOMPILE_DIAG
44+
LD_LIBRARY_PATH=/usr/local/lib make "-j$(nproc)" CPPFLAGS="-DCOMPILE_DIAG -D_GLIBCXX_DEBUG"
4545
make distclean

exch/ews/structures.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,7 @@ TPROPVAL_ARRAY sShape::write() const
921921
const TAGGED_PROPVAL* sShape::writes(uint32_t tag) const
922922
{
923923
auto it = std::find_if(wProps.begin(), wProps.end(), [=](const TAGGED_PROPVAL& tp){return tp.proptag == tag;});
924-
return it != wProps.end() ? it.base() : nullptr;
924+
return it != wProps.end() ? &*it : nullptr;
925925
}
926926

927927
/**

0 commit comments

Comments
 (0)