Commit 9023d466 authored by Maarten van Gompel's avatar Maarten van Gompel

New upstream version 0.16

parent c572674a
This diff is collapsed.
26 oct 2017 0.16
[Ko van der Sloot]
* update autoconfig stuff
* added more and enhanced split() functions, including JAVA like variants
* refactoring and cleanup
* improved assertEqual()
4 april 2017 0.15
[Ko van der Sloot]
- small bug fixes:
- added newline in logging
- check on 0 pointer in SocketBasics
- added more safeguards against abuse of CommandLine and StringOps
- added more tests tot runtest
- code refactoring based on static analysis with CPPCHECK
18 oct 2016 0.14
[Ko van der Sloot]
- fixed dependecy on zlib1g-dev in configure
......
This diff is collapsed.
......@@ -51,10 +51,6 @@
/* Define to 1 if you have the `localtime_r' function. */
#undef HAVE_LOCALTIME_R
/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
to 0 otherwise. */
#undef HAVE_MALLOC
/* Define to 1 if you have the `memmove' function. */
#undef HAVE_MEMMOVE
......@@ -127,6 +123,9 @@
/* Define to 1 if `fork' works. */
#undef HAVE_WORKING_FORK
/* Define to 2 if you have boost regular expresions */
#undef HAVE_WORKING_REGEX
/* Define to 1 if `vfork' works. */
#undef HAVE_WORKING_VFORK
......@@ -173,9 +172,6 @@
#undef inline
#endif
/* Define to rpl_malloc if the replacement function should be used. */
#undef malloc
/* Define to `int' if <sys/types.h> does not define. */
#undef pid_t
......
#! /bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2015 Free Software Foundation, Inc.
# Copyright 1992-2016 Free Software Foundation, Inc.
timestamp='2015-08-20'
timestamp='2016-11-04'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -33,7 +33,7 @@ timestamp='2015-08-20'
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
......@@ -53,8 +53,7 @@ timestamp='2015-08-20'
me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
Usage: $0 [OPTION] CPU-MFR-OPSYS
$0 [OPTION] ALIAS
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
Canonicalize a configuration name.
......@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright 1992-2015 Free Software Foundation, Inc.
Copyright 1992-2016 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -118,7 +117,7 @@ case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
kopensolaris*-gnu* | \
kopensolaris*-gnu* | cloudabi*-eabi* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
......@@ -302,6 +301,7 @@ case $basic_machine in
| open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pru \
| pyramid \
| riscv32 | riscv64 \
| rl78 | rx \
......@@ -429,6 +429,7 @@ case $basic_machine in
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pru-* \
| pyramid-* \
| riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
......@@ -521,7 +522,7 @@ case $basic_machine in
basic_machine=i386-pc
os=-aros
;;
asmjs)
asmjs)
basic_machine=asmjs-unknown
;;
aux)
......@@ -644,6 +645,14 @@ case $basic_machine in
basic_machine=m68k-bull
os=-sysv3
;;
e500v[12])
basic_machine=powerpc-unknown
os=$os"spe"
;;
e500v[12]-*)
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
os=$os"spe"
;;
ebmon29k)
basic_machine=a29k-amd
os=-ebmon
......@@ -1023,7 +1032,7 @@ case $basic_machine in
ppc-* | ppcbe-*)
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
ppcle | powerpclittle)
basic_machine=powerpcle-unknown
;;
ppcle-* | powerpclittle-*)
......@@ -1033,7 +1042,7 @@ case $basic_machine in
;;
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
ppc64le | powerpc64little)
basic_machine=powerpc64le-unknown
;;
ppc64le-* | powerpc64little-*)
......@@ -1383,14 +1392,14 @@ case $os in
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
| -bitrig* | -openbsd* | -solidbsd* \
| -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
......@@ -1399,7 +1408,8 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
| -onefs* | -tirtos* | -phoenix* | -fuchsia*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
......@@ -1531,6 +1541,8 @@ case $os in
;;
-nacl*)
;;
-ios)
;;
-none)
;;
*)
......
This diff is collapsed.
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
# $Id$
# $URL $
AC_PREREQ(2.61)
AC_INIT([ticcutils],[0.14],[lamasoftware@science.ru.nl])
AC_INIT([ticcutils],[0.16],[lamasoftware@science.ru.nl])
AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_SRCDIR([.])
AC_CONFIG_MACRO_DIR([m4])
......@@ -35,7 +33,7 @@ if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then
CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
AC_DEFINE(HAVE_OPENMP, 1 , Define to 1 if you have OpenMP )
else
AC_MSG_NOTICE(We don't have OpenMP. Multithreaded operation is disabled)
AC_MSG_NOTICE([We don't have OpenMP. Multithreaded operation is disabled])
fi
#checks for libraries.
......@@ -64,8 +62,8 @@ AX_TYPE_SOCKLEN_T
# Checks for library functions.
AC_CHECK_FUNCS([localtime_r gettimeofday mkdir getaddrinfo gethostbyaddr gethostbyname inet_ntoa memset socket strerror dup2 memmove ])
AC_FUNC_MALLOC
AC_FUNC_FORK
# AC_FUNC_MALLOC seems to drive clang nuts
AX_PTHREAD([],[AC_MSG_ERROR([We need pthread support!])])
......@@ -74,19 +72,37 @@ if test x"$ax_pthread_ok" = xyes; then
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
fi
AX_BOOST_BASE([1.50],
[AX_BOOST_REGEX
LIBS="$LIBS $BOOST_REGEX_LIB"],
[AC_MSG_NOTICE([No Boost support]) ])
# only require boost for OLD gcc compilers AND als stdlib++
# for now we HAV to stick to boost regex :{
# AX_COMPILER_VENDOR
# if test x"$ax_cv_cxx_compiler_vendor" = xgnu; then
# AX_COMPILER_VERSION
# AX_COMPARE_VERSION( [$ax_cv_cxx_compiler_version], [lt], [4.9],
# [AX_BOOST_BASE( [1.50],
# [AX_BOOST_REGEX
# LIBS="$LIBS $BOOST_REGEX_LIB"
# AC_DEFINE(HAVE_WORKING_REGEX, 2 , Define to 2 if you have boost regular expresions )],
# [AC_MSG_ERROR([No Regular expression support available. Please install libboost-regex-dev, or update gcc])])],
# AC_DEFINE(HAVE_WORKING_REGEX, 1 , Define to 1 if you have working native C++ regular expresions ) )
# else
# AC_DEFINE(HAVE_WORKING_REGEX, 1 , Define to 1 if you have native C++ regular expresions)
# fi
AX_BOOST_BASE( [1.50],
[AX_BOOST_REGEX
LIBS="$LIBS $BOOST_REGEX_LIB"
AC_DEFINE(HAVE_WORKING_REGEX, 2 , Define to 2 if you have boost regular expresions )],
[AC_MSG_ERROR([No Regular expression support available. Please install libboost-regex-dev])])
PKG_PROG_PKG_CONFIG
# ugly hack when PKG_CONFIG_PATH isn't defined.
# couldn't get it to work otherwise
if test "x$PKG_CONFIG_PATH" = x; then
export PKG_CONFIG_PATH=""
export PKG_CONFIG_PATH="$prefix/lib/pkgconfig"
else
export PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
fi
PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES([XML2], [libxml-2.0 >= 2.6.16] )
CXXFLAGS="$CXXFLAGS $XML2_CFLAGS"
LIBS="$LIBS $XML2_LIBS"
......
# $Id: Makefile.am 8191 2011-02-02 14:50:37Z sloot $
# $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/Makefile.am $
AUTOMAKE_OPTIONS = foreign
AUTOMAKE_OPTIONS = foreign
SUBDIRS = ticcutils
......@@ -13,9 +13,6 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
# $Id: Makefile.am 8191 2011-02-02 14:50:37Z sloot $
# $URL: https://ilk.uvt.nl/svn/trunk/sources/Timbl6/include/Makefile.am $
VPATH = @srcdir@
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
......@@ -325,7 +322,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
AUTOMAKE_OPTIONS = foreign
SUBDIRS = ticcutils
all: all-recursive
......
/*
Copyright (c) 2006 - 2016
Copyright (c) 2006 - 2017
CLST - Radboud University
ILK - Tilburg University
......@@ -37,7 +37,7 @@ namespace TiCC {
class OptionError: public std::runtime_error {
public:
OptionError( const std::string& s ): std::runtime_error( "option-error: " + s ){};
explicit OptionError( const std::string& s ): std::runtime_error( "option-error: " + s ){};
};
class CL_item {
......@@ -46,7 +46,7 @@ namespace TiCC {
CL_item( const std::string& s, const std::string& o ):
opt_word(s), option( o ), mood( false ), longOpt(true) {};
CL_item( char c, const std::string& o, bool m=false ):
option( o ), mood( m ), longOpt(false){ opt_word = c; };
opt_word(1,c),option( o ), mood( m ), longOpt(false){};
CL_item( const CL_item& in ):
opt_word( in.opt_word ), option(in.option),
mood(in.mood), longOpt(in.longOpt){
......
/*
Copyright (c) 2006 - 2016
Copyright (c) 2006 - 2017
CLST - Radboud University
ILK - Tilburg University
......@@ -60,6 +60,7 @@ namespace TiCC {
private:
sssMap myMap;
std::string cdir; // not used. left here for binary compatibility
bool get_att_val( const std::string&, const std::string& );
};
inline std::ostream& operator<<( std::ostream& os, const Configuration& c ){
......
/*
Copyright (c) 2006 - 2016
Copyright (c) 2006 - 2017
CLST - Radboud University
ILK - Tilburg University
......@@ -32,7 +32,7 @@
class fdoutbuf: public std::streambuf {
public:
fdoutbuf( int _fd );
explicit fdoutbuf( int _fd );
fdoutbuf();
bool connect( int );
protected:
......@@ -45,7 +45,7 @@ class fdostream: public std::ostream {
protected:
fdoutbuf buf;
public:
fdostream( int fd ): std::ostream(&buf), buf(fd) {};
explicit fdostream( int fd ): std::ostream(&buf), buf(fd) {};
fdostream(): std::ostream(&buf) {};
bool open( int fd );
};
......@@ -53,7 +53,7 @@ class fdostream: public std::ostream {
class fdinbuf: public std::streambuf {
public:
fdinbuf();
fdinbuf( int);
explicit fdinbuf( int);
bool connect( int );
protected:
virtual int underflow();
......@@ -67,7 +67,7 @@ class fdistream: public std::istream {
protected:
fdinbuf buf;
public:
fdistream( int fd ): std::istream(&buf), buf(fd) {};
explicit fdistream( int fd ): std::istream(&buf), buf(fd) {};
fdistream(): std::istream(&buf) {};
bool open( int fd );
};
......
/*
Copyright (c) 2006 - 2016
Copyright (c) 2006 - 2017
CLST - Radboud University
ILK - Tilburg University
......@@ -34,7 +34,7 @@ namespace TiCC {
std::vector<std::string> searchFilesExt( const std::string&,
const std::string&,
bool = true );
std::vector<std::string> searchFiles( const std::string& name,
inline std::vector<std::string> searchFiles( const std::string& name,
bool recurse = true ){
return searchFilesExt( name, "", recurse );
}
......
/*
Copyright (c) 2006 - 2016
Copyright (c) 2006 - 2017
CLST - Radboud University
ILK - Tilburg University
......
/*
Copyright (c) 2006 - 2016
Copyright (c) 2006 - 2017
CLST - Radboud University
ILK - Tilburg University
......@@ -71,8 +71,8 @@ namespace TiCC {
friend bool IsActive( LogStream & );
friend bool IsActive( LogStream * );
public:
LogStream();
LogStream( int );
explicit LogStream();
explicit LogStream( int );
LogStream( const std::string&, LogFlag = StampBoth );
LogStream( std::ostream&, const std::string& = "",
LogFlag = StampBoth );
......@@ -107,8 +107,8 @@ namespace TiCC {
class Log{
public:
Log( LogStream * );
Log( LogStream& l );
explicit Log( LogStream * );
explicit Log( LogStream& l );
~Log();
LogStream& operator *();
private:
......@@ -120,8 +120,8 @@ namespace TiCC {
class Dbg{
public:
Dbg( LogStream * );
Dbg( LogStream& l );
explicit Dbg( LogStream * );
explicit Dbg( LogStream& l );
~Dbg();
LogStream& operator *();
private:
......@@ -133,8 +133,8 @@ namespace TiCC {
class xDbg{
public:
xDbg( LogStream * );
xDbg( LogStream& l );
explicit xDbg( LogStream * );
explicit xDbg( LogStream& l );
~xDbg();
LogStream& operator *();
private:
......@@ -146,8 +146,8 @@ namespace TiCC {
class xxDbg{
public:
xxDbg( LogStream * );
xxDbg( LogStream& l );
explicit xxDbg( LogStream * );
explicit xxDbg( LogStream& l );
~xxDbg();
LogStream& operator *();
private:
......
# $Id$
# $URL$
pkginclude_HEADERS = LogBuffer.h LogStream.h PrettyPrint.h XMLtools.h \
StringOps.h UnitTest.h Trie.h TreeHash.h Configuration.h Timer.h \
bz2stream.h gzstream.h zipper.h Tar.h Version.h FileUtils.h \
......
......@@ -14,9 +14,6 @@
@SET_MAKE@
# $Id$
# $URL$
VPATH = @srcdir@
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
......
/*
Copyright (c) 2006 - 2016
Copyright (c) 2006 - 2017
CLST - Radboud University
ILK - Tilburg University
......
/*
Copyright (c) 2006 - 2016
Copyright (c) 2006 - 2017
CLST - Radboud University
ILK - Tilburg University
......@@ -50,7 +50,7 @@ namespace TimblServer {
static std::string VersionInfo( bool );
static int daemonize( int , int );
int maxConn() const { return _maxConn; };
ServerBase( const TiCC::Configuration * );
explicit ServerBase( const TiCC::Configuration * );
void setDebug( bool d ){ debug = d; };
Sockets::ServerSocket *TcpSocket() const { return tcp_socket; };
static void *callChild( void * );
......@@ -98,14 +98,14 @@ namespace TimblServer {
class TcpServerBase : public ServerBase {
public:
TcpServerBase( const TiCC::Configuration *c ):ServerBase( c ){};
explicit TcpServerBase( const TiCC::Configuration *c ):ServerBase( c ){};
};
class HttpServerBase : public ServerBase {
public:
void socketChild( childArgs * );
virtual void sendReject( std::ostream& os ) const;
HttpServerBase( const TiCC::Configuration *c ): ServerBase( c ){};
explicit HttpServerBase( const TiCC::Configuration *c ): ServerBase( c ){};
};
std::string Version();
......
/*
Copyright (c) 2006 - 2016
Copyright (c) 2006 - 2017
CLST - Radboud University
ILK - Tilburg University
......
/*
Copyright (c) 2006 - 2016
Copyright (c) 2006 - 2017
CLST - Radboud University
ILK - Tilburg University
......@@ -55,10 +55,21 @@ namespace TiCC {
return split_at_first_of( s, vec, " \r\t\n", exact );
}
std::vector<std::string> split_at( const std::string&,
const std::string&,
size_t = 0 );
std::vector<std::string> split_at_first_of( const std::string&,
const std::string&,
size_t = 0 );
inline std::vector<std::string> split( const std::string& s,
size_t num = 0 ){
return split_at_first_of( s, " \r\t\n", num );
}
std::string format_nonascii( const std::string& );
template< typename T >
T stringTo( const std::string& str ) {
inline T stringTo( const std::string& str ) {
T result;
std::stringstream dummy ( str );
if ( !( dummy >> result ) ) {
......@@ -81,7 +92,7 @@ namespace TiCC {
}
template< typename T >
bool stringTo( const std::string& str, T& result ) {
inline bool stringTo( const std::string& str, T& result ) {
try {
result = stringTo<T>( str );
return true;
......@@ -92,7 +103,7 @@ namespace TiCC {
}
template <typename T>
bool stringTo( const std::string& s, T &answer, T low, T upp ){
inline bool stringTo( const std::string& s, T &answer, T low, T upp ){
try {
T tmp = stringTo<T>( s );
if ( (tmp >= low) && (tmp <= upp) ){
......@@ -107,7 +118,7 @@ namespace TiCC {
}
template< typename T >
std::string toString ( const T& obj, bool=false ) {
inline std::string toString ( const T& obj, bool=false ) {
std::stringstream dummy;
if ( !( dummy << obj ) ) {
throw( std::runtime_error( "conversion failed" ) );
......
/*
Copyright (c) 2006 - 2016
Copyright (c) 2006 - 2017
CLST - Radboud University
ILK - Tilburg University
......@@ -29,8 +29,6 @@
#ifdef HAVE_LIBTAR_H
#include "libtar.h"
#else
#define TAR int
#endif
#include <fstream>
#include <vector>
......@@ -50,7 +48,9 @@ namespace TiCC {
bool extract_ifstream( const std::string&, std::ifstream& );
bool close();
private:
#ifdef HAVE_LIBTAR_H
TAR *tar_file;
#endif
std::string tarname;
tar( const tar& ); // no copies
tar& operator=( const tar& ); // no copies
......
/*
Copyright (c) 2006 - 2016
Copyright (c) 2006 - 2017
CLST - Radboud University
ILK - Tilburg University
......
/*
Copyright (c) 2006 - 2016
Copyright (c) 2006 - 2017
CLST - Radboud University
ILK - Tilburg University
......
/*
Copyright (c) 2006 - 2016
Copyright (c) 2006 - 2017
CLST - Radboud University
ILK - Tilburg University
......@@ -42,7 +42,7 @@ namespace Tries {
friend std::ostream& operator<< LTGT ( std::ostream&,
const TrieNode<Info> * );
public:
TrieNode( char );
explicit TrieNode( char );
~TrieNode();
Info *add_to_tree( Info *, const std::string& );
Info *scan_tree( const std::string& ) const;
......
/*
Copyright (c) 2006 - 2016
Copyright (c) 2006 - 2017
CLST - Radboud University
ILK - Tilburg University
......@@ -111,7 +111,19 @@ void MyTSerie::stop( const std::string& fun, int ){
};
}
#define assertEqual( XX , YY ) test_eq<decltype(XX), decltype(YY)>( __func__, __LINE__, (XX), (YY), currentTestContext )
#define assertEqual( XX , YY ) \
try { \
test_eq<decltype(XX), decltype(YY)>( __func__, __LINE__, (XX), (YY), currentTestContext ); \
} \
catch ( const std::exception& e ){ \
++currentTestContext._fails; \
if ( currentTestContext.isDefault() ) \
std::cout << FAIL << std::endl; \
else \
std::cerr << "\t"; \
std::cerr << __func__ << "(" << __LINE__ << ") : caucht exception, what='" << e.what() << "'" << std::endl; \
}
#define assertThrow( XX, EE ) \
do { \
++currentTestContext._tests; \
......@@ -173,19 +185,19 @@ void MyTSerie::stop( const std::string& fun, int ){
#define assertFalse( YY ) \
try { \
test_false( __func__, __LINE__, (YY), currentTestContext ); \
test_false( __func__, __LINE__, (YY), currentTestContext ); \
} \
catch( const std::exception& e ){ \
std::cerr << __func__ << "(" << __LINE__ << ") error:'" << e.what() << "'" << std::endl; \
}
#define assertMessage( MM, YY ) \
try { \
test_true_message( __func__, __LINE__, (MM), (YY), currentTestContext ); \
} \
catch( const std::exception& e ){ \
std::cerr << __func__ << "(" << __LINE__ << ") error: '" << e.what() << "'" << std::endl; \
}
try { \
test_true_message( __func__, __LINE__, (MM), (YY), currentTestContext ); \
} \
catch( const std::exception& e ){ \
std::cerr << __func__ << "(" << __LINE__ << ") error: '" << e.what() << "'" << std::endl; \
}
#define startTestSerie( SS ) MyTSerie currentTestContext( __func__, __LINE__, (SS) )
......
/*
Copyright (c) 2006 - 2016
Copyright (c) 2006 - 2017
CLST - Radboud University
ILK - Tilburg University
......
/*
Copyright (c) 2006 - 2016
Copyright (c) 2006 - 2017
CLST - Radboud University
ILK - Tilburg University
......@@ -142,7 +142,7 @@ namespace TiCC {
class XmlDoc {
friend std::ostream& operator << ( std::ostream& , const XmlDoc& );
public:
XmlDoc( const std::string& );
explicit XmlDoc( const std::string& );
~XmlDoc(){
xmlFreeDoc( the_doc );
}
......
......@@ -21,7 +21,7 @@
// Revision : $Revision: 16571 $
// Revision_date : $Date: 2013-10-09 10:33:53 +0200 (Wed, 09 Oct 2013) $
// Author(s) : Deepak Bandyopadhyay, Lutz Kettner
//
// Modernized : Ko vd Sloot (12-01-2017)
// Standard streambuf implementation following Nicolai Josuttis, "The
// Standard C++ Library".
// ============================================================================
......@@ -66,7 +66,7 @@ namespace GZSTREAM_NAMESPACE {
// ASSERT: both input & output capabilities will not be used together
}
int is_open() { return opened; }
gzstreambuf* open( const char* name, int open_mode);
gzstreambuf* open( const std::string &name, int open_mode );
gzstreambuf* close();
~gzstreambuf() { close(); }
......@@ -80,9 +80,9 @@ namespace GZSTREAM_NAMESPACE {
gzstreambuf buf;
public:
gzstreambase() { init(&buf); }
gzstreambase( const char* name, int open_mode);
gzstreambase( const std::string&, int );
~gzstreambase();
void open( const char* name, int open_mode);
void open( const std::string&, int );
void close();
gzstreambuf* rdbuf() { return &buf; }