[certi-cvs] certi/libHLA HLAbasicType.hh TestHLAtypes.cc

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Petr Gotthard <gotthardp>       09/10/18 19:54:09

Modified files:
        libHLA         : HLAbasicType.hh TestHLAtypes.cc 

Log message:
        Bug #27711 fixed. HLAoctetPair now uses uint16_t.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libHLA/HLAbasicType.hh?cvsroot=certi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/certi/libHLA/TestHLAtypes.cc?cvsroot=certi&r1=1.6&r2=1.7

Patches:
Index: HLAbasicType.hh
===================================================================
RCS file: /sources/certi/certi/libHLA/HLAbasicType.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- HLAbasicType.hh     24 Jun 2009 12:33:31 -0000      1.5
+++ HLAbasicType.hh     18 Oct 2009 19:54:08 -0000      1.6
@@ -11,7 +11,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Lesser General Public License for more details.
 //
-// $Id: HLAbasicType.hh,v 1.5 2009/06/24 12:33:31 gotthardp Exp $
+// $Id: HLAbasicType.hh,v 1.6 2009/10/18 19:54:08 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef _HLATYPES_BASICTYPE_HH
@@ -187,14 +187,14 @@
 typedef HLAbasicType<long long, int64_t, BigEndian> HLAinteger64BE;
 typedef HLAbasicType<float, float, BigEndian> HLAfloat32BE;
 typedef HLAbasicType<double, double, BigEndian> HLAfloat64BE;
-typedef HLAbasicType<wchar_t, wchar_t, BigEndian> HLAoctetPairBE;
+typedef HLAbasicType<uint16_t, uint16_t, BigEndian> HLAoctetPairBE;
 
 typedef HLAbasicType<short, int16_t, LittleEndian> HLAinteger16LE;
 typedef HLAbasicType<long, int32_t, LittleEndian> HLAinteger32LE;
 typedef HLAbasicType<long long, int64_t, LittleEndian> HLAinteger64LE;
 typedef HLAbasicType<float, float, LittleEndian> HLAfloat32LE;
 typedef HLAbasicType<double, double, LittleEndian> HLAfloat64LE;
-typedef HLAbasicType<wchar_t, wchar_t, LittleEndian> HLAoctetPairLE;
+typedef HLAbasicType<uint16_t, uint16_t, LittleEndian> HLAoctetPairLE;
 
 typedef HLAbasicType<char, char, BigEndian> HLAoctet;
 
@@ -215,5 +215,5 @@
 
 #endif // _HLATYPES_BASICTYPE_HH
 
-// $Id: HLAbasicType.hh,v 1.5 2009/06/24 12:33:31 gotthardp Exp $
+// $Id: HLAbasicType.hh,v 1.6 2009/10/18 19:54:08 gotthardp Exp $
 

Index: TestHLAtypes.cc
===================================================================
RCS file: /sources/certi/certi/libHLA/TestHLAtypes.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- TestHLAtypes.cc     15 Oct 2009 15:50:09 -0000      1.6
+++ TestHLAtypes.cc     18 Oct 2009 19:54:08 -0000      1.7
@@ -11,7 +11,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Lesser General Public License for more details.
 //
-// $Id: TestHLAtypes.cc,v 1.6 2009/10/15 15:50:09 erk Exp $
+// $Id: TestHLAtypes.cc,v 1.7 2009/10/18 19:54:08 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 #include <memory>
@@ -152,11 +152,6 @@
                retval+= 1;
        }
 
-       /* FIXME Erk --> Petr
-        * Looks like a bug
-        * OPLE and OPLE are stored in a wchar_t whose
-        * size may 4 octets on unix */
-#if  BUGGY
        (*OPLE) = 0xABCD;
        expected = "0000:  cd ab\n";
        result2b.seekp(0);
@@ -178,7 +173,7 @@
                                << "expected=" << expected << std::endl;
                retval+= 1;
        }
-#endif
+
        return retval;
 } /* end of test0 */
 
@@ -393,4 +388,4 @@
        return result;
 }
 
-// $Id: TestHLAtypes.cc,v 1.6 2009/10/15 15:50:09 erk Exp $
+// $Id: TestHLAtypes.cc,v 1.7 2009/10/18 19:54:08 gotthardp Exp $