wmmsens-gcc3.patch

wmmsens-gcc3.patch (text/plain), 4.48 KB, created by Bret Towe on 2003-03-24 15:34:54 UTC

diff -ur /tmp/wmmsens-0.29.6-pre1/src/chipset_mgr.c ./src/chipset_mgr.c
--- /tmp/wmmsens-0.29.6-pre1/src/chipset_mgr.c	2001-11-19 06:55:01.000000000 -0800
+++ ./src/chipset_mgr.c	2003-03-19 10:20:08.000000000 -0800
@@ -212,7 +212,7 @@
    bool keep = true;
 
    // based on certain keywords, well try to guess the limits
-   string f_name = mf.name();
+   std::string f_name = mf.name();
 
    switch (f_type)
    {
@@ -366,7 +366,7 @@
       if (sfd->mapping == -1)
       {
 	 // get this feature's info
-	 string name = sfd->name;
+	 std::string name = sfd->name;
 	 cs_feature::csf_type type = cs_feature::UNKNOWN;
 	 ui8 step_cnt = 1;
 
diff -ur /tmp/wmmsens-0.29.6-pre1/src/chipset_mgr.h ./src/chipset_mgr.h
--- /tmp/wmmsens-0.29.6-pre1/src/chipset_mgr.h	2001-11-19 06:55:01.000000000 -0800
+++ ./src/chipset_mgr.h	2003-03-19 10:28:49.000000000 -0800
@@ -83,10 +83,10 @@
    sensors_feature_data f_data;
 
    // the feature's label
-   string lbl;
+   std::string lbl;
 
    // stores the value(s) read
-   vector<featval> val;
+   std::vector<featval> val;
 
    // store the min & max of the current values maintained
    featval min_read, max_read;
@@ -95,7 +95,7 @@
    csf_type f_type;
 
    // list of features that are mapped to this one
-   vector<cs_feature *> mapped_feature;
+   std::vector<cs_feature *> mapped_feature;
 
    // index of the min / max features that are mapped to this one
    int min_idx, max_idx;
@@ -113,8 +113,8 @@
 
    // getters
    int           id() const      { return f_data.number; }
-   string        name() const    { return f_data.name; }
-   const string& label() const   { return lbl; }
+   std::string        name() const    { return f_data.name; }
+   const std::string& label() const   { return lbl; }
    int           mapping() const { return f_data.mapping; }
    csf_type      type() const    { return f_type; }
    bool          alarm() const   { return alarm_on; }
@@ -130,7 +130,7 @@
    bool history() const { return (val.size() > 1); }
 
    // output op
-   friend ostream& operator<<(ostream &, const cs_feature&);
+   friend std::ostream& operator<<(std::ostream &, const cs_feature&);
 
 private:
    friend class chipset;
@@ -172,7 +172,7 @@
    sensors_chip_name chipname;
 
    // list of non-mapped features for this chipset
-   vector<cs_feature *> feature_list;
+   std::vector<cs_feature *> feature_list;
 
    ui16 poll_bits;
 
@@ -184,7 +184,7 @@
    chipset(const sensors_chip_name& name, ui16 bits);
 
    // getters
-   string name() const { return chipname.prefix; }
+   std::string name() const { return chipname.prefix; }
    ui32 numFeatures() const { return feature_list.size(); }
 
    // get the chip's features.. history steps refers to the step
@@ -201,7 +201,7 @@
       return *feature_list[ idx %= feature_list.size() ];
    }
 
-   friend ostream& operator<<(ostream &, const chipset&);
+   friend std::ostream& operator<<(std::ostream &, const chipset&);
 };
 
 
@@ -212,7 +212,7 @@
 {
 private:
    // the features we're maintaining..
-   vector<chipset *> chipset_list;
+   std::vector<chipset *> chipset_list;
    ui32 total_features;
    ui8 history_steps;
 
@@ -245,7 +245,7 @@
    // fetches the feature at the index given
    const cs_feature& operator[](ui32 idx) const;
 
-   friend ostream& operator<<(ostream &, const chipset_mgr&);
+   friend std::ostream& operator<<(std::ostream &, const chipset_mgr&);
 
 private:
    // helper methods
diff -ur /tmp/wmmsens-0.29.6-pre1/src/main.c ./src/main.c
--- /tmp/wmmsens-0.29.6-pre1/src/main.c	2001-11-16 08:55:53.000000000 -0800
+++ ./src/main.c	2003-03-19 10:22:27.000000000 -0800
@@ -134,9 +134,9 @@
 // the "globals" we need
 namespace wmmsens_ns
 {
-    const string VER = "0.29.6-pre1";
-    const string AUTHOR = "Ed Porras <[e-mail]>";
-    const string OTHER = 
+    const std::string VER = "0.29.6-pre1";
+    const std::string AUTHOR = "Ed Porras <[e-mail]>";
+    const std::string OTHER = 
       "  based on wmgtemp by Roger Dunce <[e-mail]>\n" \
       "  with scrolling text routines based on code from\n" \
       "  wmix by Daniel Richard G. <[e-mail]> / " \
@@ -217,7 +217,7 @@
     int delay = 20; // 1/10ths of a second
 
     // duh..
-    string progname;
+    std::string progname;
 }
 using namespace wmmsens_ns;
 
@@ -263,7 +263,7 @@
    // initial version of parse args
    for (register int i = 1; i < argc; i++)
    {
-      string arg = argv[i];
+      std::string arg = argv[i];
       if (arg == "--version")
       {
 	 cout << progname << " " << VER << " by " << AUTHOR << endl