[certi-cvs] certi libCERTI/M_Classes.cc libCERTI/M_Classes....

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/03/07 18:46:25

Modified files:
        libCERTI       : M_Classes.cc M_Classes.hh 
        scripts        : GenMsgCXX.py 

Log message:
        Spurious double_t

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/M_Classes.cc?cvsroot=certi&r1=3.4&r2=3.5
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/M_Classes.hh?cvsroot=certi&r1=3.4&r2=3.5
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/GenMsgCXX.py?cvsroot=certi&r1=1.5&r2=1.6

Patches:
Index: libCERTI/M_Classes.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/M_Classes.cc,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -b -r3.4 -r3.5
--- libCERTI/M_Classes.cc       7 Mar 2010 18:23:39 -0000       3.4
+++ libCERTI/M_Classes.cc       7 Mar 2010 18:46:25 -0000       3.5
@@ -1,4 +1,4 @@
-// Generated on 2010 March Sat, 06 at 18:06:19 by the CERTI message generator
+// Generated on 2010 March Sun, 07 at 19:45:00 by the CERTI message generator
 #include <vector>
 #include <string>
 #include "M_Classes.hh"

Index: libCERTI/M_Classes.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/M_Classes.hh,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -b -r3.4 -r3.5
--- libCERTI/M_Classes.hh       7 Mar 2010 18:23:39 -0000       3.4
+++ libCERTI/M_Classes.hh       7 Mar 2010 18:46:25 -0000       3.5
@@ -1,4 +1,4 @@
-// Generated on 2010 March Sat, 06 at 18:06:18 by the CERTI message generator
+// Generated on 2010 March Sun, 07 at 19:42:42 by the CERTI message generator
 #ifndef M_CLASSES_HH
 #define M_CLASSES_HH
 // ****-**** Global System includes ****-****
@@ -1772,13 +1772,13 @@
          void enableOn() {enable = true;}
          void enableOff() {enable = false;}
          bool isEnableOn() const {return enable;}
-         const double_t& getLookahead() const {return lookahead;}
-         void setLookahead(const double_t& newLookahead) 
{lookahead=newLookahead;}
+         const double& getLookahead() const {return lookahead;}
+         void setLookahead(const double& newLookahead) 
{lookahead=newLookahead;}
          // the show method
          virtual void show(std::ostream& out);
       protected:
          bool enable;
-         double_t lookahead;
+         double lookahead;
       private:
    };
 
@@ -1793,13 +1793,13 @@
          void enableOn() {enable = true;}
          void enableOff() {enable = false;}
          bool isEnableOn() const {return enable;}
-         const double_t& getLookahead() const {return lookahead;}
-         void setLookahead(const double_t& newLookahead) 
{lookahead=newLookahead;}
+         const double& getLookahead() const {return lookahead;}
+         void setLookahead(const double& newLookahead) 
{lookahead=newLookahead;}
          // the show method
          virtual void show(std::ostream& out);
       protected:
          bool enable;
-         double_t lookahead;
+         double lookahead;
       private:
    };
 
@@ -1874,12 +1874,12 @@
          virtual void serialize(MessageBuffer& msgBuffer);
          virtual void deserialize(MessageBuffer& msgBuffer);
          // specific Getter(s)/Setter(s)
-         const double_t& getLookahead() const {return lookahead;}
-         void setLookahead(const double_t& newLookahead) 
{lookahead=newLookahead;}
+         const double& getLookahead() const {return lookahead;}
+         void setLookahead(const double& newLookahead) 
{lookahead=newLookahead;}
          // the show method
          virtual void show(std::ostream& out);
       protected:
-         double_t lookahead;
+         double lookahead;
       private:
    };
 
@@ -1891,12 +1891,12 @@
          virtual void serialize(MessageBuffer& msgBuffer);
          virtual void deserialize(MessageBuffer& msgBuffer);
          // specific Getter(s)/Setter(s)
-         const double_t& getLookahead() const {return lookahead;}
-         void setLookahead(const double_t& newLookahead) 
{lookahead=newLookahead;}
+         const double& getLookahead() const {return lookahead;}
+         void setLookahead(const double& newLookahead) 
{lookahead=newLookahead;}
          // the show method
          virtual void show(std::ostream& out);
       protected:
-         double_t lookahead;
+         double lookahead;
       private:
    };
 
@@ -2814,16 +2814,16 @@
          // specific Getter(s)/Setter(s)
          const bool& getMultiple() const {return multiple;}
          void setMultiple(const bool& newMultiple) {multiple=newMultiple;}
-         const double_t& getMinTickTime() const {return minTickTime;}
-         void setMinTickTime(const double_t& newMinTickTime) 
{minTickTime=newMinTickTime;}
-         const double_t& getMaxTickTime() const {return maxTickTime;}
-         void setMaxTickTime(const double_t& newMaxTickTime) 
{maxTickTime=newMaxTickTime;}
+         const double& getMinTickTime() const {return minTickTime;}
+         void setMinTickTime(const double& newMinTickTime) 
{minTickTime=newMinTickTime;}
+         const double& getMaxTickTime() const {return maxTickTime;}
+         void setMaxTickTime(const double& newMaxTickTime) 
{maxTickTime=newMaxTickTime;}
          // the show method
          virtual void show(std::ostream& out);
       protected:
          bool multiple;
-         double_t minTickTime;
-         double_t maxTickTime;
+         double minTickTime;
+         double maxTickTime;
       private:
    };
 

Index: scripts/GenMsgCXX.py
===================================================================
RCS file: /sources/certi/certi/scripts/GenMsgCXX.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- scripts/GenMsgCXX.py        7 Mar 2010 18:22:03 -0000       1.5
+++ scripts/GenMsgCXX.py        7 Mar 2010 18:46:25 -0000       1.6
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 ## USA
 ##
-## $Id: GenMsgCXX.py,v 1.5 2010/03/07 18:22:03 erk Exp $
+## $Id: GenMsgCXX.py,v 1.6 2010/03/07 18:46:25 erk Exp $
 ## ----------------------------------------------------------------------------
 
 """
@@ -48,7 +48,7 @@
         self.builtinTypeMap = {'onoff'    : 'bool',
                                'bool'     : 'bool',
                                'string'   : 'std::string',
-                               'byte'     : 'byte',
+                               'byte'     : 'uint8_t',
                                'int8'     : 'int8_t',
                                'uint8'    : 'uint8_t',
                                'int16'    : 'int16_t',
@@ -57,8 +57,8 @@
                                'uint32'   : 'uint32_t',   
                                'int64'    : 'int64_t',
                                'uint64'   : 'uint64_t',
-                               'float'    : 'float_t',
-                               'double'   : 'double_t',}
+                               'float'    : 'float',
+                               'double'   : 'double',}
         self.serializeTypeMap = {'onoff'    : 'write_bool',
                                'bool'     : 'write_bool',
                                'string'   : 'write_string',