mira-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 190
committer: Alan Alvarez <aalvarez@xxxxxxxxxxxxx>
branch nick: mira
timestamp: Sun 2009-12-06 18:59:03 -0600
message:
  Use boost/cstdint.hpp with Visual C++
modified:
  mira-server/include/Field.h
  mira-server/include/Resource.h
  mira-server/include/directory/MD5.h
  mira-server/src/directory/Crypto.cpp
  mira-server/src/directory/MD5.cpp


--
lp:mira
https://code.launchpad.net/~mira-dev/mira/trunk

Your team Mira Core Development Team is subscribed to branch lp:mira.
To unsubscribe from this branch go to https://code.launchpad.net/~mira-dev/mira/trunk/+edit-subscription.

=== modified file 'mira-server/include/Field.h'
--- mira-server/include/Field.h	2009-10-31 06:49:42 +0000
+++ mira-server/include/Field.h	2009-12-07 00:59:03 +0000
@@ -23,12 +23,18 @@
 
 #include <string>
 #include <list>
-
+#include <boost/cstdint.hpp>
 #include <boost/serialization/nvp.hpp>
 #include <boost/serialization/access.hpp>
 #include <boost/serialization/version.hpp>
 #include <boost/serialization/list.hpp>
 
+// Microsoft Visual C++ doesn't provide a cstdint header.
+#ifdef _MSC_VER // [
+#include <boost/cstdint.hpp>
+using boost::uint8_t;
+#endif // _MSC_VER ]
+
 struct Field
 {
     static const uint8_t type_int8       = 0x0;    /* int8_t      */

=== modified file 'mira-server/include/Resource.h'
--- mira-server/include/Resource.h	2009-11-07 19:45:43 +0000
+++ mira-server/include/Resource.h	2009-12-07 00:59:03 +0000
@@ -22,7 +22,11 @@
 #define __MIRASERVER_RESOURCE_H
 
 #include <string>
-#include <inttypes.h>
+// Microsoft Visual C++ doesn't provide a cstdint header.
+#ifdef _MSC_VER // [
+#include <boost/cstdint.hpp>
+using boost::uint8_t;
+#endif // _MSC_VER ]
 
 class Resource
 {

=== modified file 'mira-server/include/directory/MD5.h'
--- mira-server/include/directory/MD5.h	2009-10-30 22:46:18 +0000
+++ mira-server/include/directory/MD5.h	2009-12-07 00:59:03 +0000
@@ -62,7 +62,16 @@
 #define MD5_H
 
 #include <iostream>
-#include <inttypes.h>
+
+// Microsoft Visual C++ doesn't provide a cstdint header.
+#ifdef _MSC_VER // [
+#include <boost/cstdint.hpp>
+
+using boost::int32_t;
+using boost::uint32_t;
+#endif // _MSC_VER ]
+
+
  
 #define MD5_DIGEST_LENGTH 16
 

=== modified file 'mira-server/src/directory/Crypto.cpp'
--- mira-server/src/directory/Crypto.cpp	2008-03-11 03:36:26 +0000
+++ mira-server/src/directory/Crypto.cpp	2009-12-07 00:59:03 +0000
@@ -23,6 +23,7 @@
 #include <iomanip>
 #include <iostream>
 #include <cstdlib>
+#include <ctime>
 
 #include "Crypto.h"
 #include "MD5.h"

=== modified file 'mira-server/src/directory/MD5.cpp'
--- mira-server/src/directory/MD5.cpp	2008-03-11 03:36:26 +0000
+++ mira-server/src/directory/MD5.cpp	2009-12-07 00:59:03 +0000
@@ -54,9 +54,16 @@
  ************************************************************************/
 #include	<iostream>   // Needed for ostream and istream.
 #include	<cstring>     // Needed for memcpy() and memset().
-#include	<inttypes.h>
 #include	"MD5.h"
 
+// Microsoft Visual C++ doesn't provide a cstdint header.
+#ifdef _MSC_VER // [
+#include <boost/cstdint.hpp>
+
+using boost::int32_t;
+using boost::uint32_t;
+#endif // _MSC_VER ]
+
 // F, G, H and I are basic MD5 functions.
 inline uint32_t F( uint32_t xx, uint32_t yy, uint32_t zz ) 
 {  return (( xx & yy ) | (~xx & zz ));  }