Commit 548da485 authored by avi's avatar avi Committed by Commit bot

Switch to standard integer types in third_party/mt19937ar/.

BUG=138542
TBR=asvitkine@chromium.org

Review URL: https://codereview.chromium.org/1551483002

Cr-Commit-Position: refs/heads/master@{#366915}
parent 51ace48a
......@@ -57,7 +57,7 @@ MersenneTwister::~MersenneTwister() {
}
/* initializes mt[N] with a seed */
void MersenneTwister::init_genrand(uint32 s)
void MersenneTwister::init_genrand(uint32_t s)
{
mt[0]= s & 0xffffffffUL;
for (mti=1; mti<N; mti++) {
......@@ -76,7 +76,7 @@ void MersenneTwister::init_genrand(uint32 s)
/* init_key is the array for initializing keys */
/* key_length is its length */
/* slight change for C++, 2004/2/26 */
void MersenneTwister::init_by_array(uint32 init_key[], int key_length)
void MersenneTwister::init_by_array(uint32_t init_key[], int key_length)
{
int i, j, k;
init_genrand(19650218UL);
......@@ -102,10 +102,10 @@ void MersenneTwister::init_by_array(uint32 init_key[], int key_length)
}
/* generates a random number on [0,0xffffffff]-interval */
uint32 MersenneTwister::genrand_int32(void)
uint32_t MersenneTwister::genrand_int32(void)
{
uint32 y;
static uint32 mag01[2]={0x0UL, MATRIX_A};
uint32_t y;
static uint32_t mag01[2]={0x0UL, MATRIX_A};
/* mag01[x] = x * MATRIX_A for x=0,1 */
if (mti >= N) { /* generate N words at one time */
......
......@@ -44,21 +44,21 @@
#ifndef THIRD_PARTY_MT19937AR_MT19937AR_H_
#define THIRD_PARTY_MT19937AR_MT19937AR_H_
#include <vector>
#include <stdint.h>
#include "base/basictypes.h"
#include <vector>
class MersenneTwister {
public:
MersenneTwister();
~MersenneTwister();
void init_genrand(uint32 s);
void init_by_array(uint32 init_key[], int key_length);
uint32 genrand_int32(void);
void init_genrand(uint32_t s);
void init_by_array(uint32_t init_key[], int key_length);
uint32_t genrand_int32(void);
private:
std::vector<uint32> mt; /* the array for the state vector */
std::vector<uint32_t> mt; /* the array for the state vector */
int mti; /* mti==N+1 means mt[N] is not initialized */
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment