diff --git a/ChangeLog b/ChangeLog index 15129e1..145461d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,9 +26,9 @@ - Checked with valgrind and repaired defects: - Mismatching delete in StackTrace * Tue Jun 12 2007 Marc Waeckerlin - mrw-c++-3.1.1 (mrw) - - Don't catch abort() in autostacktraceXXX.cpp + - Don't catch abort() in autostacktraceXXX.cxx * Thu May 31 2007 Marc Waeckerlin - mrw-c++-3.1.0 (mrw) - - Bug in string.hpp join: Only join with list of strings was possible. + - Bug in string.hxx join: Only join with list of strings was possible. * Fri May 25 2007 Marc Waeckerlin - mrw-c++-3.0.0 (mrw) - Function- and method-trace have been renamed from FUNCTION and METHOD to MRW_FUNCTION and MRW_METHOD due to naming conflicts with @@ -125,7 +125,7 @@ - new feature: tokenizer * Thu Dec 16 2004 Marc Waeckerlin - mrw-c++-1.3.1 (mrw) - regular expressions can now evaluate and return sub matches - - bugfix: many inline forgotten in string.hpp + - bugfix: many inline forgotten in string.hxx * Mon Dec 13 2004 Marc Waeckerlin - mrw-c++-1.3.0 (mrw) - added the possibility to pass values to stdin in mrw::Exec - and the possibility to connect to stdin in mrw::Pipe @@ -136,11 +136,11 @@ * Wed Nov 11 2004 Marc Waeckerlin - mrw-c++-1.2.2 (mrw) - correction in documentation: need [0]->toString() not .toString() * Wed Oct 13 2004 Marc Waeckerlin - mrw-c++-1.2.1 (mrw) - - no newline at the end of stacktrace in autostacktracestderr.cpp - - test for bad exception specification in exec_test.cpp + - no newline at the end of stacktrace in autostacktracestderr.cxx + - test for bad exception specification in exec_test.cxx - no more need for ldd in StackTrace, read from /proc/self/maps - check whether shared libraries are evaluated in - stacktrace_test.cpp + stacktrace_test.cxx - new feature in stdext: getline reads a whole line from a stream * Mon Oct 11 2004 Marc Waeckerlin - mrw-c++-1.2.0 (mrw) - StackTrace now can load shared libraries! @@ -161,9 +161,9 @@ * Tue Aug 31 2004 Marc Waeckerlin - mrw-c++-0.93 (mrw) - test failed on Solaris (without stack trace) -> no -lbfd for --disable-stacktrace! - -> no include of stacktrace.hpp in args.hpp! + -> no include of stacktrace.hxx in args.hxx! * Wed Aug 25 2004 Marc Waeckerlin - mrw-c++-0.92 (mrw) - - new file: version.cpp + - new file: version.cxx - new file header for all sources - work around warning in mrw::auto - possibility to compile without log4cxx @@ -174,19 +174,19 @@ - small corrections in Auto<>::Free and a new test for it - possibility to compile without stack trace * Wed May 28 2004 Marc Waeckerlin - mrw-c++-0.92 (mrw) - - no more mrw:: exceptions in header files, all moved to .cpp + - no more mrw:: exceptions in header files, all moved to .cxx - make distclean now clean everything that was generated - - smartpointer_test.cpp was missing in CVS + - smartpointer_test.cxx was missing in CVS - new makefile targets tag and release * Wed May 19 2004 Marc Waeckerlin - mrw-c++-0.92 (mrw) - - no more auto.cpp + - no more auto.cxx * Tue May 18 2004 Marc Waeckerlin - mrw-c++-0.92 (mrw) - correct bfd detection on solaris - templated auto classes - - forgotten to install in 0.91: header arg.hpp and smartpointer.hpp + - forgotten to install in 0.91: header arg.hxx and smartpointer.hxx * Tue Apr 27 2004 Marc Waeckerlin - mrw-c++-0.91 (mrw) - - mrw/arg.hpp: Command line argument evaluation - - mrw/smartpointer.hpp: Smart pointer implementation + - mrw/arg.hxx: Command line argument evaluation + - mrw/smartpointer.hxx: Smart pointer implementation - configure: Correction for Solaris * Fri Apr 24 2004 Marc Waeckerlin - mrw-c++-0.90 (mrw) - initial rpm with two spec files diff --git a/configure.in b/configure.in index 28b91e2..a39b0a9 100644 --- a/configure.in +++ b/configure.in @@ -164,7 +164,7 @@ if test "$have_stacktrace" = "yes"; then [AC_MSG_WARN([Header "demangle.h" from the binutils not found! - unfortunately, the bintils do not install this header (even though they should) - - the required symbols are now declared in stacktrace.cpp according to my + - the required symbols are now declared in stacktrace.cxx according to my own binutils version (binutils-2.16.1) it may or may not be compatible to yours])]) AC_SEARCH_LIBS(cplus_demangle, [demangle iberty], @@ -211,7 +211,7 @@ AC_ARG_ENABLE(pedantic, [have_pedantic="$enableval"; test "$enableval" = "yes" && \ AM_CXXFLAGS="${AM_CXXFLAGS:-} -pedantic-errors -Wall -W -Wfloat-equal -Wundef -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Wmissing-format-attribute -Wno-multichar -Wpacked -Wredundant-decls -Werror -Wshadow -Wcast-qual -Wno-ctor-dtor-privacy"]) dnl problem in libs: -Wshadow -Wcast-qual -dnl auto.hpp: -Wno-ctor-dtor-privacy (removed) +dnl auto.hxx: -Wno-ctor-dtor-privacy (removed) AM_CONDITIONAL(PEDANTIC, test "$enableval" = "yes") AC_ARG_ENABLE(dot, [AS_HELP_STRING([--disable-dot], diff --git a/doc/doxyfile b/doc/doxyfile index 302b279..87a0979 100644 --- a/doc/doxyfile +++ b/doc/doxyfile @@ -611,7 +611,7 @@ WARN_LOGFILE = doxygen.errors #--------------------------------------------------------------------------- # The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or +# documented source files. You may enter file names like "myfile.cxx" or # directories like "/usr/src/myproject". Separate the files or directories # with spaces. @@ -626,11 +626,11 @@ INPUT = ./../src INPUT_ENCODING = UTF-8 # If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cxx # and *.h) to filter out the source-files in the directories. If left # blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh -# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py +# *.c *.cc *.cxx *.cxx *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh +# *.hxx *.hxx *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py # *.f90 *.f *.for *.vhd *.vhdl FILE_PATTERNS = *.[ch]xx \ @@ -679,7 +679,7 @@ EXCLUDE_SYMBOLS = EXAMPLE_PATH = . # If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cxx # and *.h) to filter out the source-files in the directories. If left # blank all files are included. @@ -714,7 +714,7 @@ INPUT_FILTER = # Doxygen will compare the file name with each pattern and apply the # filter if there is a match. # The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# pattern=filter (like *.cxx=my_cpp_filter). See INPUT_FILTER for further # info on how filters are used. If FILTER_PATTERNS is empty or if # non of the patterns match the file name, INPUT_FILTER is applied. @@ -1441,7 +1441,7 @@ SEARCH_INCLUDES = YES INCLUDE_PATH = # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the +# patterns (like *.h and *.hxx) to filter out the header-files in the # directories. If left blank, the patterns specified with FILE_PATTERNS will # be used. diff --git a/doc/doxyfile.in b/doc/doxyfile.in index 0a7821b..63f0615 100644 --- a/doc/doxyfile.in +++ b/doc/doxyfile.in @@ -611,7 +611,7 @@ WARN_LOGFILE = doxygen.errors #--------------------------------------------------------------------------- # The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or +# documented source files. You may enter file names like "myfile.cxx" or # directories like "/usr/src/myproject". Separate the files or directories # with spaces. @@ -626,11 +626,11 @@ INPUT = @SRCDIR@/../src INPUT_ENCODING = UTF-8 # If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cxx # and *.h) to filter out the source-files in the directories. If left # blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh -# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py +# *.c *.cc *.cxx *.cxx *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh +# *.hxx *.hxx *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py # *.f90 *.f *.for *.vhd *.vhdl FILE_PATTERNS = *.[ch]xx \ @@ -679,7 +679,7 @@ EXCLUDE_SYMBOLS = EXAMPLE_PATH = . # If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cxx # and *.h) to filter out the source-files in the directories. If left # blank all files are included. @@ -714,7 +714,7 @@ INPUT_FILTER = # Doxygen will compare the file name with each pattern and apply the # filter if there is a match. # The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# pattern=filter (like *.cxx=my_cpp_filter). See INPUT_FILTER for further # info on how filters are used. If FILTER_PATTERNS is empty or if # non of the patterns match the file name, INPUT_FILTER is applied. @@ -1441,7 +1441,7 @@ SEARCH_INCLUDES = YES INCLUDE_PATH = # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the +# patterns (like *.h and *.hxx) to filter out the header-files in the # directories. If left blank, the patterns specified with FILE_PATTERNS will # be used. diff --git a/doc/examples/exceptionhandling.cpp b/doc/examples/exceptionhandling.cpp index 5407f34..460839d 100644 --- a/doc/examples/exceptionhandling.cpp +++ b/doc/examples/exceptionhandling.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include diff --git a/doc/examples/smartpointer.cpp b/doc/examples/smartpointer.cpp index e6bc1e2..e5e7018 100644 --- a/doc/examples/smartpointer.cpp +++ b/doc/examples/smartpointer.cpp @@ -1,4 +1,4 @@ -#include +#include class A { public: int a; diff --git a/src/mrw/arg.cpp b/src/mrw/arg.cpp index de8447f..106277a 100644 --- a/src/mrw/arg.cpp +++ b/src/mrw/arg.cpp @@ -17,7 +17,7 @@ Revision 1.1 2004/08/28 16:13:42 marc mrw-c++-0.92 (mrw) - - new file: version.cpp + - new file: version.cxx - new file header for all sources - work around warning in mrw::auto - possibility to compile without log4cxx @@ -29,8 +29,8 @@ - possibility to compile without stack trace */ -#include -#include +#include +#include namespace mrw { diff --git a/src/mrw/arg.hpp b/src/mrw/arg.hpp index 91223d2..3f41f92 100644 --- a/src/mrw/arg.hpp +++ b/src/mrw/arg.hpp @@ -22,11 +22,11 @@ bugs in documentation Revision 1.3 2004/08/31 16:23:29 marc - no include of stacktrace.hpp + no include of stacktrace.hxx Revision 1.2 2004/08/28 16:21:25 marc mrw-c++-0.92 (mrw) - - new file: version.cpp + - new file: version.cxx - new file header for all sources - work around warning in mrw::auto - possibility to compile without log4cxx @@ -38,7 +38,7 @@ - possibility to compile without stack trace */ -#include +#include #include // exit #include #include @@ -133,7 +133,7 @@ namespace mrw { /** @brief List of additional (mandatory) parameter to one command line argument. - @pre \#include + @pre \#include A new mandatory parameter is added to the list of parameter, by shifting the default value into the instance of @c @@ -210,7 +210,7 @@ namespace mrw { public: /** @brief Abstract base class to represent one single parameter value. - @pre \#include + @pre \#include */ class Value { @@ -375,7 +375,7 @@ namespace mrw { }; /** @brief this class represents one command line option - @pre \#include + @pre \#include The library user needs this class when setting up the list of supported command line ooptions: Simply shift one instance of @c @@ -472,7 +472,7 @@ namespace mrw { }; /** @brief handle command line arguments - @pre \#include + @pre \#include This class handles command line arguments. It is a singleton. Get the one and only instance of this class with @c diff --git a/src/mrw/auto.hpp b/src/mrw/auto.hpp index 3242a3a..12dfb9f 100644 --- a/src/mrw/auto.hpp +++ b/src/mrw/auto.hpp @@ -65,7 +65,7 @@ namespace mrw { //@{ /** @brief Automatically frees a resource when destructed. - @pre \#include + @pre \#include AutoResource works exactly like std::auto_ptr, but for any resource instead of new allocated pointers. Whenever the context @@ -170,7 +170,7 @@ namespace mrw { }; /** @brief Automatically deletes a pointer when destructed. - @pre \#include + @pre \#include mrw::AutoPtr is a replacement for std::auto_ptr. The problem with standard std::auto_ptr is, that it cannot be stored in a std::map. @@ -257,7 +257,7 @@ namespace mrw { }; /** @brief Automatically deletes an array pointer when destructed. - @pre \#include + @pre \#include mrw::AutoPtrAry is a replacement for std::auto_ptr. Other than mrw::AutoPtr it is for arrays, that means, it calls @c delete[] @@ -347,7 +347,7 @@ namespace mrw { }; /** @brief Automatically closes a file when destructed. - @pre \#include + @pre \#include AutoFile works exactly like std::auto_ptr, but for files instead of pointers. Whenever the context of AutoFile is left, @@ -384,7 +384,7 @@ namespace mrw { ::munmap((char*)res.first, res.second); // char* conversion for windoze cygwin compatibility } /** @brief Automatically calls @c munmap on destruction for mmaped files. - @pre \#include + @pre \#include It's the same as std::auto_ptr, but for @c mmap instead of @c new. When the context of @c AutoMapper is left, @c munmap is @@ -394,7 +394,7 @@ namespace mrw { AutoMapper; /** @brief Automatically calls @c bfd_close for @c bfd*. - @pre \#include + @pre \#include It acts like a @c std::auto_ptr, but for @c bfd*, that means it calls @c bfd_close whenever the context is left. @@ -403,7 +403,7 @@ namespace mrw { /** @brief Automatically calls @c free for @c malloc allocated memory. Instanciate it as @c mrw::Auto::Free. - @pre \#include + @pre \#include It works like a @c std::auto_ptr, but for memory that was allocated with @c malloc, not @c new. Memory is freed, whenever diff --git a/src/mrw/auto_test.cpp b/src/mrw/auto_test.cpp index 4af9385..8b3a559 100644 --- a/src/mrw/auto_test.cpp +++ b/src/mrw/auto_test.cpp @@ -17,7 +17,7 @@ Revision 1.3 2004/08/28 16:21:25 marc mrw-c++-0.92 (mrw) - - new file: version.cpp + - new file: version.cxx - new file header for all sources - work around warning in mrw::auto - possibility to compile without log4cxx @@ -29,8 +29,8 @@ - possibility to compile without stack trace */ -#include -#include // ifelse +#include +#include // ifelse #include #include #include diff --git a/src/mrw/autofunctiontracelog4cxx.cpp b/src/mrw/autofunctiontracelog4cxx.cpp index b3e77c2..119d457 100644 --- a/src/mrw/autofunctiontracelog4cxx.cpp +++ b/src/mrw/autofunctiontracelog4cxx.cpp @@ -16,11 +16,11 @@ #error GNU C++ Compiler is required for automatical function trace #endif -#include +#include #include #include -#include +#include #include #if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) \ diff --git a/src/mrw/autofunctiontracestdlog.cpp b/src/mrw/autofunctiontracestdlog.cpp index ad35965..cf9e43d 100644 --- a/src/mrw/autofunctiontracestdlog.cpp +++ b/src/mrw/autofunctiontracestdlog.cpp @@ -1,6 +1,6 @@ /** @file - $Id: autofunctiontracelog4cxx.cpp,v 1.3 2005/04/14 19:12:18 marc Exp $ + $Id: autofunctiontracelog4cxx.cxx,v 1.3 2005/04/14 19:12:18 marc Exp $ $Date: 2005/04/14 19:12:18 $ $Author: marc $ @@ -16,8 +16,8 @@ #error GNU C++ Compiler is required for automatical function trace #endif -#include -#include +#include +#include #include #include diff --git a/src/mrw/autostacktracelog4cxx.cpp b/src/mrw/autostacktracelog4cxx.cpp index 81ed123..4aa4ddd 100644 --- a/src/mrw/autostacktracelog4cxx.cpp +++ b/src/mrw/autostacktracelog4cxx.cpp @@ -9,8 +9,8 @@ @license LGPL, see file COPYING */ -#include -#include +#include +#include #include #include #include diff --git a/src/mrw/autostacktracestderr.cpp b/src/mrw/autostacktracestderr.cpp index 938a4e5..b089ad8 100644 --- a/src/mrw/autostacktracestderr.cpp +++ b/src/mrw/autostacktracestderr.cpp @@ -9,8 +9,8 @@ @license LGPL, see file COPYING */ -#include -#include +#include +#include #include #include #include diff --git a/src/mrw/configfile.cpp b/src/mrw/configfile.cpp index 794b3ff..8351b9b 100644 --- a/src/mrw/configfile.cpp +++ b/src/mrw/configfile.cpp @@ -13,7 +13,7 @@ make it compilable with gcc 4.0.2 and newer doxygen Revision 1.2 2005/01/28 07:49:32 marc - Save configuration using file.hpp + Save configuration using file.hxx Revision 1.1 2005/01/07 00:31:38 marc initial version @@ -23,10 +23,10 @@ 5678901234567890123456789012345678901234567890123456789012345678901234567890 */ -#include -#include -#include -#include +#include +#include +#include +#include #include mrw::ConfigFileReader::Value& diff --git a/src/mrw/configfile.hpp b/src/mrw/configfile.hpp index 535389a..8c6c7d5 100644 --- a/src/mrw/configfile.hpp +++ b/src/mrw/configfile.hpp @@ -13,7 +13,7 @@ make it compilable with gcc 4.0.2 and newer doxygen Revision 1.2 2005/01/28 07:49:32 marc - Save configuration using file.hpp + Save configuration using file.hxx Revision 1.1 2005/01/07 00:31:38 marc initial version @@ -30,7 +30,7 @@ namespace mrw { /** @defgroup config Configuration File Handler - @pre \#include + @pre \#include Read configuration parameters from a file. @@ -435,7 +435,7 @@ namespace mrw { @bug Bug in GNU g++ compiler: return type should be ConfigFileWriter&, but the compiler sais:
- ../mrw/configfile.hpp:295: + ../mrw/configfile.hxx:295: sorry, unimplemented: adjusting pointers for covariant returns
The problem is fixed since GNU g++ 3.4, so the signature diff --git a/src/mrw/configfile_test.cpp b/src/mrw/configfile_test.cpp index 74162c9..e311f32 100644 --- a/src/mrw/configfile_test.cpp +++ b/src/mrw/configfile_test.cpp @@ -18,9 +18,9 @@ */ -#include -#include -#include // ifelse +#include +#include +#include // ifelse #include #include #include diff --git a/src/mrw/deque.hpp b/src/mrw/deque.hpp index 0d30ffd..5122aa3 100644 --- a/src/mrw/deque.hpp +++ b/src/mrw/deque.hpp @@ -27,8 +27,8 @@ #define __MRW__DEQUE__HPP__ #include -#include -#include +#include +#include /** @addtogroup StdExtSTL */ @@ -46,7 +46,7 @@ @param l a deque of values @param o a value to be inserted into deque @c l - @pre \#include + @pre \#include */ template std::deque& operator<<(std::deque& l, const T& o) throw(std::bad_exception) { @@ -70,7 +70,7 @@ std::deque& operator<<(std::deque& l, const T& o) throw(std::bad_exc @note when something is extracted from a deque, it is removed from the deque, that means after every shift the deque is shortened by the shifted element - @pre \#include + @pre \#include */ template std::deque& operator>>(std::deque& l, T& o) throw(std::exception) { diff --git a/src/mrw/doxyfile.in b/src/mrw/doxyfile.in index 08b5217..b9312b3 100644 --- a/src/mrw/doxyfile.in +++ b/src/mrw/doxyfile.in @@ -27,7 +27,7 @@ ## new aliases to document mutexes ## ## Revision 1.11 2005/02/18 15:54:31 marc -## exclude pattern changed for _testlib.cpp +## exclude pattern changed for _testlib.cxx ## ## Revision 1.10 2004/10/13 11:27:00 marc ## removed deprecated tags @@ -40,7 +40,7 @@ ## ## Revision 1.7 2004/08/28 16:21:25 marc ## mrw-c++-0.92 (mrw) -## - new file: version.cpp +## - new file: version.cxx ## - new file header for all sources ## - work around warning in mrw::auto ## - possibility to compile without log4cxx @@ -406,17 +406,17 @@ WARN_LOGFILE = doxygen.errors #--------------------------------------------------------------------------- # The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or +# documented source files. You may enter file names like "myfile.cxx" or # directories like "/usr/src/myproject". Separate the files or directories # with spaces. INPUT = @top_srcdir@/mrw # If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cxx # and *.h) to filter out the source-files in the directories. If left # blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp +# *.c *.cc *.cxx *.cxx *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hxx # *.h++ *.idl *.odl *.cs FILE_PATTERNS = @@ -451,7 +451,7 @@ EXCLUDE_PATTERNS = *_test* EXAMPLE_PATH = @top_srcdir@ @srcdir@/examples # If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cxx # and *.h) to filter out the source-files in the directories. If left # blank all files are included. @@ -912,7 +912,7 @@ SEARCH_INCLUDES = YES INCLUDE_PATH = # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the +# patterns (like *.h and *.hxx) to filter out the header-files in the # directories. If left blank, the patterns specified with FILE_PATTERNS will # be used. diff --git a/src/mrw/dynamiclibrary.hpp b/src/mrw/dynamiclibrary.hpp index a288796..d37f7b6 100644 --- a/src/mrw/dynamiclibrary.hpp +++ b/src/mrw/dynamiclibrary.hpp @@ -27,9 +27,9 @@ #define __MRW_DYNAMICLIBRARY_HPP__ #include -#include -#include -#include +#include +#include +#include namespace mrw { @@ -51,7 +51,7 @@ namespace mrw { } @endcode - @pre \#include + @pre \#include @pre Files that use this wrapper must be linked with libltdl, with GNU g++ on UNIX, this is link option: @c -lltdl diff --git a/src/mrw/dynamiclibrary_test.cpp b/src/mrw/dynamiclibrary_test.cpp index 51d7b11..ce55be3 100644 --- a/src/mrw/dynamiclibrary_test.cpp +++ b/src/mrw/dynamiclibrary_test.cpp @@ -17,7 +17,7 @@ 5678901234567890123456789012345678901234567890123456789012345678901234567890 */ -#include +#include #include #include #include diff --git a/src/mrw/errno.cpp b/src/mrw/errno.cpp index 39c34f4..9e75edd 100644 --- a/src/mrw/errno.cpp +++ b/src/mrw/errno.cpp @@ -22,9 +22,9 @@ 5678901234567890123456789012345678901234567890123456789012345678901234567890 */ -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/mrw/errno.hpp b/src/mrw/errno.hpp index 23c1cb4..b0c71cc 100644 --- a/src/mrw/errno.hpp +++ b/src/mrw/errno.hpp @@ -26,7 +26,7 @@ #ifndef __MRW_ERRNO_HPP__ #define __MRW_ERRNO_HPP__ -#include +#include #include #include @@ -43,7 +43,7 @@ namespace mrw { /** @brief Stores a UNIX errno error number and converts it to string. - @pre \#include */ + @pre \#include */ class Errno { //................................................................ methods @@ -78,7 +78,7 @@ namespace mrw { /** @brief to be thrown when a unix system call fails, evaluates @c errno - @pre \#include */ + @pre \#include */ class unix_error: public mrw::runtime_error { diff --git a/src/mrw/exception.cpp b/src/mrw/exception.cpp index 0a00f08..fddba33 100644 --- a/src/mrw/exception.cpp +++ b/src/mrw/exception.cpp @@ -11,7 +11,7 @@ $Log$ Revision 1.2 2004/08/28 16:21:25 marc mrw-c++-0.92 (mrw) - - new file: version.cpp + - new file: version.cxx - new file header for all sources - work around warning in mrw::auto - possibility to compile without log4cxx @@ -23,10 +23,10 @@ - possibility to compile without stack trace */ -#include +#include #ifdef HAVE_STACKTRACE -# include +# include #else namespace mrw { class StackTrace { diff --git a/src/mrw/exception.hpp b/src/mrw/exception.hpp index 2ddc2d3..ecddd56 100644 --- a/src/mrw/exception.hpp +++ b/src/mrw/exception.hpp @@ -36,7 +36,7 @@ Revision 1.4 2004/08/28 16:21:25 marc mrw-c++-0.92 (mrw) - - new file: version.cpp + - new file: version.cxx - new file header for all sources - work around warning in mrw::auto - possibility to compile without log4cxx @@ -100,11 +100,11 @@ namespace mrw { */ //@{ - /** @example exceptionhandling.cpp + /** @example exceptionhandling.cxx It is possible to recover from an unexpected exception! A stack trace helps you to find the source of a problem, here function - @c fn2() in file @c /privat/home/marc/pro/mrw-c++/mrw/test.cpp + @c fn2() in file @c /privat/home/marc/pro/mrw-c++/mrw/test.cxx on line @c 25. This example produces the following output: @verbatim @@ -116,10 +116,10 @@ UNEXPECTED:N3mrw9exceptionE ---------------------------Stack: [ 0x8048e11] _start ../sysdeps/i386/elf/start.S:105 [0x4016e92b] __libc_start_main ????:0 -[ 0x8049392] main /.../mrw-c++/mrw/examples/exceptionhandling.cpp:50 -[ 0x8049265] fn0() /.../mrw-c++/mrw/examples/exceptionhandling.cpp:38 -[ 0x80491e9] fn1() /.../mrw-c++/mrw/examples/exceptionhandling.cpp:32 -[ 0x8049183] fn2() /.../mrw-c++/mrw/examples/exceptionhandling.cpp:25 +[ 0x8049392] main /.../mrw-c++/mrw/examples/exceptionhandling.cxx:50 +[ 0x8049265] fn0() /.../mrw-c++/mrw/examples/exceptionhandling.cxx:38 +[ 0x80491e9] fn1() /.../mrw-c++/mrw/examples/exceptionhandling.cxx:32 +[ 0x8049183] fn2() /.../mrw-c++/mrw/examples/exceptionhandling.cxx:25 [0x400494a4] mrw::exception::exception() ????:0 [0x4005ace5] mrw::StackTrace::StackTrace() ????:0 --------------------------------- @@ -239,7 +239,7 @@ call of fn0 successful //@{ /** @brief replacement for @c std::exception, that collects a stack trace - @pre \#include + @pre \#include This exception class behaves exactely like @c std::exception, but it collects a stack trace in the constructor and offers a @@ -466,7 +466,7 @@ call of fn0 successful catch mrw::exception and you can access @c what() and @c stacktrace(). For a proof of concept refer to - @ref exceptionhandling.cpp "the example exceptionhandling.cpp". + @ref exceptionhandling.cxx "the example exceptionhandling.cxx". The unexpected handler is implemented ready to use in @ref AutoTrace "a separate library". diff --git a/src/mrw/exec.cpp b/src/mrw/exec.cpp index 77ebfa4..fd17e3f 100644 --- a/src/mrw/exec.cpp +++ b/src/mrw/exec.cpp @@ -41,7 +41,7 @@ Revision 1.4 2004/08/28 16:21:25 marc mrw-c++-0.92 (mrw) - - new file: version.cpp + - new file: version.cxx - new file header for all sources - work around warning in mrw::auto - possibility to compile without log4cxx @@ -53,9 +53,9 @@ - possibility to compile without stack trace */ -#include -#include -#include +#include +#include +#include #include // waitpid #include // fork, exec #include // memcpy diff --git a/src/mrw/exec.hpp b/src/mrw/exec.hpp index c31203c..eb07766 100644 --- a/src/mrw/exec.hpp +++ b/src/mrw/exec.hpp @@ -26,7 +26,7 @@ Revision 1.3 2004/08/28 16:21:25 marc mrw-c++-0.92 (mrw) - - new file: version.cpp + - new file: version.cxx - new file header for all sources - work around warning in mrw::auto - possibility to compile without log4cxx @@ -44,8 +44,8 @@ #include #include #include -#include -#include +#include +#include namespace mrw { @@ -99,7 +99,7 @@ namespace mrw { //============================================================================ /** @brief Exception: Execution of command failed. - @pre \#include + @pre \#include This exception is thrown, if the exection of a command in mrw::Exec is failed. That means, it was not possible to fork or @@ -119,7 +119,7 @@ namespace mrw { //============================================================================ /** @brief Execute a command in a new process. - @pre \#include + @pre \#include This class handles the execution of a command in a new process and returns the two streams @c cout and @c cerr, also known as @c @@ -284,7 +284,7 @@ namespace mrw { //============================================================================ /** @brief Execute a UNIX program in non blocking parts. - @pre \#include + @pre \#include A given UNIX command is executed, but the class does not wait until it is finished, instead it gives back the control to the @@ -441,7 +441,7 @@ while (!exec.finished()) res+=exec.read().first; //============================================================================ /** @brief A system command to be executed - @pre \#include + @pre \#include This class is used in conjunction with mrw::Exec. It must be initialized with the command name, then the command parameters diff --git a/src/mrw/exec_test.cpp b/src/mrw/exec_test.cpp index f1edd42..fe73d03 100644 --- a/src/mrw/exec_test.cpp +++ b/src/mrw/exec_test.cpp @@ -26,7 +26,7 @@ Revision 1.4 2004/08/28 16:21:25 marc mrw-c++-0.92 (mrw) - - new file: version.cpp + - new file: version.cxx - new file header for all sources - work around warning in mrw::auto - possibility to compile without log4cxx @@ -38,9 +38,9 @@ - possibility to compile without stack trace */ -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/mrw/file.hpp b/src/mrw/file.hpp index 3ba7dba..eb0dcc1 100644 --- a/src/mrw/file.hpp +++ b/src/mrw/file.hpp @@ -19,7 +19,7 @@ correection in documentation Revision 1.2 2005/01/28 07:49:32 marc - Save configuration using file.hpp + Save configuration using file.hxx Revision 1.1 2005/01/07 00:31:38 marc initial version @@ -31,8 +31,8 @@ #ifndef __MRW_FILE_HPP__ #define __MRW_FILE_HPP__ -#include -#include +#include +#include #include #include #include diff --git a/src/mrw/functiontrace.cpp b/src/mrw/functiontrace.cpp index 92dff82..244aae6 100644 --- a/src/mrw/functiontrace.cpp +++ b/src/mrw/functiontrace.cpp @@ -17,6 +17,6 @@ 5678901234567890123456789012345678901234567890123456789012345678901234567890 */ -#include +#include unsigned int mrw::FnTrace::_level(0); diff --git a/src/mrw/functiontrace.hpp b/src/mrw/functiontrace.hpp index aa8a612..3f54a9d 100644 --- a/src/mrw/functiontrace.hpp +++ b/src/mrw/functiontrace.hpp @@ -56,7 +56,7 @@ namespace mrw { //@{ /** @defgroup FunctionTrace Function Tracing (using log4cxx) - @pre \#include + @pre \#include Place the macro @ref MRW_METHOD as first line of all methods you want to trace, and macro @ref MRW_FUNCTION as first line of all functions to be @@ -78,7 +78,7 @@ namespace mrw { The trace of the following code: @code - \#include + \#include \#include void fn(int i=0) { MRW_FUNCTION("fn(int)"); // trace entry and exit diff --git a/src/mrw/functiontrace_test.cpp b/src/mrw/functiontrace_test.cpp index 646cc37..c4ec7d6 100644 --- a/src/mrw/functiontrace_test.cpp +++ b/src/mrw/functiontrace_test.cpp @@ -23,9 +23,9 @@ 5678901234567890123456789012345678901234567890123456789012345678901234567890 */ -#include -#include -#include +#include +#include +#include #include #include #include @@ -96,26 +96,26 @@ class FunctionTraceTest: public CppUnit::TestFixture { void Calls() { fn(A()); mrw::RegExp match - (".*functiontrace_test.cpp:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::A\\(\\)\n" - ".*functiontrace_test.cpp:[0-9]+ - *0x[0-9a-fA-F]+: / A::A\\(\\)\n" - ".*functiontrace_test.cpp:[0-9]+ - \\\\ fn\\(A\\)\n" - ".*functiontrace_test.cpp:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::fn1\\(\\)\n" - ".*functiontrace_test.cpp:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::fn2\\(\\)\n" - ".*functiontrace_test.cpp:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::fn3\\(\\)\n" - ".*functiontrace_test.cpp:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::fn4\\(\\)\n" - ".*functiontrace_test.cpp:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::fn4\\(\\)\n" - ".*functiontrace_test.cpp:[0-9]+ - *0x[0-9a-fA-F]+: / A::fn4\\(\\)\n" - ".*functiontrace_test.cpp:[0-9]+ - *0x[0-9a-fA-F]+: / A::fn4\\(\\)\n" - ".*functiontrace_test.cpp:[0-9]+ - *0x[0-9a-fA-F]+: / A::fn3\\(\\)\n" - ".*functiontrace_test.cpp:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::fn4\\(\\)\n" - ".*functiontrace_test.cpp:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::fn4\\(\\)\n" - ".*functiontrace_test.cpp:[0-9]+ - *0x[0-9a-fA-F]+: / A::fn4\\(\\)\n" - ".*functiontrace_test.cpp:[0-9]+ - *0x[0-9a-fA-F]+: / A::fn4\\(\\)\n" - ".*functiontrace_test.cpp:[0-9]+ - *0x[0-9a-fA-F]+: / A::fn2\\(\\)\n" - ".*functiontrace_test.cpp:[0-9]+ - *0x[0-9a-fA-F]+: / A::fn1\\(\\)\n" - ".*functiontrace_test.cpp:[0-9]+ - / fn\\(A\\)\n" - ".*functiontrace_test.cpp:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::~A\\(\\)\n" - ".*functiontrace_test.cpp:[0-9]+ - *0x[0-9a-fA-F]+: / A::~A\\(\\)\n"); + (".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::A\\(\\)\n" + ".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: / A::A\\(\\)\n" + ".*functiontrace_test.cxx:[0-9]+ - \\\\ fn\\(A\\)\n" + ".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::fn1\\(\\)\n" + ".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::fn2\\(\\)\n" + ".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::fn3\\(\\)\n" + ".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::fn4\\(\\)\n" + ".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::fn4\\(\\)\n" + ".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: / A::fn4\\(\\)\n" + ".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: / A::fn4\\(\\)\n" + ".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: / A::fn3\\(\\)\n" + ".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::fn4\\(\\)\n" + ".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::fn4\\(\\)\n" + ".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: / A::fn4\\(\\)\n" + ".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: / A::fn4\\(\\)\n" + ".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: / A::fn2\\(\\)\n" + ".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: / A::fn1\\(\\)\n" + ".*functiontrace_test.cxx:[0-9]+ - / fn\\(A\\)\n" + ".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::~A\\(\\)\n" + ".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: / A::~A\\(\\)\n"); CPPUNIT_ASSERT(match(mrw::File::read("functiontrace_test.log"))); mrw::File::remove("functiontrace_test.log"); } diff --git a/src/mrw/list.hpp b/src/mrw/list.hpp index cf8f6ea..f810197 100644 --- a/src/mrw/list.hpp +++ b/src/mrw/list.hpp @@ -27,8 +27,8 @@ #define __MRW__LIST__HPP__ #include -#include -#include +#include +#include /** @addtogroup StdExt */ @@ -65,7 +65,7 @@ @param l a list of values @param o a value to be inserted into list @c l - @pre \#include + @pre \#include */ // template // std::list& operator<<(std::list& l, const FROM& o) @@ -89,7 +89,7 @@ template @param l a list of string values (that can be constructed from char*) @param o a value to be inserted into list @c l - @pre \#include */ + @pre \#include */ template std::list& operator<<(std::list& l, const char *const o) @@ -114,7 +114,7 @@ template @note when something is extracted from a list, it is removed from the list, that means after every shift the list is shortened by the shifted element - @pre \#include + @pre \#include */ template std::list& operator>>(std::list& l, T& o) throw(std::exception) { diff --git a/src/mrw/makefile.am b/src/mrw/makefile.am index 75282f2..7e7fadb 100644 --- a/src/mrw/makefile.am +++ b/src/mrw/makefile.am @@ -72,34 +72,34 @@ endif endif libmrw_la_SOURCES = \ - mrw.hpp version.cpp \ - arg.cpp arg.hpp auto.hpp deque.hpp \ - exception.cpp exception.hpp \ - list.hpp \ - map.hpp multimap.hpp multiset.hpp \ - set.hpp \ - smartpointer.hpp stdext.cpp stdext.hpp \ - string.hpp unistd.hpp vector.hpp \ - tokenizer.hpp \ - errno.hpp errno.cpp + mrw.hxx version.cxx \ + arg.cxx arg.hxx auto.hxx deque.hxx \ + exception.cxx exception.hxx \ + list.hxx \ + map.hxx multimap.hxx multiset.hxx \ + set.hxx \ + smartpointer.hxx stdext.cxx stdext.hxx \ + string.hxx unistd.hxx vector.hxx \ + tokenizer.hxx \ + errno.hxx errno.cxx if HAVE_DIR - libmrw_la_SOURCES += file.hpp configfile.hpp configfile.cpp + libmrw_la_SOURCES += file.hxx configfile.hxx configfile.cxx endif if HAVE_REGEXP - libmrw_la_SOURCES += regexp.hpp regexp.cpp + libmrw_la_SOURCES += regexp.hxx regexp.cxx endif if HAVE_EXEC - libmrw_la_SOURCES += exec.cpp exec.hpp + libmrw_la_SOURCES += exec.cxx exec.hxx endif if HAVE_LTDL - libmrw_la_SOURCES += dynamiclibrary.hpp + libmrw_la_SOURCES += dynamiclibrary.hxx endif if HAVE_LOG4CXX - libmrw_la_SOURCES += functiontrace.cpp functiontrace.hpp + libmrw_la_SOURCES += functiontrace.cxx functiontrace.hxx endif if HAVE_STACKTRACE libmrw_la_SOURCES += \ - stacktrace.hpp stacktrace.cpp + stacktrace.hxx stacktrace.cxx endif libmrw_la_LDFLAGS = -version-info @LIB_VERSION@ libmrw_la_LIBADD = @@ -118,27 +118,27 @@ endif endif if HAVE_STACKTRACE - libmrwexcstderr_la_SOURCES = autostacktracestderr.cpp version.cpp + libmrwexcstderr_la_SOURCES = autostacktracestderr.cxx version.cxx libmrwexcstderr_la_LDFLAGS = -version-info @LIB_VERSION@ libmrwexcstderr_la_LIBADD = $(top_builddir)/mrw/libmrw.la if HAVE_THREADS if HAVE_BOOST_THREAD - libmrwexcstderr_mt_la_SOURCES = autostacktracestderr.cpp version.cpp + libmrwexcstderr_mt_la_SOURCES = autostacktracestderr.cxx version.cxx libmrwexcstderr_mt_la_CXXFLAGS = @THREADS@ libmrwexcstderr_mt_la_LDFLAGS = -version-info @LIB_VERSION@ @THREADS@ libmrwexcstderr_mt_la_LIBADD = $(top_builddir)/mrw/libmrw-mt.la endif endif if AUTOFNTRACE - libmrwautofunctiontracestdlog_la_SOURCES = autofunctiontracestdlog.cpp \ - version.cpp + libmrwautofunctiontracestdlog_la_SOURCES = autofunctiontracestdlog.cxx \ + version.cxx libmrwautofunctiontracestdlog_la_CXXFLAGS = -w libmrwautofunctiontracestdlog_la_LDFLAGS = -version-info @LIB_VERSION@ libmrwautofunctiontracestdlog_la_LIBADD = $(top_builddir)/mrw/libmrw.la if HAVE_THREADS if HAVE_BOOST_THREAD libmrwautofunctiontracestdlog_mt_la_SOURCES = \ - autofunctiontracelog4cxx.cpp version.cpp + autofunctiontracelog4cxx.cxx version.cxx libmrwautofunctiontracestdlog_mt_la_CXXFLAGS = @THREADS@ -w libmrwautofunctiontracestdlog_mt_la_LDFLAGS = \ -version-info @LIB_VERSION@ @THREADS@ @@ -148,27 +148,27 @@ endif endif endif if HAVE_LOG4CXX - libmrwexclog4cxx_la_SOURCES = autostacktracelog4cxx.cpp version.cpp + libmrwexclog4cxx_la_SOURCES = autostacktracelog4cxx.cxx version.cxx libmrwexclog4cxx_la_LDFLAGS = -version-info @LIB_VERSION@ libmrwexclog4cxx_la_LIBADD = $(top_builddir)/mrw/libmrw.la -llog4cxx if HAVE_THREADS if HAVE_BOOST_THREAD - libmrwexclog4cxx_mt_la_SOURCES = autostacktracelog4cxx.cpp version.cpp + libmrwexclog4cxx_mt_la_SOURCES = autostacktracelog4cxx.cxx version.cxx libmrwexclog4cxx_mt_la_CXXFLAGS = @THREADS@ libmrwexclog4cxx_mt_la_LDFLAGS = -version-info @LIB_VERSION@ @THREADS@ libmrwexclog4cxx_mt_la_LIBADD = $(top_builddir)/mrw/libmrw-mt.la -llog4cxx endif endif if AUTOFNTRACE - libmrwautofunctiontracelog4cxx_la_SOURCES = autofunctiontracelog4cxx.cpp \ - version.cpp + libmrwautofunctiontracelog4cxx_la_SOURCES = autofunctiontracelog4cxx.cxx \ + version.cxx libmrwautofunctiontracelog4cxx_la_CXXFLAGS = -w libmrwautofunctiontracelog4cxx_la_LDFLAGS = -version-info @LIB_VERSION@ libmrwautofunctiontracelog4cxx_la_LIBADD = $(top_builddir)/mrw/libmrw.la -llog4cxx if HAVE_THREADS if HAVE_BOOST_THREAD libmrwautofunctiontracelog4cxx_mt_la_SOURCES = \ - autofunctiontracelog4cxx.cpp version.cpp + autofunctiontracelog4cxx.cxx version.cxx libmrwautofunctiontracelog4cxx_mt_la_CXXFLAGS = @THREADS@ -w libmrwautofunctiontracelog4cxx_mt_la_LDFLAGS = \ -version-info @LIB_VERSION@ @THREADS@ @@ -180,12 +180,12 @@ endif endif endif if HAVE_LOG4CXX - libmrwlog4cxxconfiguration_la_SOURCES = log4cxxconfiguration.cpp version.cpp + libmrwlog4cxxconfiguration_la_SOURCES = log4cxxconfiguration.cxx version.cxx libmrwlog4cxxconfiguration_la_LDFLAGS = -version-info @LIB_VERSION@ libmrwlog4cxxconfiguration_la_LIBADD = -llog4cxx if HAVE_THREADS - libmrwlog4cxxconfiguration_mt_la_SOURCES = log4cxxconfiguration.cpp \ - version.cpp + libmrwlog4cxxconfiguration_mt_la_SOURCES = log4cxxconfiguration.cxx \ + version.cxx libmrwlog4cxxconfiguration_mt_la_CXXFLAGS = @THREADS@ libmrwlog4cxxconfiguration_mt_la_LDFLAGS = -version-info @LIB_VERSION@ \ @THREADS@ @@ -228,7 +228,7 @@ endif endif endif -auto_test_SOURCES = auto_test.cpp version.cpp +auto_test_SOURCES = auto_test.cxx version.cxx auto_test_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0 auto_test_CXXFLAGS = -g3 -O0 auto_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs @@ -236,7 +236,7 @@ auto_test_LDADD = $(top_builddir)/mrw/libmrw.la if HAVE_STACKTRACE auto_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la endif -smartpointer_test_SOURCES = smartpointer_test.cpp version.cpp +smartpointer_test_SOURCES = smartpointer_test.cxx version.cxx smartpointer_test_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0 smartpointer_test_CXXFLAGS = -g3 -O0 smartpointer_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs @@ -245,7 +245,7 @@ if HAVE_STACKTRACE smartpointer_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la endif if HAVE_EXEC -exec_test_SOURCES = exec_test.cpp version.cpp +exec_test_SOURCES = exec_test.cxx version.cxx exec_test_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0 exec_test_CXXFLAGS = -g3 -O0 exec_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs @@ -254,7 +254,7 @@ if HAVE_STACKTRACE exec_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la endif endif -stdext_test_SOURCES = stdext_test.cpp version.cpp +stdext_test_SOURCES = stdext_test.cxx version.cxx stdext_test_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0 stdext_test_CXXFLAGS = -g3 -O0 stdext_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs @@ -262,7 +262,7 @@ stdext_test_LDADD = $(top_builddir)/mrw/libmrw.la if HAVE_STACKTRACE stdext_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la endif -string_test_SOURCES = string_test.cpp version.cpp +string_test_SOURCES = string_test.cxx version.cxx string_test_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0 string_test_CXXFLAGS = -g3 -O0 string_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs @@ -271,7 +271,7 @@ if HAVE_STACKTRACE string_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la endif if HAVE_REGEXP - regexp_test_SOURCES = regexp_test.cpp version.cpp + regexp_test_SOURCES = regexp_test.cxx version.cxx regexp_test_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0 regexp_test_CXXFLAGS = -g3 -O0 regexp_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs @@ -280,7 +280,7 @@ if HAVE_STACKTRACE regexp_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la endif endif -tokenizer_test_SOURCES = tokenizer_test.cpp version.cpp +tokenizer_test_SOURCES = tokenizer_test.cxx version.cxx tokenizer_test_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0 tokenizer_test_CXXFLAGS = -g3 -O0 tokenizer_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs @@ -289,7 +289,7 @@ if HAVE_STACKTRACE tokenizer_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la endif if HAVE_DIR - configfile_test_SOURCES = configfile_test.cpp version.cpp + configfile_test_SOURCES = configfile_test.cxx version.cxx configfile_test_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0 configfile_test_CXXFLAGS = -g3 -O0 configfile_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs @@ -300,16 +300,16 @@ endif endif if HAVE_LTDL check_LTLIBRARIES = libdynamiclibrary_testlib.la - libdynamiclibrary_testlib_la_SOURCES = dynamiclibrary_testlib.cpp + libdynamiclibrary_testlib_la_SOURCES = dynamiclibrary_testlib.cxx libdynamiclibrary_testlib_la_LDFLAGS = -module -rpath /bullshit - dynamiclibrary_test_SOURCES = dynamiclibrary_test.cpp version.cpp + dynamiclibrary_test_SOURCES = dynamiclibrary_test.cxx version.cxx dynamiclibrary_test_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0 dynamiclibrary_test_CXXFLAGS = -g3 -O0 dynamiclibrary_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs dynamiclibrary_test_LDADD = $(top_builddir)/mrw/libmrw.la -lltdl endif if HAVE_LOG4CXX - functiontrace_test_SOURCES = functiontrace_test.cpp version.cpp + functiontrace_test_SOURCES = functiontrace_test.cxx version.cxx functiontrace_test_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0 functiontrace_test_CXXFLAGS = -g3 -O0 functiontrace_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs @@ -319,25 +319,25 @@ if HAVE_STACKTRACE endif endif if HAVE_STACKTRACE - stacktrace_test_SOURCES = stacktrace_test.cpp version.cpp + stacktrace_test_SOURCES = stacktrace_test.cxx version.cxx stacktrace_test_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0 stacktrace_test_CXXFLAGS = -g3 -O0 stacktrace_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs stacktrace_test_LDADD = $(top_builddir)/mrw/libmrw.la $(top_builddir)/mrw/libmrwexcstderr.la - mrwexcstderr_test_SOURCES = mrwexcstderr_test.cpp version.cpp + mrwexcstderr_test_SOURCES = mrwexcstderr_test.cxx version.cxx mrwexcstderr_test_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0 mrwexcstderr_test_CXXFLAGS = -g3 -O0 mrwexcstderr_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs mrwexcstderr_test_LDADD = $(top_builddir)/mrw/libmrwexcstderr.la if HAVE_LOG4CXX - mrwexclog4cxx_test_SOURCES = mrwexclog4cxx_test.cpp version.cpp + mrwexclog4cxx_test_SOURCES = mrwexclog4cxx_test.cxx version.cxx mrwexclog4cxx_test_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0 mrwexclog4cxx_test_CXXFLAGS = -g3 -O0 mrwexclog4cxx_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs mrwexclog4cxx_test_LDADD = $(top_builddir)/mrw/libmrwexclog4cxx.la -llog4cxx if AUTOFNTRACE mrwautofunctiontracelog4cxx_test_SOURCES = \ - mrwautofunctiontracelog4cxx_test.cpp version.cpp + mrwautofunctiontracelog4cxx_test.cxx version.cxx mrwautofunctiontracelog4cxx_test_CPPFLAGS = \ -I$(top_srcdir) @CPPUNIT_CFLAGS@ -finstrument-functions -g3 -O0 mrwautofunctiontracelog4cxx_test_CXXFLAGS = -g3 -O0 -finstrument-functions @@ -348,7 +348,7 @@ if AUTOFNTRACE if HAVE_THREADS if HAVE_BOOST_THREAD mrwautofunctiontracelog4cxx_test_mt_SOURCES = \ - mrwautofunctiontracelog4cxx_test.cpp version.cpp + mrwautofunctiontracelog4cxx_test.cxx version.cxx mrwautofunctiontracelog4cxx_test_mt_CPPFLAGS = \ -I$(top_srcdir) @CPPUNIT_CFLAGS@ -finstrument-functions -g3 -O0 mrwautofunctiontracelog4cxx_test_mt_CXXFLAGS = -g3 -O0 \ diff --git a/src/mrw/map.hpp b/src/mrw/map.hpp index a1f6f95..123f7d3 100644 --- a/src/mrw/map.hpp +++ b/src/mrw/map.hpp @@ -27,8 +27,8 @@ #define __MRW__MAP__HPP__ #include -#include -#include +#include +#include /** @addtogroup StdExtSTL */ @@ -48,7 +48,7 @@ @throw mrw::invalid_argument, if element is already in map @param l a map of values @param o a value to be inserted into map @c l - @pre \#include + @pre \#include */ template std::map& operator<<(std::map& l, const std::pair& o) @@ -78,7 +78,7 @@ std::map& operator<<(std::map& l, const std::pair& @note when something is extracted from a map, it is removed from the map, that means after every shift the map is shortened by the shifted element - @pre \#include + @pre \#include */ template std::map& operator>>(std::map& l, std::pair& o) diff --git a/src/mrw/mrw.hpp.in b/src/mrw/mrw.hpp.in index 06705fe..8d69802 100644 --- a/src/mrw/mrw.hpp.in +++ b/src/mrw/mrw.hpp.in @@ -112,7 +112,7 @@ Include the headers you need with prefix @c mrw, e.g.: @verbatim - \#include + \#include @endverbatim All classes are in the @c mrw namespace. @@ -125,7 +125,7 @@ program is multi threaded), e.g.: @verbatim - g++ -g -o myprogram myprogram.cpp -lmrw + g++ -g -o myprogram myprogram.cxx -lmrw @endverbatim For the @ref AutoTools "unexpected handler" you need to link to diff --git a/src/mrw/mrwautofunctiontracelog4cxx_test.cpp b/src/mrw/mrwautofunctiontracelog4cxx_test.cpp index a6a071c..2664532 100644 --- a/src/mrw/mrwautofunctiontracelog4cxx_test.cpp +++ b/src/mrw/mrwautofunctiontracelog4cxx_test.cpp @@ -29,10 +29,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) \ @@ -65,7 +65,7 @@ void anotherFunction() { } #ifdef _MT -#include +#include //#include // sleep, the one from boost::thread does not work! class Thread { public: diff --git a/src/mrw/mrwexclog4cxx_test.cpp b/src/mrw/mrwexclog4cxx_test.cpp index a122f7a..91bcfa8 100644 --- a/src/mrw/mrwexclog4cxx_test.cpp +++ b/src/mrw/mrwexclog4cxx_test.cpp @@ -11,7 +11,7 @@ $Log$ Revision 1.2 2004/08/28 16:21:25 marc mrw-c++-0.92 (mrw) - - new file: version.cpp + - new file: version.cxx - new file header for all sources - work around warning in mrw::auto - possibility to compile without log4cxx @@ -23,7 +23,7 @@ - possibility to compile without stack trace */ -#include +#include #include #include #include diff --git a/src/mrw/mrwexcstderr_test.cpp b/src/mrw/mrwexcstderr_test.cpp index d10df8b..250b830 100644 --- a/src/mrw/mrwexcstderr_test.cpp +++ b/src/mrw/mrwexcstderr_test.cpp @@ -11,7 +11,7 @@ $Log$ Revision 1.2 2004/08/28 16:21:25 marc mrw-c++-0.92 (mrw) - - new file: version.cpp + - new file: version.cxx - new file header for all sources - work around warning in mrw::auto - possibility to compile without log4cxx @@ -23,7 +23,7 @@ - possibility to compile without stack trace */ -#include +#include #include #include #include diff --git a/src/mrw/multimap.hpp b/src/mrw/multimap.hpp index 5def115..34f4580 100644 --- a/src/mrw/multimap.hpp +++ b/src/mrw/multimap.hpp @@ -27,8 +27,8 @@ #define __MRW__MULTIMAP__HPP__ #include -#include -#include +#include +#include /** @addtogroup StdExtSTL */ @@ -48,7 +48,7 @@ @throw mrw::invalid_argument, if element is already in multimap @param l a multimap of values @param o a value to be inserted into multimap @c l - @pre \#include + @pre \#include */ template std::multimap& operator<<(std::multimap& l, const std::pair& o) @@ -74,7 +74,7 @@ std::multimap& operator<<(std::multimap& l, const std::p @note when something is extracted from a multimap, it is removed from the multimap, that means after every shift the multimap is shortened by the shifted element - @pre \#include + @pre \#include */ template std::multimap& operator>>(std::multimap& l, std::pair& o) diff --git a/src/mrw/multiset.hpp b/src/mrw/multiset.hpp index 48a406f..55231d3 100644 --- a/src/mrw/multiset.hpp +++ b/src/mrw/multiset.hpp @@ -27,8 +27,8 @@ #define __MRW__MULTISET__HPP__ #include -#include -#include +#include +#include /** @addtogroup StdExtSTL */ @@ -46,7 +46,7 @@ @param l a multiset of values @param o a value to be inserted into multiset @c l - @pre \#include + @pre \#include */ template std::multiset& operator<<(std::multiset& l, const T& o) throw(std::bad_exception) { @@ -70,7 +70,7 @@ std::multiset& operator<<(std::multiset& l, const T& o) throw( @note when something is extracted from a multiset, it is removed from the multiset, that means after every shift the multiset is shortened by the shifted element - @pre \#include + @pre \#include */ template std::multiset& operator>>(std::multiset& l, T& o) throw(std::exception) { diff --git a/src/mrw/regexp.cpp b/src/mrw/regexp.cpp index 3c64c74..e321e3f 100644 --- a/src/mrw/regexp.cpp +++ b/src/mrw/regexp.cpp @@ -18,9 +18,9 @@ */ -#include -#include -#include +#include +#include +#include namespace mrw { diff --git a/src/mrw/regexp.hpp b/src/mrw/regexp.hpp index 96907fa..d2a5eda 100644 --- a/src/mrw/regexp.hpp +++ b/src/mrw/regexp.hpp @@ -50,7 +50,7 @@ namespace mrw { //@{ /** @defgroup regexpregexp Regular Expressions - @pre \#include + @pre \#include A simple wrapper around the C POSIX regular expression library with a C++ Interface. diff --git a/src/mrw/regexp_test.cpp b/src/mrw/regexp_test.cpp index 47d0a2f..85634f9 100644 --- a/src/mrw/regexp_test.cpp +++ b/src/mrw/regexp_test.cpp @@ -18,8 +18,8 @@ */ -#include -#include +#include +#include #include #include diff --git a/src/mrw/set.hpp b/src/mrw/set.hpp index 9852fc4..4c04ab3 100644 --- a/src/mrw/set.hpp +++ b/src/mrw/set.hpp @@ -27,8 +27,8 @@ #define __MRW__SET__HPP__ #include -#include -#include +#include +#include /** @addtogroup StdExtSTL */ @@ -47,7 +47,7 @@ @throw mrw::invalid_argument, if element is already in set @param l a set of values @param o a value to be inserted into set @c l - @pre \#include + @pre \#include */ template std::set& operator<<(std::set& l, const T& o) @@ -76,7 +76,7 @@ std::set& operator<<(std::set& l, const T& o) @note when something is extracted from a set, it is removed from the set, that means after every shift the set is shortened by the shifted element - @pre \#include + @pre \#include */ template std::set& operator>>(std::set& l, T& o) diff --git a/src/mrw/smartpointer.hpp b/src/mrw/smartpointer.hpp index 589c25e..365d5c8 100644 --- a/src/mrw/smartpointer.hpp +++ b/src/mrw/smartpointer.hpp @@ -49,7 +49,7 @@ namespace mrw { //@{ /** @brief Smart Pointer Implementation - @pre \#include + @pre \#include This is a smart pointer that can be casted withing the inheritance of the pointer it is storing. diff --git a/src/mrw/smartpointer_test.cpp b/src/mrw/smartpointer_test.cpp index c9fad17..1e47598 100644 --- a/src/mrw/smartpointer_test.cpp +++ b/src/mrw/smartpointer_test.cpp @@ -11,7 +11,7 @@ $Log$ Revision 1.1 2004/08/28 16:13:42 marc mrw-c++-0.92 (mrw) - - new file: version.cpp + - new file: version.cxx - new file header for all sources - work around warning in mrw::auto - possibility to compile without log4cxx @@ -23,7 +23,7 @@ - possibility to compile without stack trace */ -#include +#include #include #include #include diff --git a/src/mrw/stacktrace.cpp b/src/mrw/stacktrace.cpp index fd54252..e7f9ec3 100644 --- a/src/mrw/stacktrace.cpp +++ b/src/mrw/stacktrace.cpp @@ -9,13 +9,13 @@ @license LGPL, see file COPYING */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #ifndef NO_LTDL -# include +# include #endif #include #include diff --git a/src/mrw/stacktrace.hpp b/src/mrw/stacktrace.hpp index 9daa7e3..55d4ae4 100644 --- a/src/mrw/stacktrace.hpp +++ b/src/mrw/stacktrace.hpp @@ -11,7 +11,7 @@ */ #ifndef __MRW_STACKTRACE_HPP__ #define __MRW_STACKTRACE_HPP__ -#include +#include #include #include #include @@ -26,7 +26,7 @@ #define _MT #endif #ifdef _MT -#include +#include #endif namespace mrw { @@ -74,7 +74,7 @@ namespace mrw { //@{ /** @brief store and print a stack trace of the actual position in code - @pre \#include + @pre \#include In the constructor, a stack trace is stored, but not yet evaluated. Therefore storing a stack trace is relatively diff --git a/src/mrw/stacktrace_test.cpp b/src/mrw/stacktrace_test.cpp index 9e6f441..533529d 100644 --- a/src/mrw/stacktrace_test.cpp +++ b/src/mrw/stacktrace_test.cpp @@ -12,7 +12,7 @@ 5678901234567890123456789012345678901234567890123456789012345678901234567890 */ -#include +#include #include #include #include diff --git a/src/mrw/stdext.cpp b/src/mrw/stdext.cpp index 65775ed..f54da79 100644 --- a/src/mrw/stdext.cpp +++ b/src/mrw/stdext.cpp @@ -18,7 +18,7 @@ */ -#include +#include std::string mrw::getline(std::istream& is, char d) { std::string s; diff --git a/src/mrw/stdext.hpp b/src/mrw/stdext.hpp index c2487e1..65911a2 100644 --- a/src/mrw/stdext.hpp +++ b/src/mrw/stdext.hpp @@ -61,7 +61,7 @@ namespace mrw { @param a criteria that is checked and returned if not @c 0 @param b alternative value to be returned if @c a is @c 0 @return a ? a : b - @pre \#include + @pre \#include @pre @c T must be convertible to @c bool */ template const T& ifelse(const T& a, const T& b) { @@ -84,7 +84,7 @@ namespace mrw { @param is the stream to read from @param d the end of line delimiter @return the line read from the stream - @pre \#include + @pre \#include */ std::string getline(std::istream& is, char d = '\n'); @@ -98,7 +98,7 @@ namespace mrw { @param d the end of line delimiter @return @c s: the line read from the stream @return the stream after extraction of line - @pre \#include + @pre \#include */ std::istream& getline(std::istream& is, std::string& s, char d = '\n'); diff --git a/src/mrw/stdext_test.cpp b/src/mrw/stdext_test.cpp index 110483a..a744803 100644 --- a/src/mrw/stdext_test.cpp +++ b/src/mrw/stdext_test.cpp @@ -20,15 +20,15 @@ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/mrw/string.hpp b/src/mrw/string.hpp index e4cbc67..e365ead 100644 --- a/src/mrw/string.hpp +++ b/src/mrw/string.hpp @@ -36,7 +36,7 @@ #ifndef __MRW__STRING__HPP__ #define __MRW__STRING__HPP__ -#include +#include #include #include #include @@ -186,7 +186,7 @@ namespace mrw { @endcode @param o a value to be converted to std::string - @pre \#include + @pre \#include @pre T must support operator<< to a stream */ template std::string string(const T& o) @@ -204,7 +204,7 @@ namespace mrw { @throw mrw::invalid_argument if value can not be created from string @param s the string where a value of type @c T is extracted from - @pre \#include + @pre \#include @pre T must support operator>> from a stream @pre operator>> from T must not throw anything else than std::exception @@ -223,7 +223,7 @@ namespace mrw { @code std::list l; - l<<"hello"<<"world"; // needs mrw/list.hpp + l<<"hello"<<"world"; // needs mrw/list.hxx std::string hello_world(mrw::join(l)); // hello_world is now "hello world" @endcode @@ -296,7 +296,7 @@ namespace mrw { @param s the string, where o is appended @param o the value to append to @c s - @pre \#include + @pre \#include @pre T must support operator<< to a stream */ template std::string& operator<<(std::string& s, const T& o) @@ -320,7 +320,7 @@ template std::string& operator<<(std::string& s, const T& o) @note when something is extracted from a string, it is removed from the string, that means after every shift the string is shortened by the shifted element - @pre \#include + @pre \#include @pre T must support operator>> from a stream @note The signature has changed: @@ -343,7 +343,7 @@ template std::string& operator>>(std::string& s, T& o) @param s the string, where @c o is appended @param o the value to append to @c s - @pre \#include + @pre \#include */ inline std::string operator+(const std::string& s, unsigned short o) throw(std::bad_exception) { @@ -359,7 +359,7 @@ inline std::string operator+(const std::string& s, unsigned short o) @param s the string, where @c o is prepended @param o the value to prepend in front of @c s - @pre \#include + @pre \#include */ inline std::string operator+(unsigned short o, const std::string& s) throw(std::bad_exception) { @@ -375,7 +375,7 @@ inline std::string operator+(unsigned short o, const std::string& s) @param s the string, where @c o is appended @param o the value to append to @c s - @pre \#include + @pre \#include */ inline std::string operator+(const std::string& s, unsigned int o) throw(std::bad_exception) { @@ -391,7 +391,7 @@ inline std::string operator+(const std::string& s, unsigned int o) @param s the string, where @c o is prepended @param o the value to prepend in front of @c s - @pre \#include + @pre \#include */ inline std::string operator+(unsigned int o, const std::string& s) throw(std::bad_exception) { @@ -407,7 +407,7 @@ inline std::string operator+(unsigned int o, const std::string& s) @param s the string, where @c o is appended @param o the value to append to @c s - @pre \#include + @pre \#include */ inline std::string operator+(const std::string& s, unsigned long o) throw(std::bad_exception) { @@ -423,7 +423,7 @@ inline std::string operator+(const std::string& s, unsigned long o) @param s the string, where @c o is prepended @param o the value to prepend in front of @c s - @pre \#include + @pre \#include */ inline std::string operator+(unsigned long o, const std::string& s) throw(std::bad_exception) { @@ -439,7 +439,7 @@ inline std::string operator+(unsigned long o, const std::string& s) @param s the string, where @c o is appended @param o the value to append to @c s - @pre \#include + @pre \#include */ inline std::string operator+(const std::string& s, signed short o) throw(std::bad_exception) { @@ -455,7 +455,7 @@ inline std::string operator+(const std::string& s, signed short o) @param s the string, where @c o is prepended @param o the value to prepend in front of @c s - @pre \#include + @pre \#include */ inline std::string operator+(signed short o, const std::string& s) throw(std::bad_exception) { @@ -471,7 +471,7 @@ inline std::string operator+(signed short o, const std::string& s) @param s the string, where @c o is appended @param o the value to append to @c s - @pre \#include + @pre \#include */ inline std::string operator+(const std::string& s, signed int o) throw(std::bad_exception) { @@ -487,7 +487,7 @@ inline std::string operator+(const std::string& s, signed int o) @param s the string, where @c o is prepended @param o the value to prepend in front of @c s - @pre \#include + @pre \#include */ inline std::string operator+(signed int o, const std::string& s) throw(std::bad_exception) { @@ -503,7 +503,7 @@ inline std::string operator+(signed int o, const std::string& s) @param s the string, where @c o is appended @param o the value to append to @c s - @pre \#include + @pre \#include */ inline std::string operator+(const std::string& s, signed long o) throw(std::bad_exception) { @@ -519,7 +519,7 @@ inline std::string operator+(const std::string& s, signed long o) @param s the string, where @c o is prepended @param o the value to prepend in front of @c s - @pre \#include + @pre \#include */ inline std::string operator+(signed long o, const std::string& s) throw(std::bad_exception) { @@ -536,7 +536,7 @@ inline std::string operator+(signed long o, const std::string& s) @param s the string, where @c o is appended @param o the value to append to @c s - @pre \#include + @pre \#include */ inline std::string& operator+=(std::string& s, unsigned short o) throw(std::bad_exception) { @@ -552,7 +552,7 @@ inline std::string& operator+=(std::string& s, unsigned short o) @param s the string, where @c o is appended @param o the value to append to @c s - @pre \#include + @pre \#include */ inline std::string& operator+=(std::string& s, unsigned int o) throw(std::bad_exception) { @@ -568,7 +568,7 @@ inline std::string& operator+=(std::string& s, unsigned int o) @param s the string, where @c o is appended @param o the value to append to @c s - @pre \#include + @pre \#include */ inline std::string& operator+=(std::string& s, unsigned long o) throw(std::bad_exception) { @@ -584,7 +584,7 @@ inline std::string& operator+=(std::string& s, unsigned long o) @param s the string, where @c o is appended @param o the value to append to @c s - @pre \#include + @pre \#include */ inline std::string& operator+=(std::string& s, signed short o) throw(std::bad_exception) { @@ -600,7 +600,7 @@ inline std::string& operator+=(std::string& s, signed short o) @param s the string, where @c o is appended @param o the value to append to @c s - @pre \#include + @pre \#include */ inline std::string& operator+=(std::string& s, signed int o) throw(std::bad_exception) { @@ -616,7 +616,7 @@ inline std::string& operator+=(std::string& s, signed int o) @param s the string, where @c o is appended @param o the value to append to @c s - @pre \#include + @pre \#include */ inline std::string& operator+=(std::string& s, signed long o) throw(std::bad_exception) { diff --git a/src/mrw/string_test.cpp b/src/mrw/string_test.cpp index 38d6485..ea49474 100644 --- a/src/mrw/string_test.cpp +++ b/src/mrw/string_test.cpp @@ -13,8 +13,8 @@ 1 2 3 4 5 6 7 8 5678901234567890123456789012345678901234567890123456789012345678901234567890 */ -#include -#include +#include +#include #include #include diff --git a/src/mrw/tokenizer.hpp b/src/mrw/tokenizer.hpp index a9f28c4..95bcf83 100644 --- a/src/mrw/tokenizer.hpp +++ b/src/mrw/tokenizer.hpp @@ -22,7 +22,7 @@ namespace mrw { //@{ /** @defgroup regexptokenizer Tokenizer - @pre \#include + @pre \#include There is a Tokenizer which splits strings according to a list of delimiters and allows to iterate over the individual tokens: diff --git a/src/mrw/tokenizer_test.cpp b/src/mrw/tokenizer_test.cpp index 18e5d27..b06a14a 100644 --- a/src/mrw/tokenizer_test.cpp +++ b/src/mrw/tokenizer_test.cpp @@ -18,8 +18,8 @@ */ -#include -#include +#include +#include #include #include diff --git a/src/mrw/unistd.hpp b/src/mrw/unistd.hpp index 56402f7..6f1e501 100644 --- a/src/mrw/unistd.hpp +++ b/src/mrw/unistd.hpp @@ -22,7 +22,7 @@ Revision 1.5 2004/08/28 16:21:25 marc mrw-c++-0.92 (mrw) - - new file: version.cpp + - new file: version.cxx - new file header for all sources - work around warning in mrw::auto - possibility to compile without log4cxx @@ -52,7 +52,7 @@ namespace mrw { //@{ /** @brief class that implements an unnamed UNIX pipe - @pre \#include + @pre \#include Implements a UNIX pipe that is automatically closed in destructor and offers some facilities. */ diff --git a/src/mrw/vector.hpp b/src/mrw/vector.hpp index 20e2495..2c0e6a1 100644 --- a/src/mrw/vector.hpp +++ b/src/mrw/vector.hpp @@ -27,8 +27,8 @@ #define __MRW__VECTOR__HPP__ #include -#include -#include +#include +#include /** @addtogroup StdExtSTL */ @@ -46,7 +46,7 @@ @param l a vector of values @param o a value to be inserted into vector @c l - @pre \#include + @pre \#include */ template std::vector& operator<<(std::vector& l, const T& o) throw(std::bad_exception) { @@ -70,7 +70,7 @@ std::vector& operator<<(std::vector& l, const T& o) throw(std::bad_e @note when something is extracted from a vector, it is removed from the vector, that means after every shift the vector is shortened by the shifted element - @pre \#include + @pre \#include */ template std::vector& operator>>(std::vector& l, T& o) throw(std::exception) { diff --git a/src/mrw/version.cpp.in b/src/mrw/version.cpp.in index 5090337..c75c281 100644 --- a/src/mrw/version.cpp.in +++ b/src/mrw/version.cpp.in @@ -14,7 +14,7 @@ Revision 1.1 2004/08/28 16:13:42 marc mrw-c++-0.92 (mrw) - - new file: version.cpp + - new file: version.cxx - new file header for all sources - work around warning in mrw::auto - possibility to compile without log4cxx