Skip to content

GitLab

Commit 6a46f47a authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Removed module Log.cc/userlog.cc.

parent 7072b2c2
Expand all Hide whitespace changes
Inline Side-by-side
src/Log.cc deleted 100644 → 0
View file @ 7072b2c2
/*
This file is part of CDO. CDO is a collection of Operators to
manipulate and analyse Climate model Data.
Copyright (C) 2003-2017 Uwe Schulzweida, <uwe.schulzweida AT mpimet.mpg.de>
See COPYING file for copying and redistribution conditions.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
*/
#include "cdo.h"
#include "cdo_int.h"
void dumplogs(const char *logfilename);
void daylogs(const char *logfilename);
void monlogs(const char *logfilename);
void dumplogo(const char *logfilename, int dumptype);
void *Log(void *argument)
{
cdoInitialize(argument);
// clang-format off
int DUMPLOGS = cdoOperatorAdd("dumplogs", 0, 0, NULL);
int DAYLOGS = cdoOperatorAdd("daylogs", 0, 0, NULL);
int MONLOGS = cdoOperatorAdd("monlogs", 0, 0, NULL);
cdoOperatorAdd("dumplogo", 1, 0, NULL);
cdoOperatorAdd("snamelogo", 1, 1, NULL);
cdoOperatorAdd("scalllogo", 1, 2, NULL);
cdoOperatorAdd("smemlogo", 1, 3, NULL);
cdoOperatorAdd("stimelogo", 1, 4, NULL);
cdoOperatorAdd("sperclogo", 1, 5, NULL);
// clang-format on
int operatorID = cdoOperatorID();
int operfunc = cdoOperatorF1(operatorID);
int dumptype = cdoOperatorF2(operatorID);
if ( cdoStreamName(0)->args[0] == '-' )
cdoAbort("This operator does not work with pipes!");
if ( operatorID == DUMPLOGS )
{
dumplogs(cdoStreamName(0)->args);
}
else if ( operatorID == DAYLOGS )
{
daylogs(cdoStreamName(0)->args);
}
else if ( operatorID == MONLOGS )
{
monlogs(cdoStreamName(0)->args);
}
else if ( operfunc == 1 )
{
dumplogo(cdoStreamName(0)->args, dumptype);
}
cdoFinish();
return 0;
}
src/Makefile.am
View file @ 6a46f47a
......@@ -170,7 +170,6 @@ libcdo_la_SOURCES = \
text.h \
timebase.h \
timer.cc \
userlog.cc \
util.cc \
util.h \
varlist.h \
......@@ -286,7 +285,6 @@ cdo_SOURCES += Adisit.cc \
Invert.cc \
Invertlev.cc \
Isosurface.cc \
Log.cc \
MapReduce.cc \
Maskbox.cc \
Mastrfu.cc \
......@@ -445,11 +443,6 @@ if ENABLE_ALL_STATIC
cdotest_LDFLAGS += -all-static
endif
#cdo-userlog.o: userlog.cc config.h
# $(COMPILE) -DLOGPATH=${exec_prefix}/log -c -o cdo-userlog.o `test -f 'userlog.cc' || echo '$(srcdir)/'`userlog.cc
#cdo_static-userlog.o: userlog.cc config.h
# $(COMPILE) -DLOGPATH=${exec_prefix}/log -c -o cdo_static-userlog.o `test -f 'userlog.cc' || echo '$(srcdir)/'`userlog.cc
#
CLEANFILES = `ls *~ 2> /dev/null`
#
clean-local: clean-local-dirs
......
src/Makefile.in
View file @ 6a46f47a
......@@ -154,8 +154,7 @@ am_libcdo_la_OBJECTS = libcdo_la-argument.lo libcdo_la-array.lo \
libcdo_la-remap_bilinear_scrip.lo libcdo_la-stdnametable.lo \
libcdo_la-specspace.lo libcdo_la-statistic.lo \
libcdo_la-table.lo libcdo_la-text.lo libcdo_la-timer.lo \
libcdo_la-userlog.lo libcdo_la-util.lo \
libcdo_la-zaxis_print.lo libcdo_la-zaxis.lo \
libcdo_la-util.lo libcdo_la-zaxis_print.lo libcdo_la-zaxis.lo \
json/libcdo_la-jsmn.lo kdtreelib/libcdo_la-kdtree_cartesian.lo \
kdtreelib/libcdo_la-kdtree_common.lo \
kdtreelib/libcdo_la-kdtree_spherical.lo \
......@@ -209,14 +208,13 @@ am_cdo_OBJECTS = cdo-cdo.$(OBJEXT) cdo-Adisit.$(OBJEXT) \
cdo-Intlevel3d.$(OBJEXT) cdo-Intntime.$(OBJEXT) \
cdo-Inttime.$(OBJEXT) cdo-Intyear.$(OBJEXT) \
cdo-Invert.$(OBJEXT) cdo-Invertlev.$(OBJEXT) \
cdo-Isosurface.$(OBJEXT) cdo-Log.$(OBJEXT) \
cdo-MapReduce.$(OBJEXT) cdo-Maskbox.$(OBJEXT) \
cdo-Mastrfu.$(OBJEXT) cdo-Math.$(OBJEXT) cdo-Merge.$(OBJEXT) \
cdo-Mergegrid.$(OBJEXT) cdo-Mergetime.$(OBJEXT) \
cdo-Merstat.$(OBJEXT) cdo-Monarith.$(OBJEXT) \
cdo-Mrotuv.$(OBJEXT) cdo-Mrotuvb.$(OBJEXT) \
cdo-NCL_wind.$(OBJEXT) cdo-Ninfo.$(OBJEXT) \
cdo-Nmldump.$(OBJEXT) cdo-Output.$(OBJEXT) \
cdo-Isosurface.$(OBJEXT) cdo-MapReduce.$(OBJEXT) \
cdo-Maskbox.$(OBJEXT) cdo-Mastrfu.$(OBJEXT) cdo-Math.$(OBJEXT) \
cdo-Merge.$(OBJEXT) cdo-Mergegrid.$(OBJEXT) \
cdo-Mergetime.$(OBJEXT) cdo-Merstat.$(OBJEXT) \
cdo-Monarith.$(OBJEXT) cdo-Mrotuv.$(OBJEXT) \
cdo-Mrotuvb.$(OBJEXT) cdo-NCL_wind.$(OBJEXT) \
cdo-Ninfo.$(OBJEXT) cdo-Nmldump.$(OBJEXT) cdo-Output.$(OBJEXT) \
cdo-Outputgmt.$(OBJEXT) cdo-Pack.$(OBJEXT) \
cdo-Pardup.$(OBJEXT) cdo-Pinfo.$(OBJEXT) \
cdo-Pressure.$(OBJEXT) cdo-Regres.$(OBJEXT) \
......@@ -582,13 +580,12 @@ libcdo_la_SOURCES = argument.h argument.cc array.h array.cc cdo_int.h \
remap_bicubic_scrip.cc remap_bilinear_scrip.cc stdnametable.cc \
stdnametable.h specspace.cc specspace.h statistic.cc \
statistic.h table.cc text.cc text.h timebase.h timer.cc \
userlog.cc util.cc util.h varlist.h zaxis_print.cc zaxis.cc \
json/jsmn.h json/jsmn.c kdtreelib/kdtree.h \
kdtreelib/kdtree_cartesian.cc kdtreelib/kdtree_common.cc \
kdtreelib/kdtree_spherical.cc kdtreelib/qsort.cc \
kdtreelib/pmergesort.cc kdtreelib/pqueue.cc kdtreelib/pqueue.h \
clipping/clipping.c clipping/clipping.h clipping/area.c \
clipping/area.h clipping/ensure_array_size.c \
util.cc util.h varlist.h zaxis_print.cc zaxis.cc json/jsmn.h \
json/jsmn.c kdtreelib/kdtree.h kdtreelib/kdtree_cartesian.cc \
kdtreelib/kdtree_common.cc kdtreelib/kdtree_spherical.cc \
kdtreelib/qsort.cc kdtreelib/pmergesort.cc kdtreelib/pqueue.cc \
kdtreelib/pqueue.h clipping/clipping.c clipping/clipping.h \
clipping/area.c clipping/area.h clipping/ensure_array_size.c \
clipping/ensure_array_size.h clipping/geometry.h \
clipping/grid.h clipping/points.h clipping/dep_list.h \
clipping/grid_cell.c clipping/grid_cell.h \
......@@ -612,7 +609,7 @@ cdo_SOURCES = cdo.cc Adisit.cc Afterburner.cc Arith.cc Arithc.cc \
Importcmsaf.cc Importobs.cc Info.cc Input.cc Intgrid.cc \
Intgridtraj.cc Intlevel.cc Intlevel3d.cc Intntime.cc \
Inttime.cc Intyear.cc Invert.cc Invertlev.cc Isosurface.cc \
Log.cc MapReduce.cc Maskbox.cc Mastrfu.cc Math.cc Merge.cc \
MapReduce.cc Maskbox.cc Mastrfu.cc Math.cc Merge.cc \
Mergegrid.cc Mergetime.cc Merstat.cc Monarith.cc Mrotuv.cc \
Mrotuvb.cc NCL_wind.cc Ninfo.cc Nmldump.cc Output.cc \
Outputgmt.cc Pack.cc Pardup.cc Pinfo.cc Pressure.cc Regres.cc \
......@@ -653,12 +650,6 @@ cdotest_SOURCES = cdo_int.h \
cdotest_LDADD = $(cdo_LDADD)
cdotest_CPPFLAGS = $(cdo_CPPFLAGS)
cdotest_LDFLAGS = $(cdo_LDFLAGS) $(am__append_3)
#cdo-userlog.o: userlog.cc config.h
# $(COMPILE) -DLOGPATH=${exec_prefix}/log -c -o cdo-userlog.o `test -f 'userlog.cc' || echo '$(srcdir)/'`userlog.cc
#cdo_static-userlog.o: userlog.cc config.h
# $(COMPILE) -DLOGPATH=${exec_prefix}/log -c -o cdo_static-userlog.o `test -f 'userlog.cc' || echo '$(srcdir)/'`userlog.cc
#
CLEANFILES = `ls *~ 2> /dev/null`
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
......@@ -926,7 +917,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-Invert.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-Invertlev.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-Isosurface.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-Log.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-Maggraph.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-Magplot.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-Magvector.Po@am__quote@
......@@ -1150,7 +1140,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-table.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-text.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-timer.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-userlog.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-util.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-zaxis.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdo_la-zaxis_print.Plo@am__quote@
......@@ -1944,13 +1933,6 @@ libcdo_la-timer.lo: timer.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcdo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libcdo_la-timer.lo `test -f 'timer.cc' || echo '$(srcdir)/'`timer.cc
 
libcdo_la-userlog.lo: userlog.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcdo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libcdo_la-userlog.lo -MD -MP -MF $(DEPDIR)/libcdo_la-userlog.Tpo -c -o libcdo_la-userlog.lo `test -f 'userlog.cc' || echo '$(srcdir)/'`userlog.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcdo_la-userlog.Tpo $(DEPDIR)/libcdo_la-userlog.Plo
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='userlog.cc' object='libcdo_la-userlog.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcdo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libcdo_la-userlog.lo `test -f 'userlog.cc' || echo '$(srcdir)/'`userlog.cc
libcdo_la-util.lo: util.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcdo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libcdo_la-util.lo -MD -MP -MF $(DEPDIR)/libcdo_la-util.Tpo -c -o libcdo_la-util.lo `test -f 'util.cc' || echo '$(srcdir)/'`util.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcdo_la-util.Tpo $(DEPDIR)/libcdo_la-util.Plo
......@@ -3120,20 +3102,6 @@ cdo-Isosurface.obj: Isosurface.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cdo_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cdo-Isosurface.obj `if test -f 'Isosurface.cc'; then $(CYGPATH_W) 'Isosurface.cc'; else $(CYGPATH_W) '$(srcdir)/Isosurface.cc'; fi`
 
cdo-Log.o: Log.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cdo_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cdo-Log.o -MD -MP -MF $(DEPDIR)/cdo-Log.Tpo -c -o cdo-Log.o `test -f 'Log.cc' || echo '$(srcdir)/'`Log.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cdo-Log.Tpo $(DEPDIR)/cdo-Log.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Log.cc' object='cdo-Log.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cdo_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cdo-Log.o `test -f 'Log.cc' || echo '$(srcdir)/'`Log.cc
cdo-Log.obj: Log.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cdo_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cdo-Log.obj -MD -MP -MF $(DEPDIR)/cdo-Log.Tpo -c -o cdo-Log.obj `if test -f 'Log.cc'; then $(CYGPATH_W) 'Log.cc'; else $(CYGPATH_W) '$(srcdir)/Log.cc'; fi`
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cdo-Log.Tpo $(DEPDIR)/cdo-Log.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Log.cc' object='cdo-Log.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cdo_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cdo-Log.obj `if test -f 'Log.cc'; then $(CYGPATH_W) 'Log.cc'; else $(CYGPATH_W) '$(srcdir)/Log.cc'; fi`
cdo-MapReduce.o: MapReduce.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cdo_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cdo-MapReduce.o -MD -MP -MF $(DEPDIR)/cdo-MapReduce.Tpo -c -o cdo-MapReduce.o `test -f 'MapReduce.cc' || echo '$(srcdir)/'`MapReduce.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cdo-MapReduce.Tpo $(DEPDIR)/cdo-MapReduce.Po
......
src/cdo.cc
View file @ 6a46f47a
......@@ -757,17 +757,6 @@ void get_env_vars(void)
}
}
envstr = getenv("CDO_LOG_OFF");
if ( envstr )
{
if ( atoi(envstr) == 1 )
{
cdoLogOff = TRUE;
if ( cdoVerbose )
fprintf(stderr, "CDO_LOG_OFF = %s\n", envstr);
}
}
envstr = getenv("CDO_DISABLE_HISTORY");
if ( envstr )
{
......@@ -1554,7 +1543,6 @@ void init_modules()
add_module("Invert" , {Invert , InvertHelp , InvertOperators , 1 , CDI_REAL , 1 , 1 });
add_module("Invertlev" , {Invertlev , InvertlevHelp , InvertlevOperators , 1 , CDI_REAL , 1 , 1 });
add_module("Isosurface" , {Isosurface , {} , IsosurfaceOperators , 1 , CDI_REAL , 1 , 1 });
add_module("Log" , {Log , {} , LogOperators , 0 , CDI_REAL , 1 , 0 });
add_module("MapReduce" , {MapReduce , MapReduceHelp , MapReduceOperators , 1 , CDI_REAL , 1 , 1 });
add_module("Maskbox" , {Maskbox , MaskboxHelp , MaskboxOperators , 1 , CDI_REAL , 1 , 1 });
add_module("Maskregion" , {Maskbox , MaskregionHelp , MaskregionOperators , 1 , CDI_REAL , 1 , 1 });
......
src/cdo_int.h
View file @ 6a46f47a
......@@ -140,9 +140,6 @@ void cdo_set_grids(const char *gridarg);
void defineInstitution(const char *instarg);
int defineTable(const char *tablearg);
void cdolog(const char *prompt, double cputime);
void cdologs(int noper);
void cdologo(int noper);
void nospec(int vlistID);
void gridWrite(FILE *fp, int gridID);
......
src/operator_definitions.h
View file @ 6a46f47a
......@@ -80,7 +80,6 @@
#define InvertOperators {"invertlat", "invertlon", "invertlatdes", "invertlondes", "invertlatdata", "invertlondata"}
#define InvertlevOperators {"invertlev"}
#define IsosurfaceOperators {"isosurface"}
#define LogOperators {"dumplogs", "daylogs", "monlogs", "dumplogo", "snamelogo", "scalllogo", "smemlogo", "stimelogo", "sperclogo"}
#define MapReduceOperators {"reducegrid"}
#define MaskboxOperators {"masklonlatbox", "maskindexbox"}
#define MaskregionOperators {"maskregion"}
......
src/process.cc
View file @ 6a46f47a
......@@ -1372,13 +1372,6 @@ void cdoFinish(void)
processEndTime(&p_usertime, &p_systime);
p_cputime = p_usertime + p_systime;
if (cdoLogOff == 0)
{
cdologs(processNums());
cdologo(processNums());
cdolog(processInqPrompt(), p_cputime);
}
}
#if defined(HAVE_SYS_TIMES_H)
......
src/userlog.cc deleted 100644 → 0
View file @ 7072b2c2
This diff is collapsed.
src/util.cc
View file @ 6a46f47a
......@@ -91,7 +91,6 @@ int cdoCompType = CDI_COMPRESS_NONE; // compression type
int cdoCompLevel = 0; // compression level
int cdoDebug = 0;
int cdoChunkType = CDI_UNDEFID;
int cdoLogOff = FALSE;
int cdoSilentMode = FALSE;
int cdoOverwriteMode = FALSE;
int cdoBenchmark = FALSE;
......
src/util.h
View file @ 6a46f47a
......@@ -15,11 +15,12 @@
GNU General Public License for more details.
*/
#ifndef _UTIL_H
#define _UTIL_H
#ifndef UTIL_H
#define UTIL_H
#include <stdio.h>
#include <stdbool.h>
#include <string>
#include "percentiles.h"
/* dummy use of unused parameters to silence compiler warnings */
......@@ -44,7 +45,6 @@
#define UNCHANGED_RECORD (processSelf().m_ID == 0 && cdoStreamName(0)->argv[0][0] != '-' && cdoRegulargrid == FALSE && cdoDefaultFileType == -1 && cdoDefaultDataType == -1 && cdoDefaultByteorder == -1 )
#include <string>
extern const char *CDO_progname;
extern const char *CDO_version;
extern const char *CDO_username;
......@@ -78,7 +78,6 @@ extern int cdoDefaultByteorder;
extern int cdoDefaultTableID;
extern int cdoDefaultInstID;
extern int cdoDefaultTimeType;
extern int cdoLogOff;
extern int cdoLockIO;
extern int cdoCheckDatarange;
......@@ -221,4 +220,4 @@ int wildcardmatch(const char *w, const char *s);
void cdo_check_round(void);
#endif /* _UTIL_H */
#endif /* UTIL_H */
Markdown is supported
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

Imprint | Privacy Policy