Commit fdc0852d authored by thomas.forbriger's avatar thomas.forbriger Committed by thomas.forbriger
Browse files

resolved conflicting include guards and debug macro name

This is a legacy commit from before 2015-03-01.
It may be incomplete as well as inconsistent.
See COPYING.legacy and README.history for details.


SVN Path:     http://gpitrsvn.gpi.uni-karlsruhe.de/repos/TFSoftware/branches/libdatrwxx.su
SVN Revision: 3443
SVN UUID:     67feda4a-a26e-11df-9d6e-31afc202ad0c
parent 5bca49f0
......@@ -38,11 +38,11 @@
*/
// include guard
#ifndef DATRW_DATRW_H_VERSION
#ifndef DATRW_DATREAD_H_VERSION
#define DATRW_DATRW_H_VERSION \
"DATRW_DATRW_H V1.3"
#define DATRW_DATRW_H_CVSID \
#define DATRW_DATREAD_H_VERSION \
"DATRW_DATREAD_H V1.3"
#define DATRW_DATREAD_H_CVSID \
"$Id$"
#include<iostream>
......@@ -157,6 +157,6 @@ namespace datrw {
} // namespace datrw
#endif // DATRW_DATRW_H_VERSION (includeguard)
#endif // DATRW_DATREAD_H_VERSION (includeguard)
/* ----- END OF datrw.h ----- */
......@@ -35,11 +35,11 @@
*/
// include guard
#ifndef DATRW_DATRW_H_VERSION
#ifndef DATRW_DATWRITE_H_VERSION
#define DATRW_DATRW_H_VERSION \
#define DATRW_DATWRITE_H_VERSION \
"TF_DATRW_H V1.0 "
#define DATRW_DATRW_H_CVSID \
#define DATRW_DATWRITE_H_CVSID \
"$Id$"
#include<string>
......@@ -158,6 +158,6 @@ namespace datrw {
} // namespace datrw
#endif // DATRW_DATRW_H_VERSION (includeguard)
#endif // DATRW_DATWRITE_H_VERSION (includeguard)
/* ----- END OF datrw.h ----- */
......@@ -44,6 +44,7 @@
#include<datrwxx/datread.h>
#include<datrwxx/datwrite.h>
#include<datrwxx/reservoir.h>
namespace datrw {
......
......@@ -99,7 +99,7 @@ namespace datrw {
* \param N name of function
* \param M message to print
*/
#define DATWRITE_debug(C,N,M) \
#define DATRW_debug(C,N,M) \
if (C) { \
std::cerr << "DEBUG (" << N << ", " \
<< __FILE__ << " line #" << __LINE__ << "):" << std::endl \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment