Ticket #44605: patch-ChangeLog-modules_switch.cc-modules_switch.h-gui_gui_stopwatch.cc-fix-clang-compile-errors.diff

ChangeLog

@@ +1 @@
+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

@@ -179 +179 @@
     }
     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 +201 @@
     }
     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 +221 @@
     }
     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 +403 @@
 
   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

@@ -216 +216 @@
   //----------------------------------------------------------------------
   //----------------------------------------------------------------------
 
-  PulseGen::PulseGen(const char *_name=0)
+  PulseGen::PulseGen(const char *_name)
     : StimulusBase(_name, "\
 Pulse Generator\n\
  Attributes:\n\

modules/stimuli.h

@@ -48 +48 @@
     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 +72 @@
   {
   public:
     static Module *construct(const char *new_name);
-    PulseGen(const char *_name);
+    PulseGen(const char *_name=0);
     ~PulseGen();
 
     virtual void callback();

modules/switch.cc

@@ -582 +582 @@
 
   //========================================================================
 
-  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

@@ -88 +88 @@
   class Switch : public SwitchBase
   {
   public:
-    Switch(const char *_name);
+    Switch(const char *_name=0);
     ~Switch();
 
     virtual void setState(bool);