libraries/mrw-cxx
1
0
Fork 0
Code Issues Releases Activity

middle of porting; unstable, don't checkout; refs #1

Browse Source
This commit is contained in:
Marc Wäckerlin
2011-12-10 11:39:09 +00:00
parent 599af2dbbf
commit a63f26005b
60 changed files with 296 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+14 -14
View File
@@ -26,9 +26,9 @@
- Checked with valgrind and repaired defects: - Checked with valgrind and repaired defects:
- Mismatching delete in StackTrace - Mismatching delete in StackTrace
* Tue Jun 12 2007 Marc Waeckerlin - mrw-c++-3.1.1 (mrw) * 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) * 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) * Fri May 25 2007 Marc Waeckerlin - mrw-c++-3.0.0 (mrw)
- Function- and method-trace have been renamed from FUNCTION and - Function- and method-trace have been renamed from FUNCTION and
METHOD to MRW_FUNCTION and MRW_METHOD due to naming conflicts with METHOD to MRW_FUNCTION and MRW_METHOD due to naming conflicts with
@@ -125,7 +125,7 @@
- new feature: tokenizer - new feature: tokenizer
* Thu Dec 16 2004 Marc Waeckerlin - mrw-c++-1.3.1 (mrw) * Thu Dec 16 2004 Marc Waeckerlin - mrw-c++-1.3.1 (mrw)
- regular expressions can now evaluate and return sub matches - 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) * Mon Dec 13 2004 Marc Waeckerlin - mrw-c++-1.3.0 (mrw)
- added the possibility to pass values to stdin in mrw::Exec - added the possibility to pass values to stdin in mrw::Exec
- and the possibility to connect to stdin in mrw::Pipe - 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) * Wed Nov 11 2004 Marc Waeckerlin - mrw-c++-1.2.2 (mrw)
- correction in documentation: need [0]->toString() not .toString() - correction in documentation: need [0]->toString() not .toString()
* Wed Oct 13 2004 Marc Waeckerlin - mrw-c++-1.2.1 (mrw) * Wed Oct 13 2004 Marc Waeckerlin - mrw-c++-1.2.1 (mrw)
- no newline at the end of stacktrace in autostacktracestderr.cpp - no newline at the end of stacktrace in autostacktracestderr.cxx
- test for bad exception specification in exec_test.cpp - test for bad exception specification in exec_test.cxx
- no more need for ldd in StackTrace, read from /proc/self/maps - no more need for ldd in StackTrace, read from /proc/self/maps
- check whether shared libraries are evaluated in - 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 - new feature in stdext: getline reads a whole line from a stream
* Mon Oct 11 2004 Marc Waeckerlin - mrw-c++-1.2.0 (mrw) * Mon Oct 11 2004 Marc Waeckerlin - mrw-c++-1.2.0 (mrw)
- StackTrace now can load shared libraries! - StackTrace now can load shared libraries!
@@ -161,9 +161,9 @@
* Tue Aug 31 2004 Marc Waeckerlin - mrw-c++-0.93 (mrw) * Tue Aug 31 2004 Marc Waeckerlin - mrw-c++-0.93 (mrw)
- test failed on Solaris (without stack trace) - test failed on Solaris (without stack trace)
-> no -lbfd for --disable-stacktrace! -> 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) * 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 - new file header for all sources
- work around warning in mrw::auto<T> - work around warning in mrw::auto<T>
- possibility to compile without log4cxx - possibility to compile without log4cxx
@@ -174,19 +174,19 @@
- small corrections in Auto<>::Free and a new test for it - small corrections in Auto<>::Free and a new test for it
- possibility to compile without stack trace - possibility to compile without stack trace
* Wed May 28 2004 Marc Waeckerlin - mrw-c++-0.92 (mrw) * 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 - 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 - new makefile targets tag and release
* Wed May 19 2004 Marc Waeckerlin - mrw-c++-0.92 (mrw) * 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) * Tue May 18 2004 Marc Waeckerlin - mrw-c++-0.92 (mrw)
- correct bfd detection on solaris - correct bfd detection on solaris
- templated auto classes - 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) * Tue Apr 27 2004 Marc Waeckerlin - mrw-c++-0.91 (mrw)
- mrw/arg.hpp: Command line argument evaluation - mrw/arg.hxx: Command line argument evaluation
- mrw/smartpointer.hpp: Smart pointer implementation - mrw/smartpointer.hxx: Smart pointer implementation
- configure: Correction for Solaris - configure: Correction for Solaris
* Fri Apr 24 2004 Marc Waeckerlin - mrw-c++-0.90 (mrw) * Fri Apr 24 2004 Marc Waeckerlin - mrw-c++-0.90 (mrw)
- initial rpm with two spec files - initial rpm with two spec files
configure.in
+2 -2
View File
@@ -164,7 +164,7 @@ if test "$have_stacktrace" = "yes"; then
[AC_MSG_WARN([Header "demangle.h" from the binutils not found! [AC_MSG_WARN([Header "demangle.h" from the binutils not found!
- unfortunately, the bintils do not install this header - unfortunately, the bintils do not install this header
(even though they should) (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 own binutils version (binutils-2.16.1) it may or may not be compatible to
yours])]) yours])])
AC_SEARCH_LIBS(cplus_demangle, [demangle iberty], AC_SEARCH_LIBS(cplus_demangle, [demangle iberty],
@@ -211,7 +211,7 @@ AC_ARG_ENABLE(pedantic,
[have_pedantic="$enableval"; test "$enableval" = "yes" && \ [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"]) 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 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") AM_CONDITIONAL(PEDANTIC, test "$enableval" = "yes")
AC_ARG_ENABLE(dot, AC_ARG_ENABLE(dot,
[AS_HELP_STRING([--disable-dot], [AS_HELP_STRING([--disable-dot],
doc/doxyfile
+7 -7
View File
@@ -611,7 +611,7 @@ WARN_LOGFILE = doxygen.errors
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# The INPUT tag can be used to specify the files and/or directories that contain # 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 # directories like "/usr/src/myproject". Separate the files or directories
# with spaces. # with spaces.
@@ -626,11 +626,11 @@ INPUT = ./../src
INPUT_ENCODING = UTF-8 INPUT_ENCODING = UTF-8
# If the value of the INPUT tag contains directories, you can use the # 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 # and *.h) to filter out the source-files in the directories. If left
# blank the following patterns are tested: # blank the following patterns are tested:
# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh # *.c *.cc *.cxx *.cxx *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py # *.hxx *.hxx *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
# *.f90 *.f *.for *.vhd *.vhdl # *.f90 *.f *.for *.vhd *.vhdl
FILE_PATTERNS = *.[ch]xx \ FILE_PATTERNS = *.[ch]xx \
@@ -679,7 +679,7 @@ EXCLUDE_SYMBOLS =
EXAMPLE_PATH = . EXAMPLE_PATH = .
# If the value of the EXAMPLE_PATH tag contains directories, you can use the # 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 # and *.h) to filter out the source-files in the directories. If left
# blank all files are included. # blank all files are included.
@@ -714,7 +714,7 @@ INPUT_FILTER =
# Doxygen will compare the file name with each pattern and apply the # Doxygen will compare the file name with each pattern and apply the
# filter if there is a match. # filter if there is a match.
# The filters are a list of the form: # 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 # 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. # non of the patterns match the file name, INPUT_FILTER is applied.
@@ -1441,7 +1441,7 @@ SEARCH_INCLUDES = YES
INCLUDE_PATH = INCLUDE_PATH =
# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard # 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 # directories. If left blank, the patterns specified with FILE_PATTERNS will
# be used. # be used.
doc/doxyfile.in
+7 -7
View File
@@ -611,7 +611,7 @@ WARN_LOGFILE = doxygen.errors
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# The INPUT tag can be used to specify the files and/or directories that contain # 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 # directories like "/usr/src/myproject". Separate the files or directories
# with spaces. # with spaces.
@@ -626,11 +626,11 @@ INPUT = @SRCDIR@/../src
INPUT_ENCODING = UTF-8 INPUT_ENCODING = UTF-8
# If the value of the INPUT tag contains directories, you can use the # 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 # and *.h) to filter out the source-files in the directories. If left
# blank the following patterns are tested: # blank the following patterns are tested:
# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh # *.c *.cc *.cxx *.cxx *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py # *.hxx *.hxx *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
# *.f90 *.f *.for *.vhd *.vhdl # *.f90 *.f *.for *.vhd *.vhdl
FILE_PATTERNS = *.[ch]xx \ FILE_PATTERNS = *.[ch]xx \
@@ -679,7 +679,7 @@ EXCLUDE_SYMBOLS =
EXAMPLE_PATH = . EXAMPLE_PATH = .
# If the value of the EXAMPLE_PATH tag contains directories, you can use the # 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 # and *.h) to filter out the source-files in the directories. If left
# blank all files are included. # blank all files are included.
@@ -714,7 +714,7 @@ INPUT_FILTER =
# Doxygen will compare the file name with each pattern and apply the # Doxygen will compare the file name with each pattern and apply the
# filter if there is a match. # filter if there is a match.
# The filters are a list of the form: # 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 # 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. # non of the patterns match the file name, INPUT_FILTER is applied.
@@ -1441,7 +1441,7 @@ SEARCH_INCLUDES = YES
INCLUDE_PATH = INCLUDE_PATH =
# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard # 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 # directories. If left blank, the patterns specified with FILE_PATTERNS will
# be used. # be used.
doc/examples/exceptionhandling.cpp
+2 -2
View File
@@ -1,5 +1,5 @@
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#include <mrw/stacktrace.hpp> #include <mrw/stacktrace.hxx>
#include <exception> #include <exception>
#include <iostream> #include <iostream>
doc/examples/smartpointer.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include <mrw/smartpointer.hpp> #include <mrw/smartpointer.hxx>
class A { class A {
public: int a; public: int a;
src/mrw/arg.cpp
+3 -3
View File
@@ -17,7 +17,7 @@
Revision 1.1 2004/08/28 16:13:42 marc Revision 1.1 2004/08/28 16:13:42 marc
mrw-c++-0.92 (mrw) mrw-c++-0.92 (mrw)
- new file: version.cpp - new file: version.cxx
- new file header for all sources - new file header for all sources
- work around warning in mrw::auto<T> - work around warning in mrw::auto<T>
- possibility to compile without log4cxx - possibility to compile without log4cxx
@@ -29,8 +29,8 @@
- possibility to compile without stack trace - possibility to compile without stack trace
*/ */
#include <mrw/arg.hpp> #include <mrw/arg.hxx>
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
namespace mrw { namespace mrw {
src/mrw/arg.hpp
+7 -7
View File
@@ -22,11 +22,11 @@
bugs in documentation bugs in documentation
Revision 1.3 2004/08/31 16:23:29 marc 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 Revision 1.2 2004/08/28 16:21:25 marc
mrw-c++-0.92 (mrw) mrw-c++-0.92 (mrw)
- new file: version.cpp - new file: version.cxx
- new file header for all sources - new file header for all sources
- work around warning in mrw::auto<T> - work around warning in mrw::auto<T>
- possibility to compile without log4cxx - possibility to compile without log4cxx
@@ -38,7 +38,7 @@
- possibility to compile without stack trace - possibility to compile without stack trace
*/ */
#include <mrw/smartpointer.hpp> #include <mrw/smartpointer.hxx>
#include <stdlib.h> // exit #include <stdlib.h> // exit
#include <string> #include <string>
#include <map> #include <map>
@@ -133,7 +133,7 @@ namespace mrw {
/** @brief List of additional (mandatory) parameter to one command /** @brief List of additional (mandatory) parameter to one command
line argument. line argument.
@pre \#include<mrw/arg.hpp> @pre \#include<mrw/arg.hxx>
A new mandatory parameter is added to the list of parameter, by A new mandatory parameter is added to the list of parameter, by
shifting the default value into the instance of @c shifting the default value into the instance of @c
@@ -210,7 +210,7 @@ namespace mrw {
public: public:
/** @brief Abstract base class to represent one single parameter value. /** @brief Abstract base class to represent one single parameter value.
@pre \#include<mrw/arg.hpp> @pre \#include<mrw/arg.hxx>
*/ */
class Value { class Value {
@@ -375,7 +375,7 @@ namespace mrw {
}; };
/** @brief this class represents one command line option /** @brief this class represents one command line option
@pre \#include<mrw/arg.hpp> @pre \#include<mrw/arg.hxx>
The library user needs this class when setting up the list of The library user needs this class when setting up the list of
supported command line ooptions: Simply shift one instance of @c supported command line ooptions: Simply shift one instance of @c
@@ -472,7 +472,7 @@ namespace mrw {
}; };
/** @brief handle command line arguments /** @brief handle command line arguments
@pre \#include<mrw/arg.hpp> @pre \#include<mrw/arg.hxx>
This class handles command line arguments. It is a This class handles command line arguments. It is a
singleton. Get the one and only instance of this class with @c singleton. Get the one and only instance of this class with @c
src/mrw/auto.hpp
+7 -7
View File
@@ -65,7 +65,7 @@ namespace mrw {
//@{ //@{
/** @brief Automatically frees a resource when destructed. /** @brief Automatically frees a resource when destructed.
@pre \#include <mrw/auto.hpp> @pre \#include <mrw/auto.hxx>
AutoResource works exactly like std::auto_ptr, but for any AutoResource works exactly like std::auto_ptr, but for any
resource instead of new allocated pointers. Whenever the context resource instead of new allocated pointers. Whenever the context
@@ -170,7 +170,7 @@ namespace mrw {
}; };
/** @brief Automatically deletes a pointer when destructed. /** @brief Automatically deletes a pointer when destructed.
@pre \#include <mrw/auto.hpp> @pre \#include <mrw/auto.hxx>
mrw::AutoPtr is a replacement for std::auto_ptr. The problem with 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. 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. /** @brief Automatically deletes an array pointer when destructed.
@pre \#include <mrw/auto.hpp> @pre \#include <mrw/auto.hxx>
mrw::AutoPtrAry is a replacement for std::auto_ptr. Other than mrw::AutoPtrAry is a replacement for std::auto_ptr. Other than
mrw::AutoPtr it is for arrays, that means, it calls @c delete[] 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. /** @brief Automatically closes a file when destructed.
@pre \#include <mrw/auto.hpp> @pre \#include <mrw/auto.hxx>
AutoFile works exactly like std::auto_ptr, but for files AutoFile works exactly like std::auto_ptr, but for files
instead of pointers. Whenever the context of AutoFile is left, 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 ::munmap((char*)res.first, res.second); // char* conversion for windoze cygwin compatibility
} }
/** @brief Automatically calls @c munmap on destruction for mmaped files. /** @brief Automatically calls @c munmap on destruction for mmaped files.
@pre \#include <mrw/auto.hpp> @pre \#include <mrw/auto.hxx>
It's the same as std::auto_ptr, but for @c mmap instead of @c 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 new. When the context of @c AutoMapper is left, @c munmap is
@@ -394,7 +394,7 @@ namespace mrw {
AutoMapper; AutoMapper;
/** @brief Automatically calls @c bfd_close for @c bfd*. /** @brief Automatically calls @c bfd_close for @c bfd*.
@pre \#include <mrw/auto.hpp> @pre \#include <mrw/auto.hxx>
It acts like a @c std::auto_ptr, but for @c bfd*, that means it It acts like a @c std::auto_ptr, but for @c bfd*, that means it
calls @c bfd_close whenever the context is left. 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. /** @brief Automatically calls @c free for @c malloc allocated memory.
Instanciate it as @c mrw::Auto<TYPE*>::Free. Instanciate it as @c mrw::Auto<TYPE*>::Free.
@pre \#include <mrw/auto.hpp> @pre \#include <mrw/auto.hxx>
It works like a @c std::auto_ptr, but for memory that was It works like a @c std::auto_ptr, but for memory that was
allocated with @c malloc, not @c new. Memory is freed, whenever allocated with @c malloc, not @c new. Memory is freed, whenever
src/mrw/auto_test.cpp
+3 -3
View File
@@ -17,7 +17,7 @@
Revision 1.3 2004/08/28 16:21:25 marc Revision 1.3 2004/08/28 16:21:25 marc
mrw-c++-0.92 (mrw) mrw-c++-0.92 (mrw)
- new file: version.cpp - new file: version.cxx
- new file header for all sources - new file header for all sources
- work around warning in mrw::auto<T> - work around warning in mrw::auto<T>
- possibility to compile without log4cxx - possibility to compile without log4cxx
@@ -29,8 +29,8 @@
- possibility to compile without stack trace - possibility to compile without stack trace
*/ */
#include <mrw/auto.hpp> #include <mrw/auto.hxx>
#include <mrw/stdext.hpp> // ifelse #include <mrw/stdext.hxx> // ifelse
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
#include <cppunit/ui/text/TestRunner.h> #include <cppunit/ui/text/TestRunner.h>
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
src/mrw/autofunctiontracelog4cxx.cpp
+2 -2
View File
@@ -16,11 +16,11 @@
#error GNU C++ Compiler is required for automatical function trace #error GNU C++ Compiler is required for automatical function trace
#endif #endif
#include <mrw/string.hpp> #include <mrw/string.hxx>
#include <sstream> #include <sstream>
#include <iomanip> #include <iomanip>
#include <mrw/stacktrace.hpp> #include <mrw/stacktrace.hxx>
#include <log4cxx/logger.h> #include <log4cxx/logger.h>
#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) \ #if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) \
src/mrw/autofunctiontracestdlog.cpp
+3 -3
View File
@@ -1,6 +1,6 @@
/** @file /** @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 $ $Date: 2005/04/14 19:12:18 $
$Author: marc $ $Author: marc $
@@ -16,8 +16,8 @@
#error GNU C++ Compiler is required for automatical function trace #error GNU C++ Compiler is required for automatical function trace
#endif #endif
#include <mrw/string.hpp> #include <mrw/string.hxx>
#include <mrw/stacktrace.hpp> #include <mrw/stacktrace.hxx>
#include <iostream> #include <iostream>
#include <iomanip> #include <iomanip>
src/mrw/autostacktracelog4cxx.cpp
+2 -2
View File
@@ -9,8 +9,8 @@
@license LGPL, see file <a href="license.html">COPYING</a> @license LGPL, see file <a href="license.html">COPYING</a>
*/ */
#include <mrw/stacktrace.hpp> #include <mrw/stacktrace.hxx>
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#include <csignal> #include <csignal>
#include <exception> #include <exception>
#include <log4cxx/logger.h> #include <log4cxx/logger.h>
src/mrw/autostacktracestderr.cpp
+2 -2
View File
@@ -9,8 +9,8 @@
@license LGPL, see file <a href="license.html">COPYING</a> @license LGPL, see file <a href="license.html">COPYING</a>
*/ */
#include <mrw/stacktrace.hpp> #include <mrw/stacktrace.hxx>
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#include <csignal> #include <csignal>
#include <exception> #include <exception>
#include <iostream> #include <iostream>
src/mrw/configfile.cpp
+5 -5
View File
@@ -13,7 +13,7 @@
make it compilable with gcc 4.0.2 and newer doxygen make it compilable with gcc 4.0.2 and newer doxygen
Revision 1.2 2005/01/28 07:49:32 marc 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 Revision 1.1 2005/01/07 00:31:38 marc
initial version initial version
@@ -23,10 +23,10 @@
5678901234567890123456789012345678901234567890123456789012345678901234567890 5678901234567890123456789012345678901234567890123456789012345678901234567890
*/ */
#include <mrw/configfile.hpp> #include <mrw/configfile.hxx>
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#include <mrw/string.hpp> #include <mrw/string.hxx>
#include <mrw/file.hpp> #include <mrw/file.hxx>
#include <fstream> #include <fstream>
mrw::ConfigFileReader::Value& mrw::ConfigFileReader::Value&
src/mrw/configfile.hpp
+3 -3
View File
@@ -13,7 +13,7 @@
make it compilable with gcc 4.0.2 and newer doxygen make it compilable with gcc 4.0.2 and newer doxygen
Revision 1.2 2005/01/28 07:49:32 marc 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 Revision 1.1 2005/01/07 00:31:38 marc
initial version initial version
@@ -30,7 +30,7 @@ namespace mrw {
/** @defgroup config Configuration File Handler /** @defgroup config Configuration File Handler
@pre \#include <mrw/configfile.hpp> @pre \#include <mrw/configfile.hxx>
Read configuration parameters from a file. Read configuration parameters from a file.
@@ -435,7 +435,7 @@ namespace mrw {
@bug Bug in GNU g++ compiler: @bug Bug in GNU g++ compiler:
return type should be <code>ConfigFileWriter&</code>, return type should be <code>ConfigFileWriter&</code>,
but the compiler sais:<br> but the compiler sais:<br>
<code>../mrw/configfile.hpp:295: <code>../mrw/configfile.hxx:295:
sorry, unimplemented: adjusting pointers for sorry, unimplemented: adjusting pointers for
covariant returns</code><br> covariant returns</code><br>
The problem is fixed since GNU g++ 3.4, so the signature The problem is fixed since GNU g++ 3.4, so the signature
src/mrw/configfile_test.cpp
+3 -3
View File
@@ -18,9 +18,9 @@
*/ */
#include <mrw/configfile.hpp> #include <mrw/configfile.hxx>
#include <mrw/file.hpp> #include <mrw/file.hxx>
#include <mrw/stdext.hpp> // ifelse #include <mrw/stdext.hxx> // ifelse
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
#include <cppunit/ui/text/TestRunner.h> #include <cppunit/ui/text/TestRunner.h>
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
src/mrw/deque.hpp
+4 -4
View File
@@ -27,8 +27,8 @@
#define __MRW__DEQUE__HPP__ #define __MRW__DEQUE__HPP__
#include <deque> #include <deque>
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#include <mrw/string.hpp> #include <mrw/string.hxx>
/** @addtogroup StdExtSTL /** @addtogroup StdExtSTL
*/ */
@@ -46,7 +46,7 @@
@param l a deque of values @param l a deque of values
@param o a value to be inserted into deque @c l @param o a value to be inserted into deque @c l
@pre \#include <mrw/deque.hpp> @pre \#include <mrw/deque.hxx>
*/ */
template <typename T, typename A> template <typename T, typename A>
std::deque<T, A>& operator<<(std::deque<T, A>& l, const T& o) throw(std::bad_exception) { std::deque<T, A>& operator<<(std::deque<T, A>& l, const T& o) throw(std::bad_exception) {
@@ -70,7 +70,7 @@ std::deque<T, A>& operator<<(std::deque<T, A>& l, const T& o) throw(std::bad_exc
@note when something is extracted from a deque, it is removed @note when something is extracted from a deque, it is removed
from the deque, that means after every shift the deque is from the deque, that means after every shift the deque is
shortened by the shifted element shortened by the shifted element
@pre \#include <mrw/deque.hpp> @pre \#include <mrw/deque.hxx>
*/ */
template <typename T, typename A> template <typename T, typename A>
std::deque<T, A>& operator>>(std::deque<T, A>& l, T& o) throw(std::exception) { std::deque<T, A>& operator>>(std::deque<T, A>& l, T& o) throw(std::exception) {
src/mrw/doxyfile.in
+7 -7
View File
@@ -27,7 +27,7 @@
## new aliases to document mutexes ## new aliases to document mutexes
## ##
## Revision 1.11 2005/02/18 15:54:31 marc ## 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 ## Revision 1.10 2004/10/13 11:27:00 marc
## removed deprecated tags ## removed deprecated tags
@@ -40,7 +40,7 @@
## ##
## Revision 1.7 2004/08/28 16:21:25 marc ## Revision 1.7 2004/08/28 16:21:25 marc
## mrw-c++-0.92 (mrw) ## mrw-c++-0.92 (mrw)
## - new file: version.cpp ## - new file: version.cxx
## - new file header for all sources ## - new file header for all sources
## - work around warning in mrw::auto<T> ## - work around warning in mrw::auto<T>
## - possibility to compile without log4cxx ## - 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 # 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 # directories like "/usr/src/myproject". Separate the files or directories
# with spaces. # with spaces.
INPUT = @top_srcdir@/mrw INPUT = @top_srcdir@/mrw
# If the value of the INPUT tag contains directories, you can use the # 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 # and *.h) to filter out the source-files in the directories. If left
# blank the following patterns are tested: # 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 # *.h++ *.idl *.odl *.cs
FILE_PATTERNS = FILE_PATTERNS =
@@ -451,7 +451,7 @@ EXCLUDE_PATTERNS = *_test*
EXAMPLE_PATH = @top_srcdir@ @srcdir@/examples EXAMPLE_PATH = @top_srcdir@ @srcdir@/examples
# If the value of the EXAMPLE_PATH tag contains directories, you can use the # 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 # and *.h) to filter out the source-files in the directories. If left
# blank all files are included. # blank all files are included.
@@ -912,7 +912,7 @@ SEARCH_INCLUDES = YES
INCLUDE_PATH = INCLUDE_PATH =
# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard # 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 # directories. If left blank, the patterns specified with FILE_PATTERNS will
# be used. # be used.
src/mrw/dynamiclibrary.hpp
+4 -4
View File
@@ -27,9 +27,9 @@
#define __MRW_DYNAMICLIBRARY_HPP__ #define __MRW_DYNAMICLIBRARY_HPP__
#include <ltdl.h> #include <ltdl.h>
#include <mrw/string.hpp> #include <mrw/string.hxx>
#include <mrw/stdext.hpp> #include <mrw/stdext.hxx>
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
namespace mrw { namespace mrw {
@@ -51,7 +51,7 @@ namespace mrw {
} }
@endcode @endcode
@pre \#include <mrw/dynamiclibrary.hpp> @pre \#include <mrw/dynamiclibrary.hxx>
@pre Files that use this wrapper must be linked with libltdl, @pre Files that use this wrapper must be linked with libltdl,
with GNU g++ on UNIX, this is link option: @c -lltdl with GNU g++ on UNIX, this is link option: @c -lltdl
src/mrw/dynamiclibrary_test.cpp
+1 -1
View File
@@ -17,7 +17,7 @@
5678901234567890123456789012345678901234567890123456789012345678901234567890 5678901234567890123456789012345678901234567890123456789012345678901234567890
*/ */
#include <mrw/dynamiclibrary.hpp> #include <mrw/dynamiclibrary.hxx>
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
#include <cppunit/ui/text/TestRunner.h> #include <cppunit/ui/text/TestRunner.h>
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
src/mrw/errno.cpp
+3 -3
View File
@@ -22,9 +22,9 @@
5678901234567890123456789012345678901234567890123456789012345678901234567890 5678901234567890123456789012345678901234567890123456789012345678901234567890
*/ */
#include <mrw/errno.hpp> #include <mrw/errno.hxx>
#include <mrw/string.hpp> #include <mrw/string.hxx>
#include <mrw/stdext.hpp> #include <mrw/stdext.hxx>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
src/mrw/errno.hpp
+3 -3
View File
@@ -26,7 +26,7 @@
#ifndef __MRW_ERRNO_HPP__ #ifndef __MRW_ERRNO_HPP__
#define __MRW_ERRNO_HPP__ #define __MRW_ERRNO_HPP__
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#include <string> #include <string>
#include <map> #include <map>
@@ -43,7 +43,7 @@ namespace mrw {
/** @brief Stores a UNIX errno error number and converts it to string. /** @brief Stores a UNIX errno error number and converts it to string.
@pre \#include <mrw/errno.hpp> */ @pre \#include <mrw/errno.hxx> */
class Errno { class Errno {
//................................................................ methods //................................................................ methods
@@ -78,7 +78,7 @@ namespace mrw {
/** @brief to be thrown when a unix system call fails, evaluates @c errno /** @brief to be thrown when a unix system call fails, evaluates @c errno
@pre \#include <mrw/errno.hpp> */ @pre \#include <mrw/errno.hxx> */
class unix_error: public mrw::runtime_error { class unix_error: public mrw::runtime_error {
src/mrw/exception.cpp
+3 -3
View File
@@ -11,7 +11,7 @@
$Log$ $Log$
Revision 1.2 2004/08/28 16:21:25 marc Revision 1.2 2004/08/28 16:21:25 marc
mrw-c++-0.92 (mrw) mrw-c++-0.92 (mrw)
- new file: version.cpp - new file: version.cxx
- new file header for all sources - new file header for all sources
- work around warning in mrw::auto<T> - work around warning in mrw::auto<T>
- possibility to compile without log4cxx - possibility to compile without log4cxx
@@ -23,10 +23,10 @@
- possibility to compile without stack trace - possibility to compile without stack trace
*/ */
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#ifdef HAVE_STACKTRACE #ifdef HAVE_STACKTRACE
# include <mrw/stacktrace.hpp> # include <mrw/stacktrace.hxx>
#else #else
namespace mrw { namespace mrw {
class StackTrace { class StackTrace {
src/mrw/exception.hpp
+9 -9
View File
@@ -36,7 +36,7 @@
Revision 1.4 2004/08/28 16:21:25 marc Revision 1.4 2004/08/28 16:21:25 marc
mrw-c++-0.92 (mrw) mrw-c++-0.92 (mrw)
- new file: version.cpp - new file: version.cxx
- new file header for all sources - new file header for all sources
- work around warning in mrw::auto<T> - work around warning in mrw::auto<T>
- possibility to compile without log4cxx - 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 It is possible to recover from an unexpected exception! A stack
trace helps you to find the source of a problem, here function 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: on line @c 25. This example produces the following output:
@verbatim @verbatim
@@ -116,10 +116,10 @@ UNEXPECTED:N3mrw9exceptionE
---------------------------Stack: ---------------------------Stack:
[ 0x8048e11] _start ../sysdeps/i386/elf/start.S:105 [ 0x8048e11] _start ../sysdeps/i386/elf/start.S:105
[0x4016e92b] __libc_start_main ????:0 [0x4016e92b] __libc_start_main ????:0
[ 0x8049392] main /.../mrw-c++/mrw/examples/exceptionhandling.cpp:50 [ 0x8049392] main /.../mrw-c++/mrw/examples/exceptionhandling.cxx:50
[ 0x8049265] fn0() /.../mrw-c++/mrw/examples/exceptionhandling.cpp:38 [ 0x8049265] fn0() /.../mrw-c++/mrw/examples/exceptionhandling.cxx:38
[ 0x80491e9] fn1() /.../mrw-c++/mrw/examples/exceptionhandling.cpp:32 [ 0x80491e9] fn1() /.../mrw-c++/mrw/examples/exceptionhandling.cxx:32
[ 0x8049183] fn2() /.../mrw-c++/mrw/examples/exceptionhandling.cpp:25 [ 0x8049183] fn2() /.../mrw-c++/mrw/examples/exceptionhandling.cxx:25
[0x400494a4] mrw::exception::exception() ????:0 [0x400494a4] mrw::exception::exception() ????:0
[0x4005ace5] mrw::StackTrace::StackTrace() ????: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 /** @brief replacement for @c std::exception, that collects a stack trace
@pre \#include <mrw/exception.hpp> @pre \#include <mrw/exception.hxx>
This exception class behaves exactely like @c std::exception, This exception class behaves exactely like @c std::exception,
but it collects a stack trace in the constructor and offers a 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(). catch mrw::exception and you can access @c what() and @c stacktrace().
For a proof of concept refer to 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 The unexpected handler is implemented ready to use in @ref
AutoTrace "a separate library". AutoTrace "a separate library".
src/mrw/exec.cpp
+4 -4
View File
@@ -41,7 +41,7 @@
Revision 1.4 2004/08/28 16:21:25 marc Revision 1.4 2004/08/28 16:21:25 marc
mrw-c++-0.92 (mrw) mrw-c++-0.92 (mrw)
- new file: version.cpp - new file: version.cxx
- new file header for all sources - new file header for all sources
- work around warning in mrw::auto<T> - work around warning in mrw::auto<T>
- possibility to compile without log4cxx - possibility to compile without log4cxx
@@ -53,9 +53,9 @@
- possibility to compile without stack trace - possibility to compile without stack trace
*/ */
#include <mrw/exec.hpp> #include <mrw/exec.hxx>
#include <mrw/unistd.hpp> #include <mrw/unistd.hxx>
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#include <sys/wait.h> // waitpid #include <sys/wait.h> // waitpid
#include <unistd.h> // fork, exec #include <unistd.h> // fork, exec
#include <string.h> // memcpy #include <string.h> // memcpy
src/mrw/exec.hpp
+7 -7
View File
@@ -26,7 +26,7 @@
Revision 1.3 2004/08/28 16:21:25 marc Revision 1.3 2004/08/28 16:21:25 marc
mrw-c++-0.92 (mrw) mrw-c++-0.92 (mrw)
- new file: version.cpp - new file: version.cxx
- new file header for all sources - new file header for all sources
- work around warning in mrw::auto<T> - work around warning in mrw::auto<T>
- possibility to compile without log4cxx - possibility to compile without log4cxx
@@ -44,8 +44,8 @@
#include <string> #include <string>
#include <list> #include <list>
#include <memory> #include <memory>
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#include <mrw/unistd.hpp> #include <mrw/unistd.hxx>
namespace mrw { namespace mrw {
@@ -99,7 +99,7 @@ namespace mrw {
//============================================================================ //============================================================================
/** @brief Exception: Execution of command failed. /** @brief Exception: Execution of command failed.
@pre \#include <mrw/exec.hpp> @pre \#include <mrw/exec.hxx>
This exception is thrown, if the exection of a command in This exception is thrown, if the exection of a command in
mrw::Exec is failed. That means, it was not possible to fork or 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. /** @brief Execute a command in a new process.
@pre \#include <mrw/exec.hpp> @pre \#include <mrw/exec.hxx>
This class handles the execution of a command in a new process 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 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. /** @brief Execute a UNIX program in non blocking parts.
@pre \#include <mrw/exec.hpp> @pre \#include <mrw/exec.hxx>
A given UNIX command is executed, but the class does not wait A given UNIX command is executed, but the class does not wait
until it is finished, instead it gives back the control to the 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 /** @brief A system command to be executed
@pre \#include <mrw/exec.hpp> @pre \#include <mrw/exec.hxx>
This class is used in conjunction with mrw::Exec. It must be This class is used in conjunction with mrw::Exec. It must be
initialized with the command name, then the command parameters initialized with the command name, then the command parameters
src/mrw/exec_test.cpp
+4 -4
View File
@@ -26,7 +26,7 @@
Revision 1.4 2004/08/28 16:21:25 marc Revision 1.4 2004/08/28 16:21:25 marc
mrw-c++-0.92 (mrw) mrw-c++-0.92 (mrw)
- new file: version.cpp - new file: version.cxx
- new file header for all sources - new file header for all sources
- work around warning in mrw::auto<T> - work around warning in mrw::auto<T>
- possibility to compile without log4cxx - possibility to compile without log4cxx
@@ -38,9 +38,9 @@
- possibility to compile without stack trace - possibility to compile without stack trace
*/ */
#include <mrw/exec.hpp> #include <mrw/exec.hxx>
#include <mrw/stacktrace.hpp> #include <mrw/stacktrace.hxx>
#include <mrw/stdext.hpp> #include <mrw/stdext.hxx>
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
#include <cppunit/ui/text/TestRunner.h> #include <cppunit/ui/text/TestRunner.h>
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
src/mrw/file.hpp
+3 -3
View File
@@ -19,7 +19,7 @@
correection in documentation correection in documentation
Revision 1.2 2005/01/28 07:49:32 marc 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 Revision 1.1 2005/01/07 00:31:38 marc
initial version initial version
@@ -31,8 +31,8 @@
#ifndef __MRW_FILE_HPP__ #ifndef __MRW_FILE_HPP__
#define __MRW_FILE_HPP__ #define __MRW_FILE_HPP__
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#include <mrw/errno.hpp> #include <mrw/errno.hxx>
#include <string> #include <string>
#include <fstream> #include <fstream>
#include <sys/types.h> #include <sys/types.h>
src/mrw/functiontrace.cpp
+1 -1
View File
@@ -17,6 +17,6 @@
5678901234567890123456789012345678901234567890123456789012345678901234567890 5678901234567890123456789012345678901234567890123456789012345678901234567890
*/ */
#include <mrw/functiontrace.hpp> #include <mrw/functiontrace.hxx>
unsigned int mrw::FnTrace::_level(0); unsigned int mrw::FnTrace::_level(0);
src/mrw/functiontrace.hpp
+2 -2
View File
@@ -56,7 +56,7 @@ namespace mrw {
//@{ //@{
/** @defgroup FunctionTrace Function Tracing (using log4cxx) /** @defgroup FunctionTrace Function Tracing (using log4cxx)
@pre \#include <mrw/functiontrace.hpp> @pre \#include <mrw/functiontrace.hxx>
Place the macro @ref MRW_METHOD as first line of all methods you want to 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 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: The trace of the following code:
@code @code
\#include <mrw/functiontrace.hpp> \#include <mrw/functiontrace.hxx>
\#include <log4cxx/basicconfigurator.h> \#include <log4cxx/basicconfigurator.h>
void fn(int i=0) { void fn(int i=0) {
MRW_FUNCTION("fn(int)"); // trace entry and exit MRW_FUNCTION("fn(int)"); // trace entry and exit
src/mrw/functiontrace_test.cpp
+23 -23
View File
@@ -23,9 +23,9 @@
5678901234567890123456789012345678901234567890123456789012345678901234567890 5678901234567890123456789012345678901234567890123456789012345678901234567890
*/ */
#include <mrw/functiontrace.hpp> #include <mrw/functiontrace.hxx>
#include <mrw/regexp.hpp> #include <mrw/regexp.hxx>
#include <mrw/file.hpp> #include <mrw/file.hxx>
#include <log4cxx/propertyconfigurator.h> #include <log4cxx/propertyconfigurator.h>
#include <log4cxx/helpers/properties.h> #include <log4cxx/helpers/properties.h>
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
@@ -96,26 +96,26 @@ class FunctionTraceTest: public CppUnit::TestFixture {
void Calls() { void Calls() {
fn(A()); fn(A());
mrw::RegExp match mrw::RegExp match
(".*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.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.cpp:[0-9]+ - \\\\ fn\\(A\\)\n" ".*functiontrace_test.cxx:[0-9]+ - \\\\ fn\\(A\\)\n"
".*functiontrace_test.cpp:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::fn1\\(\\)\n" ".*functiontrace_test.cxx:[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.cxx:[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.cxx:[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.cxx:[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.cxx:[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.cxx:[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.cxx:[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.cxx:[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.cxx:[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.cxx:[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.cxx:[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.cxx:[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.cxx:[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.cxx:[0-9]+ - *0x[0-9a-fA-F]+: / A::fn1\\(\\)\n"
".*functiontrace_test.cpp:[0-9]+ - / fn\\(A\\)\n" ".*functiontrace_test.cxx:[0-9]+ - / fn\\(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.cpp:[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"))); CPPUNIT_ASSERT(match(mrw::File::read("functiontrace_test.log")));
mrw::File::remove("functiontrace_test.log"); mrw::File::remove("functiontrace_test.log");
} }
src/mrw/list.hpp
+5 -5
View File
@@ -27,8 +27,8 @@
#define __MRW__LIST__HPP__ #define __MRW__LIST__HPP__
#include <list> #include <list>
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#include <mrw/string.hpp> #include <mrw/string.hxx>
/** @addtogroup StdExt /** @addtogroup StdExt
*/ */
@@ -65,7 +65,7 @@
@param l a list of values @param l a list of values
@param o a value to be inserted into list @c l @param o a value to be inserted into list @c l
@pre \#include <mrw/list.hpp> @pre \#include <mrw/list.hxx>
*/ */
// template <typename T, typename A, typename FROM> // template <typename T, typename A, typename FROM>
// std::list<T, A>& operator<<(std::list<T, A>& l, const FROM& o) // std::list<T, A>& operator<<(std::list<T, A>& l, const FROM& o)
@@ -89,7 +89,7 @@ template <typename T, typename A>
@param l a list of string values (that can be constructed from char*) @param l a list of string values (that can be constructed from char*)
@param o a value to be inserted into list @c l @param o a value to be inserted into list @c l
@pre \#include <mrw/list.hpp> */ @pre \#include <mrw/list.hxx> */
template <typename T, typename A> template <typename T, typename A>
std::list<T, A>& operator<<(std::list<T, A>& l, std::list<T, A>& operator<<(std::list<T, A>& l,
const char *const o) const char *const o)
@@ -114,7 +114,7 @@ template <typename T, typename A>
@note when something is extracted from a list, it is removed @note when something is extracted from a list, it is removed
from the list, that means after every shift the list is from the list, that means after every shift the list is
shortened by the shifted element shortened by the shifted element
@pre \#include <mrw/list.hpp> @pre \#include <mrw/list.hxx>
*/ */
template <typename T, typename A> template <typename T, typename A>
std::list<T, A>& operator>>(std::list<T, A>& l, T& o) throw(std::exception) { std::list<T, A>& operator>>(std::list<T, A>& l, T& o) throw(std::exception) {
src/mrw/makefile.am
+45 -45
View File
@@ -72,34 +72,34 @@ endif
endif endif
libmrw_la_SOURCES = \ libmrw_la_SOURCES = \
mrw.hpp version.cpp \ mrw.hxx version.cxx \
arg.cpp arg.hpp auto.hpp deque.hpp \ arg.cxx arg.hxx auto.hxx deque.hxx \
exception.cpp exception.hpp \ exception.cxx exception.hxx \
list.hpp \ list.hxx \
map.hpp multimap.hpp multiset.hpp \ map.hxx multimap.hxx multiset.hxx \
set.hpp \ set.hxx \
smartpointer.hpp stdext.cpp stdext.hpp \ smartpointer.hxx stdext.cxx stdext.hxx \
string.hpp unistd.hpp vector.hpp \ string.hxx unistd.hxx vector.hxx \
tokenizer.hpp \ tokenizer.hxx \
errno.hpp errno.cpp errno.hxx errno.cxx
if HAVE_DIR if HAVE_DIR
libmrw_la_SOURCES += file.hpp configfile.hpp configfile.cpp libmrw_la_SOURCES += file.hxx configfile.hxx configfile.cxx
endif endif
if HAVE_REGEXP if HAVE_REGEXP
libmrw_la_SOURCES += regexp.hpp regexp.cpp libmrw_la_SOURCES += regexp.hxx regexp.cxx
endif endif
if HAVE_EXEC if HAVE_EXEC
libmrw_la_SOURCES += exec.cpp exec.hpp libmrw_la_SOURCES += exec.cxx exec.hxx
endif endif
if HAVE_LTDL if HAVE_LTDL
libmrw_la_SOURCES += dynamiclibrary.hpp libmrw_la_SOURCES += dynamiclibrary.hxx
endif endif
if HAVE_LOG4CXX if HAVE_LOG4CXX
libmrw_la_SOURCES += functiontrace.cpp functiontrace.hpp libmrw_la_SOURCES += functiontrace.cxx functiontrace.hxx
endif endif
if HAVE_STACKTRACE if HAVE_STACKTRACE
libmrw_la_SOURCES += \ libmrw_la_SOURCES += \
stacktrace.hpp stacktrace.cpp stacktrace.hxx stacktrace.cxx
endif endif
libmrw_la_LDFLAGS = -version-info @LIB_VERSION@ libmrw_la_LDFLAGS = -version-info @LIB_VERSION@
libmrw_la_LIBADD = libmrw_la_LIBADD =
@@ -118,27 +118,27 @@ endif
endif endif
if HAVE_STACKTRACE 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_LDFLAGS = -version-info @LIB_VERSION@
libmrwexcstderr_la_LIBADD = $(top_builddir)/mrw/libmrw.la libmrwexcstderr_la_LIBADD = $(top_builddir)/mrw/libmrw.la
if HAVE_THREADS if HAVE_THREADS
if HAVE_BOOST_THREAD 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_CXXFLAGS = @THREADS@
libmrwexcstderr_mt_la_LDFLAGS = -version-info @LIB_VERSION@ @THREADS@ libmrwexcstderr_mt_la_LDFLAGS = -version-info @LIB_VERSION@ @THREADS@
libmrwexcstderr_mt_la_LIBADD = $(top_builddir)/mrw/libmrw-mt.la libmrwexcstderr_mt_la_LIBADD = $(top_builddir)/mrw/libmrw-mt.la
endif endif
endif endif
if AUTOFNTRACE if AUTOFNTRACE
libmrwautofunctiontracestdlog_la_SOURCES = autofunctiontracestdlog.cpp \ libmrwautofunctiontracestdlog_la_SOURCES = autofunctiontracestdlog.cxx \
version.cpp version.cxx
libmrwautofunctiontracestdlog_la_CXXFLAGS = -w libmrwautofunctiontracestdlog_la_CXXFLAGS = -w
libmrwautofunctiontracestdlog_la_LDFLAGS = -version-info @LIB_VERSION@ libmrwautofunctiontracestdlog_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwautofunctiontracestdlog_la_LIBADD = $(top_builddir)/mrw/libmrw.la libmrwautofunctiontracestdlog_la_LIBADD = $(top_builddir)/mrw/libmrw.la
if HAVE_THREADS if HAVE_THREADS
if HAVE_BOOST_THREAD if HAVE_BOOST_THREAD
libmrwautofunctiontracestdlog_mt_la_SOURCES = \ libmrwautofunctiontracestdlog_mt_la_SOURCES = \
autofunctiontracelog4cxx.cpp version.cpp autofunctiontracelog4cxx.cxx version.cxx
libmrwautofunctiontracestdlog_mt_la_CXXFLAGS = @THREADS@ -w libmrwautofunctiontracestdlog_mt_la_CXXFLAGS = @THREADS@ -w
libmrwautofunctiontracestdlog_mt_la_LDFLAGS = \ libmrwautofunctiontracestdlog_mt_la_LDFLAGS = \
-version-info @LIB_VERSION@ @THREADS@ -version-info @LIB_VERSION@ @THREADS@
@@ -148,27 +148,27 @@ endif
endif endif
endif endif
if HAVE_LOG4CXX 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_LDFLAGS = -version-info @LIB_VERSION@
libmrwexclog4cxx_la_LIBADD = $(top_builddir)/mrw/libmrw.la -llog4cxx libmrwexclog4cxx_la_LIBADD = $(top_builddir)/mrw/libmrw.la -llog4cxx
if HAVE_THREADS if HAVE_THREADS
if HAVE_BOOST_THREAD 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_CXXFLAGS = @THREADS@
libmrwexclog4cxx_mt_la_LDFLAGS = -version-info @LIB_VERSION@ @THREADS@ libmrwexclog4cxx_mt_la_LDFLAGS = -version-info @LIB_VERSION@ @THREADS@
libmrwexclog4cxx_mt_la_LIBADD = $(top_builddir)/mrw/libmrw-mt.la -llog4cxx libmrwexclog4cxx_mt_la_LIBADD = $(top_builddir)/mrw/libmrw-mt.la -llog4cxx
endif endif
endif endif
if AUTOFNTRACE if AUTOFNTRACE
libmrwautofunctiontracelog4cxx_la_SOURCES = autofunctiontracelog4cxx.cpp \ libmrwautofunctiontracelog4cxx_la_SOURCES = autofunctiontracelog4cxx.cxx \
version.cpp version.cxx
libmrwautofunctiontracelog4cxx_la_CXXFLAGS = -w libmrwautofunctiontracelog4cxx_la_CXXFLAGS = -w
libmrwautofunctiontracelog4cxx_la_LDFLAGS = -version-info @LIB_VERSION@ libmrwautofunctiontracelog4cxx_la_LDFLAGS = -version-info @LIB_VERSION@
libmrwautofunctiontracelog4cxx_la_LIBADD = $(top_builddir)/mrw/libmrw.la -llog4cxx libmrwautofunctiontracelog4cxx_la_LIBADD = $(top_builddir)/mrw/libmrw.la -llog4cxx
if HAVE_THREADS if HAVE_THREADS
if HAVE_BOOST_THREAD if HAVE_BOOST_THREAD
libmrwautofunctiontracelog4cxx_mt_la_SOURCES = \ libmrwautofunctiontracelog4cxx_mt_la_SOURCES = \
autofunctiontracelog4cxx.cpp version.cpp autofunctiontracelog4cxx.cxx version.cxx
libmrwautofunctiontracelog4cxx_mt_la_CXXFLAGS = @THREADS@ -w libmrwautofunctiontracelog4cxx_mt_la_CXXFLAGS = @THREADS@ -w
libmrwautofunctiontracelog4cxx_mt_la_LDFLAGS = \ libmrwautofunctiontracelog4cxx_mt_la_LDFLAGS = \
-version-info @LIB_VERSION@ @THREADS@ -version-info @LIB_VERSION@ @THREADS@
@@ -180,12 +180,12 @@ endif
endif endif
endif endif
if HAVE_LOG4CXX 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_LDFLAGS = -version-info @LIB_VERSION@
libmrwlog4cxxconfiguration_la_LIBADD = -llog4cxx libmrwlog4cxxconfiguration_la_LIBADD = -llog4cxx
if HAVE_THREADS if HAVE_THREADS
libmrwlog4cxxconfiguration_mt_la_SOURCES = log4cxxconfiguration.cpp \ libmrwlog4cxxconfiguration_mt_la_SOURCES = log4cxxconfiguration.cxx \
version.cpp version.cxx
libmrwlog4cxxconfiguration_mt_la_CXXFLAGS = @THREADS@ libmrwlog4cxxconfiguration_mt_la_CXXFLAGS = @THREADS@
libmrwlog4cxxconfiguration_mt_la_LDFLAGS = -version-info @LIB_VERSION@ \ libmrwlog4cxxconfiguration_mt_la_LDFLAGS = -version-info @LIB_VERSION@ \
@THREADS@ @THREADS@
@@ -228,7 +228,7 @@ endif
endif 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_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0
auto_test_CXXFLAGS = -g3 -O0 auto_test_CXXFLAGS = -g3 -O0
auto_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs auto_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs
@@ -236,7 +236,7 @@ auto_test_LDADD = $(top_builddir)/mrw/libmrw.la
if HAVE_STACKTRACE if HAVE_STACKTRACE
auto_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la auto_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la
endif 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_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0
smartpointer_test_CXXFLAGS = -g3 -O0 smartpointer_test_CXXFLAGS = -g3 -O0
smartpointer_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs smartpointer_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs
@@ -245,7 +245,7 @@ if HAVE_STACKTRACE
smartpointer_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la smartpointer_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la
endif endif
if HAVE_EXEC 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_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0
exec_test_CXXFLAGS = -g3 -O0 exec_test_CXXFLAGS = -g3 -O0
exec_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs exec_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs
@@ -254,7 +254,7 @@ if HAVE_STACKTRACE
exec_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la exec_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la
endif endif
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_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0
stdext_test_CXXFLAGS = -g3 -O0 stdext_test_CXXFLAGS = -g3 -O0
stdext_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs stdext_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs
@@ -262,7 +262,7 @@ stdext_test_LDADD = $(top_builddir)/mrw/libmrw.la
if HAVE_STACKTRACE if HAVE_STACKTRACE
stdext_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la stdext_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la
endif 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_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0
string_test_CXXFLAGS = -g3 -O0 string_test_CXXFLAGS = -g3 -O0
string_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs string_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs
@@ -271,7 +271,7 @@ if HAVE_STACKTRACE
string_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la string_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la
endif endif
if HAVE_REGEXP 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_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0
regexp_test_CXXFLAGS = -g3 -O0 regexp_test_CXXFLAGS = -g3 -O0
regexp_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs regexp_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs
@@ -280,7 +280,7 @@ if HAVE_STACKTRACE
regexp_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la regexp_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la
endif endif
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_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0
tokenizer_test_CXXFLAGS = -g3 -O0 tokenizer_test_CXXFLAGS = -g3 -O0
tokenizer_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs tokenizer_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs
@@ -289,7 +289,7 @@ if HAVE_STACKTRACE
tokenizer_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la tokenizer_test_LDADD += $(top_builddir)/mrw/libmrwexcstderr.la
endif endif
if HAVE_DIR 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_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0
configfile_test_CXXFLAGS = -g3 -O0 configfile_test_CXXFLAGS = -g3 -O0
configfile_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs configfile_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs
@@ -300,16 +300,16 @@ endif
endif endif
if HAVE_LTDL if HAVE_LTDL
check_LTLIBRARIES = libdynamiclibrary_testlib.la 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 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_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0
dynamiclibrary_test_CXXFLAGS = -g3 -O0 dynamiclibrary_test_CXXFLAGS = -g3 -O0
dynamiclibrary_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs dynamiclibrary_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs
dynamiclibrary_test_LDADD = $(top_builddir)/mrw/libmrw.la -lltdl dynamiclibrary_test_LDADD = $(top_builddir)/mrw/libmrw.la -lltdl
endif endif
if HAVE_LOG4CXX 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_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0
functiontrace_test_CXXFLAGS = -g3 -O0 functiontrace_test_CXXFLAGS = -g3 -O0
functiontrace_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs functiontrace_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs
@@ -319,25 +319,25 @@ if HAVE_STACKTRACE
endif endif
endif endif
if HAVE_STACKTRACE 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_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0
stacktrace_test_CXXFLAGS = -g3 -O0 stacktrace_test_CXXFLAGS = -g3 -O0
stacktrace_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs stacktrace_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs
stacktrace_test_LDADD = $(top_builddir)/mrw/libmrw.la $(top_builddir)/mrw/libmrwexcstderr.la 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_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0
mrwexcstderr_test_CXXFLAGS = -g3 -O0 mrwexcstderr_test_CXXFLAGS = -g3 -O0
mrwexcstderr_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs mrwexcstderr_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs
mrwexcstderr_test_LDADD = $(top_builddir)/mrw/libmrwexcstderr.la mrwexcstderr_test_LDADD = $(top_builddir)/mrw/libmrwexcstderr.la
if HAVE_LOG4CXX 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_CPPFLAGS = -I$(top_srcdir) @CPPUNIT_CFLAGS@ -g3 -O0
mrwexclog4cxx_test_CXXFLAGS = -g3 -O0 mrwexclog4cxx_test_CXXFLAGS = -g3 -O0
mrwexclog4cxx_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs mrwexclog4cxx_test_LDFLAGS = @CPPUNIT_LIBS@ -L.libs
mrwexclog4cxx_test_LDADD = $(top_builddir)/mrw/libmrwexclog4cxx.la -llog4cxx mrwexclog4cxx_test_LDADD = $(top_builddir)/mrw/libmrwexclog4cxx.la -llog4cxx
if AUTOFNTRACE if AUTOFNTRACE
mrwautofunctiontracelog4cxx_test_SOURCES = \ mrwautofunctiontracelog4cxx_test_SOURCES = \
mrwautofunctiontracelog4cxx_test.cpp version.cpp mrwautofunctiontracelog4cxx_test.cxx version.cxx
mrwautofunctiontracelog4cxx_test_CPPFLAGS = \ mrwautofunctiontracelog4cxx_test_CPPFLAGS = \
-I$(top_srcdir) @CPPUNIT_CFLAGS@ -finstrument-functions -g3 -O0 -I$(top_srcdir) @CPPUNIT_CFLAGS@ -finstrument-functions -g3 -O0
mrwautofunctiontracelog4cxx_test_CXXFLAGS = -g3 -O0 -finstrument-functions mrwautofunctiontracelog4cxx_test_CXXFLAGS = -g3 -O0 -finstrument-functions
@@ -348,7 +348,7 @@ if AUTOFNTRACE
if HAVE_THREADS if HAVE_THREADS
if HAVE_BOOST_THREAD if HAVE_BOOST_THREAD
mrwautofunctiontracelog4cxx_test_mt_SOURCES = \ mrwautofunctiontracelog4cxx_test_mt_SOURCES = \
mrwautofunctiontracelog4cxx_test.cpp version.cpp mrwautofunctiontracelog4cxx_test.cxx version.cxx
mrwautofunctiontracelog4cxx_test_mt_CPPFLAGS = \ mrwautofunctiontracelog4cxx_test_mt_CPPFLAGS = \
-I$(top_srcdir) @CPPUNIT_CFLAGS@ -finstrument-functions -g3 -O0 -I$(top_srcdir) @CPPUNIT_CFLAGS@ -finstrument-functions -g3 -O0
mrwautofunctiontracelog4cxx_test_mt_CXXFLAGS = -g3 -O0 \ mrwautofunctiontracelog4cxx_test_mt_CXXFLAGS = -g3 -O0 \
src/mrw/map.hpp
+4 -4
View File
@@ -27,8 +27,8 @@
#define __MRW__MAP__HPP__ #define __MRW__MAP__HPP__
#include <map> #include <map>
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#include <mrw/string.hpp> #include <mrw/string.hxx>
/** @addtogroup StdExtSTL /** @addtogroup StdExtSTL
*/ */
@@ -48,7 +48,7 @@
@throw mrw::invalid_argument, if element is already in map @throw mrw::invalid_argument, if element is already in map
@param l a map of values @param l a map of values
@param o a value to be inserted into map @c l @param o a value to be inserted into map @c l
@pre \#include <mrw/map.hpp> @pre \#include <mrw/map.hxx>
*/ */
template <typename K, typename T, class C, typename A> template <typename K, typename T, class C, typename A>
std::map<K, T, C, A>& operator<<(std::map<K, T, C, A>& l, const std::pair<K, T>& o) std::map<K, T, C, A>& operator<<(std::map<K, T, C, A>& l, const std::pair<K, T>& o)
@@ -78,7 +78,7 @@ std::map<K, T, C, A>& operator<<(std::map<K, T, C, A>& l, const std::pair<K, T>&
@note when something is extracted from a map, it is removed @note when something is extracted from a map, it is removed
from the map, that means after every shift the map is from the map, that means after every shift the map is
shortened by the shifted element shortened by the shifted element
@pre \#include <mrw/map.hpp> @pre \#include <mrw/map.hxx>
*/ */
template <typename K, typename T, class C, typename A> template <typename K, typename T, class C, typename A>
std::map<K, T, C, A>& operator>>(std::map<K, T, C, A>& l, std::pair<K, T>& o) std::map<K, T, C, A>& operator>>(std::map<K, T, C, A>& l, std::pair<K, T>& o)
src/mrw/mrw.hpp.in
+2 -2
View File
@@ -112,7 +112,7 @@
Include the headers you need with prefix @c mrw, e.g.: Include the headers you need with prefix @c mrw, e.g.:
@verbatim @verbatim
\#include <mrw/stacktrace.hpp> \#include <mrw/stacktrace.hxx>
@endverbatim @endverbatim
All classes are in the @c mrw namespace. All classes are in the @c mrw namespace.
@@ -125,7 +125,7 @@
program is multi threaded), e.g.: program is multi threaded), e.g.:
@verbatim @verbatim
g++ -g -o myprogram myprogram.cpp -lmrw g++ -g -o myprogram myprogram.cxx -lmrw
@endverbatim @endverbatim
For the @ref AutoTools "unexpected handler" you need to link to For the @ref AutoTools "unexpected handler" you need to link to
src/mrw/mrwautofunctiontracelog4cxx_test.cpp
+5 -5
View File
@@ -29,10 +29,10 @@
#include <cppunit/ui/text/TestRunner.h> #include <cppunit/ui/text/TestRunner.h>
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
#include <cppunit/extensions/TestFactoryRegistry.h> #include <cppunit/extensions/TestFactoryRegistry.h>
#include <mrw/file.hpp> #include <mrw/file.hxx>
#include <mrw/regexp.hpp> #include <mrw/regexp.hxx>
#include <mrw/string.hpp> #include <mrw/string.hxx>
#include <mrw/stacktrace.hpp> #include <mrw/stacktrace.hxx>
#include <map> #include <map>
#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) \ #if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) \
@@ -65,7 +65,7 @@ void anotherFunction() {
} }
#ifdef _MT #ifdef _MT
#include <boost/thread/thread.hpp> #include <boost/thread/thread.hxx>
//#include <unistd.h> // sleep, the one from boost::thread does not work! //#include <unistd.h> // sleep, the one from boost::thread does not work!
class Thread { class Thread {
public: public:
src/mrw/mrwexclog4cxx_test.cpp
+2 -2
View File
@@ -11,7 +11,7 @@
$Log$ $Log$
Revision 1.2 2004/08/28 16:21:25 marc Revision 1.2 2004/08/28 16:21:25 marc
mrw-c++-0.92 (mrw) mrw-c++-0.92 (mrw)
- new file: version.cpp - new file: version.cxx
- new file header for all sources - new file header for all sources
- work around warning in mrw::auto<T> - work around warning in mrw::auto<T>
- possibility to compile without log4cxx - possibility to compile without log4cxx
@@ -23,7 +23,7 @@
- possibility to compile without stack trace - possibility to compile without stack trace
*/ */
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#include <log4cxx/basicconfigurator.h> #include <log4cxx/basicconfigurator.h>
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
#include <cppunit/ui/text/TestRunner.h> #include <cppunit/ui/text/TestRunner.h>
src/mrw/mrwexcstderr_test.cpp
+2 -2
View File
@@ -11,7 +11,7 @@
$Log$ $Log$
Revision 1.2 2004/08/28 16:21:25 marc Revision 1.2 2004/08/28 16:21:25 marc
mrw-c++-0.92 (mrw) mrw-c++-0.92 (mrw)
- new file: version.cpp - new file: version.cxx
- new file header for all sources - new file header for all sources
- work around warning in mrw::auto<T> - work around warning in mrw::auto<T>
- possibility to compile without log4cxx - possibility to compile without log4cxx
@@ -23,7 +23,7 @@
- possibility to compile without stack trace - possibility to compile without stack trace
*/ */
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
#include <cppunit/ui/text/TestRunner.h> #include <cppunit/ui/text/TestRunner.h>
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
src/mrw/multimap.hpp
+4 -4
View File
@@ -27,8 +27,8 @@
#define __MRW__MULTIMAP__HPP__ #define __MRW__MULTIMAP__HPP__
#include <map> #include <map>
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#include <mrw/string.hpp> #include <mrw/string.hxx>
/** @addtogroup StdExtSTL /** @addtogroup StdExtSTL
*/ */
@@ -48,7 +48,7 @@
@throw mrw::invalid_argument, if element is already in multimap @throw mrw::invalid_argument, if element is already in multimap
@param l a multimap of values @param l a multimap of values
@param o a value to be inserted into multimap @c l @param o a value to be inserted into multimap @c l
@pre \#include <mrw/multimap.hpp> @pre \#include <mrw/multimap.hxx>
*/ */
template <typename K, typename T, class C, typename A> template <typename K, typename T, class C, typename A>
std::multimap<K, T, C, A>& operator<<(std::multimap<K, T, C, A>& l, const std::pair<K, T>& o) std::multimap<K, T, C, A>& operator<<(std::multimap<K, T, C, A>& l, const std::pair<K, T>& o)
@@ -74,7 +74,7 @@ std::multimap<K, T, C, A>& operator<<(std::multimap<K, T, C, A>& l, const std::p
@note when something is extracted from a multimap, it is removed @note when something is extracted from a multimap, it is removed
from the multimap, that means after every shift the multimap is from the multimap, that means after every shift the multimap is
shortened by the shifted element shortened by the shifted element
@pre \#include <mrw/multimap.hpp> @pre \#include <mrw/multimap.hxx>
*/ */
template <typename K, typename T, class C, typename A> template <typename K, typename T, class C, typename A>
std::multimap<K, T, C, A>& operator>>(std::multimap<K, T, C, A>& l, std::pair<K, T>& o) std::multimap<K, T, C, A>& operator>>(std::multimap<K, T, C, A>& l, std::pair<K, T>& o)
src/mrw/multiset.hpp
+4 -4
View File
@@ -27,8 +27,8 @@
#define __MRW__MULTISET__HPP__ #define __MRW__MULTISET__HPP__
#include <set> #include <set>
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#include <mrw/string.hpp> #include <mrw/string.hxx>
/** @addtogroup StdExtSTL /** @addtogroup StdExtSTL
*/ */
@@ -46,7 +46,7 @@
@param l a multiset of values @param l a multiset of values
@param o a value to be inserted into multiset @c l @param o a value to be inserted into multiset @c l
@pre \#include <mrw/multiset.hpp> @pre \#include <mrw/multiset.hxx>
*/ */
template <typename T, class C, typename A> template <typename T, class C, typename A>
std::multiset<T, C, A>& operator<<(std::multiset<T, C, A>& l, const T& o) throw(std::bad_exception) { std::multiset<T, C, A>& operator<<(std::multiset<T, C, A>& l, const T& o) throw(std::bad_exception) {
@@ -70,7 +70,7 @@ std::multiset<T, C, A>& operator<<(std::multiset<T, C, A>& l, const T& o) throw(
@note when something is extracted from a multiset, it is removed @note when something is extracted from a multiset, it is removed
from the multiset, that means after every shift the multiset is from the multiset, that means after every shift the multiset is
shortened by the shifted element shortened by the shifted element
@pre \#include <mrw/multiset.hpp> @pre \#include <mrw/multiset.hxx>
*/ */
template <typename T, class C, typename A> template <typename T, class C, typename A>
std::multiset<T, C, A>& operator>>(std::multiset<T, C, A>& l, T& o) throw(std::exception) { std::multiset<T, C, A>& operator>>(std::multiset<T, C, A>& l, T& o) throw(std::exception) {
src/mrw/regexp.cpp
+3 -3
View File
@@ -18,9 +18,9 @@
*/ */
#include <mrw/string.hpp> #include <mrw/string.hxx>
#include <mrw/regexp.hpp> #include <mrw/regexp.hxx>
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
namespace mrw { namespace mrw {
src/mrw/regexp.hpp
+1 -1
View File
@@ -50,7 +50,7 @@ namespace mrw {
//@{ //@{
/** @defgroup regexpregexp Regular Expressions /** @defgroup regexpregexp Regular Expressions
@pre \#include <mrw/regexp.hpp> @pre \#include <mrw/regexp.hxx>
A simple wrapper around the C POSIX regular expression library A simple wrapper around the C POSIX regular expression library
with a C++ Interface. with a C++ Interface.
src/mrw/regexp_test.cpp
+2 -2
View File
@@ -18,8 +18,8 @@
*/ */
#include <mrw/regexp.hpp> #include <mrw/regexp.hxx>
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
#include <cppunit/ui/text/TestRunner.h> #include <cppunit/ui/text/TestRunner.h>
src/mrw/set.hpp
+4 -4
View File
@@ -27,8 +27,8 @@
#define __MRW__SET__HPP__ #define __MRW__SET__HPP__
#include <set> #include <set>
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#include <mrw/string.hpp> #include <mrw/string.hxx>
/** @addtogroup StdExtSTL /** @addtogroup StdExtSTL
*/ */
@@ -47,7 +47,7 @@
@throw mrw::invalid_argument, if element is already in set @throw mrw::invalid_argument, if element is already in set
@param l a set of values @param l a set of values
@param o a value to be inserted into set @c l @param o a value to be inserted into set @c l
@pre \#include <mrw/set.hpp> @pre \#include <mrw/set.hxx>
*/ */
template <typename T, class C, typename A> template <typename T, class C, typename A>
std::set<T, C, A>& operator<<(std::set<T, C, A>& l, const T& o) std::set<T, C, A>& operator<<(std::set<T, C, A>& l, const T& o)
@@ -76,7 +76,7 @@ std::set<T, C, A>& operator<<(std::set<T, C, A>& l, const T& o)
@note when something is extracted from a set, it is removed @note when something is extracted from a set, it is removed
from the set, that means after every shift the set is from the set, that means after every shift the set is
shortened by the shifted element shortened by the shifted element
@pre \#include <mrw/set.hpp> @pre \#include <mrw/set.hxx>
*/ */
template <typename T, class C, typename A> template <typename T, class C, typename A>
std::set<T, C, A>& operator>>(std::set<T, C, A>& l, T& o) std::set<T, C, A>& operator>>(std::set<T, C, A>& l, T& o)
src/mrw/smartpointer.hpp
+1 -1
View File
@@ -49,7 +49,7 @@ namespace mrw {
//@{ //@{
/** @brief Smart Pointer Implementation /** @brief Smart Pointer Implementation
@pre \#include <mrw/smartpointer.hpp> @pre \#include <mrw/smartpointer.hxx>
This is a smart pointer that can be casted withing the This is a smart pointer that can be casted withing the
inheritance of the pointer it is storing. inheritance of the pointer it is storing.
src/mrw/smartpointer_test.cpp
+2 -2
View File
@@ -11,7 +11,7 @@
$Log$ $Log$
Revision 1.1 2004/08/28 16:13:42 marc Revision 1.1 2004/08/28 16:13:42 marc
mrw-c++-0.92 (mrw) mrw-c++-0.92 (mrw)
- new file: version.cpp - new file: version.cxx
- new file header for all sources - new file header for all sources
- work around warning in mrw::auto<T> - work around warning in mrw::auto<T>
- possibility to compile without log4cxx - possibility to compile without log4cxx
@@ -23,7 +23,7 @@
- possibility to compile without stack trace - possibility to compile without stack trace
*/ */
#include <mrw/smartpointer.hpp> #include <mrw/smartpointer.hxx>
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
#include <cppunit/ui/text/TestRunner.h> #include <cppunit/ui/text/TestRunner.h>
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
src/mrw/stacktrace.cpp
+6 -6
View File
@@ -9,13 +9,13 @@
@license LGPL, see file <a href="license.html">COPYING</a> @license LGPL, see file <a href="license.html">COPYING</a>
*/ */
#include <mrw/stacktrace.hpp> #include <mrw/stacktrace.hxx>
#include <mrw/exec.hpp> #include <mrw/exec.hxx>
#include <mrw/string.hpp> #include <mrw/string.hxx>
#include <mrw/list.hpp> #include <mrw/list.hxx>
#include <mrw/stdext.hpp> #include <mrw/stdext.hxx>
#ifndef NO_LTDL #ifndef NO_LTDL
# include <mrw/dynamiclibrary.hpp> # include <mrw/dynamiclibrary.hxx>
#endif #endif
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
src/mrw/stacktrace.hpp
+3 -3
View File
@@ -11,7 +11,7 @@
*/ */
#ifndef __MRW_STACKTRACE_HPP__ #ifndef __MRW_STACKTRACE_HPP__
#define __MRW_STACKTRACE_HPP__ #define __MRW_STACKTRACE_HPP__
#include <mrw/auto.hpp> #include <mrw/auto.hxx>
#include <vector> #include <vector>
#include <list> #include <list>
#include <map> #include <map>
@@ -26,7 +26,7 @@
#define _MT #define _MT
#endif #endif
#ifdef _MT #ifdef _MT
#include <boost/thread/recursive_mutex.hpp> #include <boost/thread/recursive_mutex.hxx>
#endif #endif
namespace mrw { namespace mrw {
@@ -74,7 +74,7 @@ namespace mrw {
//@{ //@{
/** @brief store and print a stack trace of the actual position in code /** @brief store and print a stack trace of the actual position in code
@pre \#include <mrw/stacktrace.hpp> @pre \#include <mrw/stacktrace.hxx>
In the constructor, a stack trace is stored, but not yet In the constructor, a stack trace is stored, but not yet
evaluated. Therefore storing a stack trace is relatively evaluated. Therefore storing a stack trace is relatively
src/mrw/stacktrace_test.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
5678901234567890123456789012345678901234567890123456789012345678901234567890 5678901234567890123456789012345678901234567890123456789012345678901234567890
*/ */
#include <mrw/stacktrace.hpp> #include <mrw/stacktrace.hxx>
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
#include <cppunit/ui/text/TestRunner.h> #include <cppunit/ui/text/TestRunner.h>
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
src/mrw/stdext.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
*/ */
#include <stdext.hpp> #include <stdext.hxx>
std::string mrw::getline(std::istream& is, char d) { std::string mrw::getline(std::istream& is, char d) {
std::string s; std::string s;
src/mrw/stdext.hpp
+3 -3
View File
@@ -61,7 +61,7 @@ namespace mrw {
@param a criteria that is checked and returned if not @c 0 @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 @param b alternative value to be returned if @c a is @c 0
@return <code>a&nbsp;?&nbsp;a&nbsp;:&nbsp;b</code> @return <code>a&nbsp;?&nbsp;a&nbsp;:&nbsp;b</code>
@pre \#include <mrw/stdext.hpp> @pre \#include <mrw/stdext.hxx>
@pre @c T must be convertible to @c bool @pre @c T must be convertible to @c bool
*/ */
template<typename T> const T& ifelse(const T& a, const T& b) { template<typename T> const T& ifelse(const T& a, const T& b) {
@@ -84,7 +84,7 @@ namespace mrw {
@param is the stream to read from @param is the stream to read from
@param d the end of line delimiter @param d the end of line delimiter
@return the line read from the stream @return the line read from the stream
@pre \#include <mrw/stdext.hpp> @pre \#include <mrw/stdext.hxx>
*/ */
std::string getline(std::istream& is, char d = '\n'); std::string getline(std::istream& is, char d = '\n');
@@ -98,7 +98,7 @@ namespace mrw {
@param d the end of line delimiter @param d the end of line delimiter
@return @c s: the line read from the stream @return @c s: the line read from the stream
@return the stream after extraction of line @return the stream after extraction of line
@pre \#include <mrw/stdext.hpp> @pre \#include <mrw/stdext.hxx>
*/ */
std::istream& getline(std::istream& is, std::string& s, char d = '\n'); std::istream& getline(std::istream& is, std::string& s, char d = '\n');
src/mrw/stdext_test.cpp
+9 -9
View File
@@ -20,15 +20,15 @@
*/ */
#include <mrw/string.hpp> #include <mrw/string.hxx>
#include <mrw/list.hpp> #include <mrw/list.hxx>
#include <mrw/vector.hpp> #include <mrw/vector.hxx>
#include <mrw/deque.hpp> #include <mrw/deque.hxx>
#include <mrw/set.hpp> #include <mrw/set.hxx>
#include <mrw/map.hpp> #include <mrw/map.hxx>
#include <mrw/multiset.hpp> #include <mrw/multiset.hxx>
#include <mrw/multimap.hpp> #include <mrw/multimap.hxx>
#include <mrw/stacktrace.hpp> #include <mrw/stacktrace.hxx>
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
#include <cppunit/ui/text/TestRunner.h> #include <cppunit/ui/text/TestRunner.h>
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
src/mrw/string.hpp
+24 -24
View File
@@ -36,7 +36,7 @@
#ifndef __MRW__STRING__HPP__ #ifndef __MRW__STRING__HPP__
#define __MRW__STRING__HPP__ #define __MRW__STRING__HPP__
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#include <string> #include <string>
#include <sstream> #include <sstream>
#include <list> #include <list>
@@ -186,7 +186,7 @@ namespace mrw {
@endcode @endcode
@param o a value to be converted to std::string @param o a value to be converted to std::string
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
@pre T must support operator<< to a stream @pre T must support operator<< to a stream
*/ */
template <typename T> std::string string(const T& o) template <typename T> std::string string(const T& o)
@@ -204,7 +204,7 @@ namespace mrw {
@throw mrw::invalid_argument if value can not be created from string @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 @param s the string where a value of type @c T is extracted from
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
@pre T must support operator>> from a stream @pre T must support operator>> from a stream
@pre operator>> from T must not throw anything else than std::exception @pre operator>> from T must not throw anything else than std::exception
@@ -223,7 +223,7 @@ namespace mrw {
@code @code
std::list<std::string> l; std::list<std::string> l;
l<<"hello"<<"world"; // needs mrw/list.hpp l<<"hello"<<"world"; // needs mrw/list.hxx
std::string hello_world(mrw::join(l)); std::string hello_world(mrw::join(l));
// hello_world is now "hello world" // hello_world is now "hello world"
@endcode @endcode
@@ -296,7 +296,7 @@ namespace mrw {
@param s the string, where o is appended @param s the string, where o is appended
@param o the value to append to @c s @param o the value to append to @c s
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
@pre T must support operator<< to a stream @pre T must support operator<< to a stream
*/ */
template <typename T> std::string& operator<<(std::string& s, const T& o) template <typename T> std::string& operator<<(std::string& s, const T& o)
@@ -320,7 +320,7 @@ template <typename T> std::string& operator<<(std::string& s, const T& o)
@note when something is extracted from a string, it is removed @note when something is extracted from a string, it is removed
from the string, that means after every shift the string is from the string, that means after every shift the string is
shortened by the shifted element shortened by the shifted element
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
@pre T must support operator>> from a stream @pre T must support operator>> from a stream
@note The signature has changed: @note The signature has changed:
@@ -343,7 +343,7 @@ template <typename T> std::string& operator>>(std::string& s, T& o)
@param s the string, where @c o is appended @param s the string, where @c o is appended
@param o the value to append to @c s @param o the value to append to @c s
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
*/ */
inline std::string operator+(const std::string& s, unsigned short o) inline std::string operator+(const std::string& s, unsigned short o)
throw(std::bad_exception) { 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 s the string, where @c o is prepended
@param o the value to prepend in front of @c s @param o the value to prepend in front of @c s
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
*/ */
inline std::string operator+(unsigned short o, const std::string& s) inline std::string operator+(unsigned short o, const std::string& s)
throw(std::bad_exception) { 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 s the string, where @c o is appended
@param o the value to append to @c s @param o the value to append to @c s
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
*/ */
inline std::string operator+(const std::string& s, unsigned int o) inline std::string operator+(const std::string& s, unsigned int o)
throw(std::bad_exception) { 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 s the string, where @c o is prepended
@param o the value to prepend in front of @c s @param o the value to prepend in front of @c s
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
*/ */
inline std::string operator+(unsigned int o, const std::string& s) inline std::string operator+(unsigned int o, const std::string& s)
throw(std::bad_exception) { 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 s the string, where @c o is appended
@param o the value to append to @c s @param o the value to append to @c s
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
*/ */
inline std::string operator+(const std::string& s, unsigned long o) inline std::string operator+(const std::string& s, unsigned long o)
throw(std::bad_exception) { 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 s the string, where @c o is prepended
@param o the value to prepend in front of @c s @param o the value to prepend in front of @c s
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
*/ */
inline std::string operator+(unsigned long o, const std::string& s) inline std::string operator+(unsigned long o, const std::string& s)
throw(std::bad_exception) { 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 s the string, where @c o is appended
@param o the value to append to @c s @param o the value to append to @c s
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
*/ */
inline std::string operator+(const std::string& s, signed short o) inline std::string operator+(const std::string& s, signed short o)
throw(std::bad_exception) { 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 s the string, where @c o is prepended
@param o the value to prepend in front of @c s @param o the value to prepend in front of @c s
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
*/ */
inline std::string operator+(signed short o, const std::string& s) inline std::string operator+(signed short o, const std::string& s)
throw(std::bad_exception) { 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 s the string, where @c o is appended
@param o the value to append to @c s @param o the value to append to @c s
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
*/ */
inline std::string operator+(const std::string& s, signed int o) inline std::string operator+(const std::string& s, signed int o)
throw(std::bad_exception) { 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 s the string, where @c o is prepended
@param o the value to prepend in front of @c s @param o the value to prepend in front of @c s
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
*/ */
inline std::string operator+(signed int o, const std::string& s) inline std::string operator+(signed int o, const std::string& s)
throw(std::bad_exception) { 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 s the string, where @c o is appended
@param o the value to append to @c s @param o the value to append to @c s
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
*/ */
inline std::string operator+(const std::string& s, signed long o) inline std::string operator+(const std::string& s, signed long o)
throw(std::bad_exception) { 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 s the string, where @c o is prepended
@param o the value to prepend in front of @c s @param o the value to prepend in front of @c s
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
*/ */
inline std::string operator+(signed long o, const std::string& s) inline std::string operator+(signed long o, const std::string& s)
throw(std::bad_exception) { 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 s the string, where @c o is appended
@param o the value to append to @c s @param o the value to append to @c s
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
*/ */
inline std::string& operator+=(std::string& s, unsigned short o) inline std::string& operator+=(std::string& s, unsigned short o)
throw(std::bad_exception) { 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 s the string, where @c o is appended
@param o the value to append to @c s @param o the value to append to @c s
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
*/ */
inline std::string& operator+=(std::string& s, unsigned int o) inline std::string& operator+=(std::string& s, unsigned int o)
throw(std::bad_exception) { 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 s the string, where @c o is appended
@param o the value to append to @c s @param o the value to append to @c s
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
*/ */
inline std::string& operator+=(std::string& s, unsigned long o) inline std::string& operator+=(std::string& s, unsigned long o)
throw(std::bad_exception) { 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 s the string, where @c o is appended
@param o the value to append to @c s @param o the value to append to @c s
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
*/ */
inline std::string& operator+=(std::string& s, signed short o) inline std::string& operator+=(std::string& s, signed short o)
throw(std::bad_exception) { 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 s the string, where @c o is appended
@param o the value to append to @c s @param o the value to append to @c s
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
*/ */
inline std::string& operator+=(std::string& s, signed int o) inline std::string& operator+=(std::string& s, signed int o)
throw(std::bad_exception) { 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 s the string, where @c o is appended
@param o the value to append to @c s @param o the value to append to @c s
@pre \#include <mrw/string.hpp> @pre \#include <mrw/string.hxx>
*/ */
inline std::string& operator+=(std::string& s, signed long o) inline std::string& operator+=(std::string& s, signed long o)
throw(std::bad_exception) { throw(std::bad_exception) {
src/mrw/string_test.cpp
+2 -2
View File
@@ -13,8 +13,8 @@
1 2 3 4 5 6 7 8 1 2 3 4 5 6 7 8
5678901234567890123456789012345678901234567890123456789012345678901234567890 5678901234567890123456789012345678901234567890123456789012345678901234567890
*/ */
#include <mrw/string.hpp> #include <mrw/string.hxx>
#include <mrw/list.hpp> #include <mrw/list.hxx>
#include <algorithm> #include <algorithm>
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
src/mrw/tokenizer.hpp
+1 -1
View File
@@ -22,7 +22,7 @@ namespace mrw {
//@{ //@{
/** @defgroup regexptokenizer Tokenizer /** @defgroup regexptokenizer Tokenizer
@pre \#include <mrw/tokenizer.hpp> @pre \#include <mrw/tokenizer.hxx>
There is a Tokenizer which splits strings according to a list of There is a Tokenizer which splits strings according to a list of
delimiters and allows to iterate over the individual tokens: delimiters and allows to iterate over the individual tokens:
src/mrw/tokenizer_test.cpp
+2 -2
View File
@@ -18,8 +18,8 @@
*/ */
#include <mrw/tokenizer.hpp> #include <mrw/tokenizer.hxx>
#include <mrw/list.hpp> #include <mrw/list.hxx>
#include <algorithm> #include <algorithm>
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
src/mrw/unistd.hpp
+2 -2
View File
@@ -22,7 +22,7 @@
Revision 1.5 2004/08/28 16:21:25 marc Revision 1.5 2004/08/28 16:21:25 marc
mrw-c++-0.92 (mrw) mrw-c++-0.92 (mrw)
- new file: version.cpp - new file: version.cxx
- new file header for all sources - new file header for all sources
- work around warning in mrw::auto<T> - work around warning in mrw::auto<T>
- possibility to compile without log4cxx - possibility to compile without log4cxx
@@ -52,7 +52,7 @@ namespace mrw {
//@{ //@{
/** @brief class that implements an unnamed UNIX pipe /** @brief class that implements an unnamed UNIX pipe
@pre \#include <mrw/unistd.hpp> @pre \#include <mrw/unistd.hxx>
Implements a UNIX pipe that is automatically closed in Implements a UNIX pipe that is automatically closed in
destructor and offers some facilities. */ destructor and offers some facilities. */
src/mrw/vector.hpp
+4 -4
View File
@@ -27,8 +27,8 @@
#define __MRW__VECTOR__HPP__ #define __MRW__VECTOR__HPP__
#include <vector> #include <vector>
#include <mrw/exception.hpp> #include <mrw/exception.hxx>
#include <mrw/string.hpp> #include <mrw/string.hxx>
/** @addtogroup StdExtSTL /** @addtogroup StdExtSTL
*/ */
@@ -46,7 +46,7 @@
@param l a vector of values @param l a vector of values
@param o a value to be inserted into vector @c l @param o a value to be inserted into vector @c l
@pre \#include <mrw/vector.hpp> @pre \#include <mrw/vector.hxx>
*/ */
template <typename T, typename A> template <typename T, typename A>
std::vector<T, A>& operator<<(std::vector<T, A>& l, const T& o) throw(std::bad_exception) { std::vector<T, A>& operator<<(std::vector<T, A>& l, const T& o) throw(std::bad_exception) {
@@ -70,7 +70,7 @@ std::vector<T, A>& operator<<(std::vector<T, A>& l, const T& o) throw(std::bad_e
@note when something is extracted from a vector, it is removed @note when something is extracted from a vector, it is removed
from the vector, that means after every shift the vector is from the vector, that means after every shift the vector is
shortened by the shifted element shortened by the shifted element
@pre \#include <mrw/vector.hpp> @pre \#include <mrw/vector.hxx>
*/ */
template <typename T, typename A> template <typename T, typename A>
std::vector<T, A>& operator>>(std::vector<T, A>& l, T& o) throw(std::exception) { std::vector<T, A>& operator>>(std::vector<T, A>& l, T& o) throw(std::exception) {
src/mrw/version.cpp.in
+1 -1
View File
@@ -14,7 +14,7 @@
Revision 1.1 2004/08/28 16:13:42 marc Revision 1.1 2004/08/28 16:13:42 marc
mrw-c++-0.92 (mrw) mrw-c++-0.92 (mrw)
- new file: version.cpp - new file: version.cxx
- new file header for all sources - new file header for all sources
- work around warning in mrw::auto<T> - work around warning in mrw::auto<T>
- possibility to compile without log4cxx - possibility to compile without log4cxx