<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[131983] trunk/dports/devel/gpsim</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/131983">131983</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2015-01-22 13:31:31 -0800 (Thu, 22 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gpsim: fix compile issues with clang. Patch backports from upstream source repository.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelgpsimPortfile">trunk/dports/devel/gpsim/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelgpsimfilespatchChangeLogmodules_switchccmodules_switchhgui_gui_stopwatchccfixclangcompileerrorsdiff">trunk/dports/devel/gpsim/files/patch-ChangeLog-modules_switch.cc-modules_switch.h-gui_gui_stopwatch.cc-fix-clang-compile-errors.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelgpsimPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/gpsim/Portfile (131982 => 131983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/gpsim/Portfile 2015-01-22 19:55:17 UTC (rev 131982)
+++ trunk/dports/devel/gpsim/Portfile 2015-01-22 21:31:31 UTC (rev 131983)
</span><span class="lines">@@ -27,4 +27,5 @@
</span><span class="cx"> depends_lib port:gtk2-extra \
</span><span class="cx"> port:popt
</span><span class="cx">
</span><del>-patchfiles patch-src-bitlog.h.diff
</del><ins>+patchfiles patch-src-bitlog.h.diff \
+ patch-ChangeLog-modules_switch.cc-modules_switch.h-gui_gui_stopwatch.cc-fix-clang-compile-errors.diff
</ins></span></pre></div>
<a id="trunkdportsdevelgpsimfilespatchChangeLogmodules_switchccmodules_switchhgui_gui_stopwatchccfixclangcompileerrorsdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/gpsim/files/patch-ChangeLog-modules_switch.cc-modules_switch.h-gui_gui_stopwatch.cc-fix-clang-compile-errors.diff (0 => 131983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/gpsim/files/patch-ChangeLog-modules_switch.cc-modules_switch.h-gui_gui_stopwatch.cc-fix-clang-compile-errors.diff (rev 0)
+++ trunk/dports/devel/gpsim/files/patch-ChangeLog-modules_switch.cc-modules_switch.h-gui_gui_stopwatch.cc-fix-clang-compile-errors.diff 2015-01-22 21:31:31 UTC (rev 131983)
</span><span class="lines">@@ -0,0 +1,107 @@
</span><ins>+--- ChangeLog.old 2015-01-16 19:15:05.000000000 +0100
++++ ChangeLog 2015-01-16 18:57:08.000000000 +0100
+@@ -1,3 +1,9 @@
++2013-10-15 Borut Razem <borutr@users.sourceforge.net>
++ * modules/stimuli.cc, modules/stimuli.h, modules/switch.h,
++ modules/switch.cc, gui/gui_stopwatch.cc: applied patch
++ #32 Make gpsim compile with clang,
++ thanks to Ralf Horstmann
++
+ 2011-04-27 Roy Rankin <rrankin@ihug.com.au>
+ * regression/p16f690/Makefile : use local lkr file
+ * regression/Makefile.am : tarball fix
+--- gui/gui_stopwatch.cc.old 2015-01-16 19:15:05.000000000 +0100
++++ gui/gui_stopwatch.cc 2015-01-16 18:57:08.000000000 +0100
+@@ -179,7 +179,7 @@
+ }
+ if(!sww->IsUpdate() && (text=gtk_entry_get_text (GTK_ENTRY(widget)))!=0)
+ {
+- long long v = strtoll(text,0,10);
++ long long v = ::strtoll(text,0,10);
+ if(v!=(sww->cyclecounter-sww->offset)%sww->rollover)
+ {
+ v=(v+sww->offset)%sww->rollover;
+@@ -201,7 +201,7 @@
+ }
+ if(!sww->IsUpdate() && (text=gtk_entry_get_text (GTK_ENTRY(widget)))!=0)
+ {
+- long long v = strtoll(text,0,10);
++ long long v = ::strtoll(text,0,10);
+
+ if(v!=sww->offset)
+ {
+@@ -221,7 +221,7 @@
+ }
+ if(!sww->IsUpdate() && (text=gtk_entry_get_text (GTK_ENTRY(widget)))!=0)
+ {
+- long long v = strtoll(text,0,10);
++ long long v = ::strtoll(text,0,10);
+
+ if(v!=sww->rollover)
+ {
+@@ -403,7 +403,7 @@
+
+ get_config();
+ if(config_get_string(name(),"rollover",&string))
+- rollover = strtoll(string,0,10);
++ rollover = ::strtoll(string,0,10);
+ config_get_variable(name(),"count_dir",&count_dir);
+
+ if(enabled)
+--- modules/stimuli.cc.old 2015-01-16 19:15:05.000000000 +0100
++++ modules/stimuli.cc 2015-01-16 18:57:08.000000000 +0100
+@@ -216,7 +216,7 @@
+ //----------------------------------------------------------------------
+ //----------------------------------------------------------------------
+
+- PulseGen::PulseGen(const char *_name=0)
++ PulseGen::PulseGen(const char *_name)
+ : StimulusBase(_name, "\
+ Pulse Generator\n\
+ Attributes:\n\
+--- modules/stimuli.h.old 2015-01-16 19:15:05.000000000 +0100
++++ modules/stimuli.h 2015-01-16 19:14:21.000000000 +0100
+@@ -48,10 +48,10 @@
+ gint64 time;
+ Value *v;
+
+- inline bool operator < (ValueStimulusData &rValue) {
++ inline bool operator < (const ValueStimulusData &rValue) const {
+ return time < rValue.time;
+ }
+- inline bool operator == (ValueStimulusData rValue) {
++ inline bool operator == (const ValueStimulusData rValue) const {
+ return time == rValue.time;
+ }
+ };
+@@ -72,7 +72,7 @@
+ {
+ public:
+ static Module *construct(const char *new_name);
+- PulseGen(const char *_name);
++ PulseGen(const char *_name=0);
+ ~PulseGen();
+
+ virtual void callback();
+--- modules/switch.cc.old 2015-01-16 19:15:05.000000000 +0100
++++ modules/switch.cc 2015-01-16 18:57:08.000000000 +0100
+@@ -582,7 +582,7 @@
+
+ //========================================================================
+
+- Switch::Switch(const char *_new_name=0)
++ Switch::Switch(const char *_new_name)
+ : SwitchBase(_new_name, "\
+ Two port switch\n\
+ Attributes:\n\
+--- modules/switch.h.old 2015-01-16 19:15:05.000000000 +0100
++++ modules/switch.h 2015-01-16 18:57:08.000000000 +0100
+@@ -88,7 +88,7 @@
+ class Switch : public SwitchBase
+ {
+ public:
+- Switch(const char *_name);
++ Switch(const char *_name=0);
+ ~Switch();
+
+ virtual void setState(bool);
</ins></span></pre>
</div>
</div>
</body>
</html>