<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dbc44d5e2096fc22b8d8b2fa876a1891f808174c">https://github.com/macports/macports-ports/commit/dbc44d5e2096fc22b8d8b2fa876a1891f808174c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new dbc44d5 gds: Modified for C++ 2017 standard
</span>dbc44d5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit dbc44d5e2096fc22b8d8b2fa876a1891f808174c
</span>Author: emaros <ed.maros@ligo.org>
AuthorDate: Tue Apr 17 13:52:25 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gds: Modified for C++ 2017 standard
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * XCode 9.3 enforces more of the C++ 2017 standard
</span>---
science/gds/Portfile | 3 +
.../patch-Monitors-PulsarMon-PulsarMon.cc.diff | 17 --
science/gds/files/patch-std_cplusplus_2017.diff | 179 +++++++++++++++++++++
3 files changed, 182 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gds/Portfile b/science/gds/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f9fee07..acd6c2d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gds/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gds/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,6 +7,7 @@ PortGroup python 1.0
</span>
name gds
version 2.18.7
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories science
platforms darwin
maintainers {@emaros ligo.org:ed.maros} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,6 +21,8 @@ long_description \
</span> homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
master_sites http://software.ligo.org/lscsoft/source/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-std_cplusplus_2017.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> checksums rmd160 3b2186057dec5d1e530ee1cefbfd12ab4f976d40 \
sha256 e592727d686af1042d775f192531d440600105c12d7cdad63455cfad3fb9913c
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gds/files/patch-Monitors-PulsarMon-PulsarMon.cc.diff b/science/gds/files/patch-Monitors-PulsarMon-PulsarMon.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 61b6957..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gds/files/patch-Monitors-PulsarMon-PulsarMon.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u a/Monitors/PulsarMon/PulsarMon.cc b/Monitors/PulsarMon/PulsarMon.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Monitors/PulsarMon/PulsarMon.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Monitors/PulsarMon/PulsarMon.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -261,11 +261,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FILE* tmp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (mOutput.error_log) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tmp = freopen(mOutput.error_file_name.c_str(), "w", stderr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (tmp < 0) perror("Unable to divert stderr");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (tmp == (FILE*)NULL) perror("Unable to divert stderr");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (mOutput.write_log) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tmp = freopen(mOutput.log_file_name.c_str(), "w", stdout);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (tmp < 0) perror("Unable to divert stdout");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (tmp == (FILE*)NULL) perror("Unable to divert stdout");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //---------- Set up array that will hold data for DMTViewer history
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gds/files/patch-std_cplusplus_2017.diff b/science/gds/files/patch-std_cplusplus_2017.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e96f841
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gds/files/patch-std_cplusplus_2017.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,179 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff DTT/src/cmd/cmdapi.hh DTT/src/cmd/cmdapi.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- DTT/src/cmd/cmdapi.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ DTT/src/cmd/cmdapi.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -519,7 +519,7 @@ namespace diag {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// last notification message lines
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::deque<std::string> lastnotification;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// notification message list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::auto_ptr<std::ostringstream> nMessages;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::unique_ptr<std::ostringstream> nMessages;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** Prints a line to the output of the command line.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @param s message string
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff DTT/src/cmd/gdscmd.cc DTT/src/cmd/gdscmd.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- DTT/src/cmd/gdscmd.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ DTT/src/cmd/gdscmd.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -178,7 +178,7 @@ extern "C"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* initialize supervisory */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- auto_ptr<supervisory> super (s->self());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unique_ptr<supervisory> super (s->self());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (super.get() == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ testErrmsg = "Unable to create supervisory task";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = -3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff DTT/src/diag/stdsuper.hh DTT/src/diag/stdsuper.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- DTT/src/diag/stdsuper.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ DTT/src/diag/stdsuper.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -153,9 +153,9 @@ namespace diag {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// excitation manager for the test signals
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ excitationManager testExc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// test iterator
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::auto_ptr<testiterator> testiter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::unique_ptr<testiterator> testiter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::auto_ptr<diagtest> test;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::unique_ptr<diagtest> test;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** Runs the standard supervisory task in real time mode.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @memo Run real-time method.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff DTT/src/gui/diagctrl.hh DTT/src/gui/diagctrl.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- DTT/src/gui/diagctrl.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ DTT/src/gui/diagctrl.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -475,7 +475,7 @@ namespace diag {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// Sweep type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Int_t fSweepType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// Sweep points data array
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::auto_ptr<BasicDataDescriptor> fSweepPoints;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::unique_ptr<BasicDataDescriptor> fSweepPoints;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// Pre-trigger time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Double_t fTimePreTrig;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// Dead time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff DTT/src/gui/diagplot.cc DTT/src/gui/diagplot.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- DTT/src/gui/diagplot.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ DTT/src/gui/diagplot.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,7 +154,7 @@ namespace ligogui {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free (fTable); fTable = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // get table
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Int_t width = fXYData ? (fTableWidth + 1) : fTableWidth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fCmdLine->getData (string (fName), fTable,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fCmdLine->getData (string(fName.Data()), fTable,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fLength * width, (IsComplex() ? 1 : 0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int d = IsComplex() ? 2 : 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fTable != 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,12 +186,12 @@ namespace ligogui {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // get X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fXYData) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fX != 0) free (fX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fCmdLine->getData (string (fName), fX, fLength,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fCmdLine->getData (string(fName.Data()), fX, fLength,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (IsComplex() ? 2 : 0), fOffsetX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // get Y
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fY != 0) free (fY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fCmdLine->getData (string (fName), fY, fLength,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fCmdLine->getData (string(fName.Data()), fY, fLength,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (IsComplex() ? 1 : 0), fOffsetY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // eliminate zeros
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fNoZero && fXYData && (fX != 0) && (fY != 0)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff DTT/src/storage/gdsdatum.hh DTT/src/storage/gdsdatum.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- DTT/src/storage/gdsdatum.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ DTT/src/storage/gdsdatum.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1998,7 +1998,7 @@ template <class T>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// currently active file type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filetype activeFiletype;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// XML text buffer for text handler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::auto_ptr<std::stringstream> XML_text;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::unique_ptr<std::stringstream> XML_text;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// XML start element handler callback
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void startelement (gdsStorage* dat, const char* name,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char** attributes);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff Diag_Services/dfm/dataacc.cc Diag_Services/dfm/dataacc.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Diag_Services/dfm/dataacc.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Diag_Services/dfm/dataacc.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -232,7 +232,7 @@ namespace dfm {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // get output channel list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- typedef std::auto_ptr<fantom::channelquerylist> chn_ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typedef std::unique_ptr<fantom::channelquerylist> chn_ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chn_ptr chns (new fantom::channelquerylist);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!data.getOutputChannelList (*chns)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chns.reset ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff Diag_Services/fantom/fchannel.cc Diag_Services/fantom/fchannel.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Diag_Services/fantom/fchannel.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Diag_Services/fantom/fchannel.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,10 +6,11 @@ VCSID("@(#)$Id$");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <strings.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <fstream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <algorithm>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cmath>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <fstream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <functional>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "fantom/fchannel.hh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace fantom {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -347,8 +348,13 @@ namespace fantom {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool (channelquery::*test) (const char*) const =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &channelquery::match;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wildcardlist::const_iterator i =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_if (fWList.begin(), fWList.end(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bind2nd (mem_fun_ref (test), n.c_str()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_if (fWList.begin(), fWList.end(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __cplusplus >= 201100L
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::bind( std::mem_fn(test), std::placeholders::_1, n.c_str() )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bind2nd( mem_fun_ref(test), n.c_str() )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (i != fWList.end()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return &(*i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff GUI/dttview/TLGExport.cc GUI/dttview/TLGExport.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- GUI/dttview/TLGExport.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ GUI/dttview/TLGExport.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,6 @@ namespace ligogui {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace std;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace xml;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //______________________________________________________________________________
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const char* const gExportTypes[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "ASCII", "*.txt",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -622,9 +621,9 @@ template <class f>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!ex.fColumn[i].fInclude) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- names.insert (string (ex.fColumn[i].fAChn));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ names.insert (string(ex.fColumn[i].fAChn.Data()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ex.fColumn[i].fBChn.Length() != 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- names.insert (string (ex.fColumn[i].fBChn));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ names.insert (string(ex.fColumn[i].fBChn.Data()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ writeCal (out, names, caltable);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff GUI/filterwiz/TLGFilterWizard.cc GUI/filterwiz/TLGFilterWizard.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- GUI/filterwiz/TLGFilterWizard.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ GUI/filterwiz/TLGFilterWizard.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1306,7 +1306,7 @@ TLGFilterWizWindow::FileErrorIndication(Bool_t error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (my_debug) cerr << "READ FILE " << (file ? file : "") << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fModule->RemoveEntries (0, 10000);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- string fullname = string (fCurDir) + "/" + (file ? file : "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ string fullname = string(fCurDir.Data()) + "/" + (file ? file : "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fFilterFile.SetAnySampleRate(fAnySample) ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!file || !fFilterFile.read (fullname.c_str()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1430,7 +1430,7 @@ TLGFilterWizWindow::FileErrorIndication(Bool_t error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // save
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Make changes to the way files are saved here... JCB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //filename = string (fCurDir) + "/" + filename; // Removed, it causes issues with "foton dir1/file.txt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- filename = fFilterFile.getRealFilename(filename, string(fCurDir)) ; // Follow the symbolic link? - JCB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ filename = fFilterFile.getRealFilename(filename, string(fCurDir.Data())) ; // Follow the symbolic link? - JCB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string tmpfilename = string (filename) + ".tmp" ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span></pre><pre style='margin:0'>
</pre>