port to newer gcc/g++

git-svn-id: svn+ssh://svn.corp.yahoo.com/yahoo/yrl/labs/pnuts/code/logstore@1231 8dad8b1f-cf64-0410-95b6-bcf113ffbcfe
This commit is contained in:
sears 2010-10-02 12:52:41 +00:00
parent 4c0e8a7186
commit 6eaf5da8de
13 changed files with 15 additions and 5 deletions

View file

@ -4,6 +4,7 @@
#define _DATATUPLE_H_ #define _DATATUPLE_H_
#include <string> #include <string>
#include <stdlib.h>
typedef unsigned char byte; typedef unsigned char byte;
#include <cstring> #include <cstring>
#include <assert.h> #include <assert.h>

View file

@ -10,7 +10,7 @@
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include <stdint.h>
#include <string> #include <string>
typedef unsigned char byte; typedef unsigned char byte;
#include <cstring> #include <cstring>

View file

@ -2,6 +2,7 @@
#include <vector> #include <vector>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <algorithm>
#include <logstore.h> #include <logstore.h>
#include <datapage.h> #include <datapage.h>

View file

@ -3,6 +3,7 @@
#include <vector> #include <vector>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <algorithm>
#include "logstore.h" #include "logstore.h"
#include "datapage.h" #include "datapage.h"
#include <assert.h> #include <assert.h>

View file

@ -2,6 +2,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <iostream> #include <iostream>
#include <algorithm>
#include <sstream> #include <sstream>
#include "logstore.h" #include "logstore.h"
#include "regionAllocator.h" #include "regionAllocator.h"

View file

@ -2,6 +2,7 @@
#include <vector> #include <vector>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <algorithm>
#include "logstore.h" #include "logstore.h"
#include "datapage.h" #include "datapage.h"
#include "merger.h" #include "merger.h"

View file

@ -2,6 +2,7 @@
#include <vector> #include <vector>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <algorithm>
#include "logstore.h" #include "logstore.h"
#include "datapage.h" #include "datapage.h"
#include "merger.h" #include "merger.h"

View file

@ -2,6 +2,7 @@
#include <vector> #include <vector>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <algorithm>
#include "logstore.h" #include "logstore.h"
#include "datapage.h" #include "datapage.h"
#include "merger.h" #include "merger.h"

View file

@ -2,6 +2,7 @@
#include <vector> #include <vector>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <algorithm>
#include "logstore.h" #include "logstore.h"
#include "datapage.h" #include "datapage.h"
#include "merger.h" #include "merger.h"

View file

@ -9,6 +9,7 @@
#include <vector> #include <vector>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <algorithm>
#include "logstore.h" #include "logstore.h"
#include <assert.h> #include <assert.h>
#include <limits.h> #include <limits.h>
@ -27,7 +28,7 @@
#undef end #undef end
static char * svrname = "localhost"; static const char * svrname = "localhost";
static int svrport = 32432; static int svrport = 32432;
void insertProbeIter(size_t NUM_ENTRIES) void insertProbeIter(size_t NUM_ENTRIES)

View file

@ -2,6 +2,7 @@
#include <vector> #include <vector>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <algorithm>
#include "logstore.h" #include "logstore.h"
#include <assert.h> #include <assert.h>
#include <limits.h> #include <limits.h>
@ -20,7 +21,7 @@
#undef end #undef end
static char * svrname = "localhost"; static const char * svrname = "localhost";
static int svrport = 32432; static int svrport = 32432;
void insertProbeIter(size_t NUM_ENTRIES) void insertProbeIter(size_t NUM_ENTRIES)

View file

@ -7,7 +7,7 @@
#ifndef CHECK_UTIL_H_ #ifndef CHECK_UTIL_H_
#define CHECK_UTIL_H_ #define CHECK_UTIL_H_
#include <stdlib.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netdb.h> #include <netdb.h>

View file

@ -11,7 +11,7 @@
logstore_handle_t * util_open_conn(int argc, char * argv[]) { logstore_handle_t * util_open_conn(int argc, char * argv[]) {
bool ok = true; bool ok = true;
int svrport = 32432; int svrport = 32432;
char * svrname = "localhost"; const char * svrname = "localhost";
if(argc == 3) { if(argc == 3) {
svrport = atoi(argv[2]); svrport = atoi(argv[2]);
} }