dtinfo subtree DtMmdb

This commit is contained in:
Ulrich Wilkens
2012-10-14 15:38:27 +02:00
committed by Jon Trulson
parent b92cf08899
commit 8c8363f4a5
184 changed files with 1090 additions and 773 deletions

View File

@@ -23,7 +23,7 @@ XCOMM .../programs/dtinfo/mmdb/<subdir>/Imakefile
#define LargePICTable YES
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
XCOMM In DtMmdb we compile as C_API sources.
DEFINES = -DC_API -DPORTABLE_DB

View File

@@ -22,7 +22,8 @@
*/
// $XConsortium: convert.cc /main/3 1996/06/11 17:23:53 cde-hal $
#include <iostream.h>
#include <iostream>
using namespace std;
/*****************************************/
//Note: convert node.dat file to new format

View File

@@ -168,14 +168,14 @@ io_status cset::asciiIn(istream& in)
io_status cset::batch_asciiIn(istream& in)
{
handler* root_hd_ptr = 0;
/*
#ifdef DEBUG
xtime tmr;
float f1;
long f2;
tmr.start();
#endif
*/
char ccode_buf[LBUFSIZ];
int c;
//fprintf(stderr, "batch_asciiIn() : start looping \n");

View File

@@ -56,7 +56,8 @@
#ifdef C_API
#include <stdlib.h>
#else
#include <new.h>
#include <new>
using namespace std;
#endif
#define NEW_AND_DELETE_BODIES(class_name) \

View File

@@ -98,7 +98,7 @@ oid_t::oid_t(const char* source, Boolean ascii_format, Boolean swap_order)
#endif
} else {
istrstream in((char*)source);
istringstream in((char*)source);
in >> v_c_code;

View File

@@ -52,9 +52,9 @@
#define _oid_t_h 1
#ifdef C_API
#include "utility/c_strstream.h"
#include "utility/c_stringstream.h"
#else
#include <strstream.h>
#include <sstream>
#endif
#include "utility/funcs.h"
@@ -83,7 +83,7 @@ public:
// oid_t equal and less test
Boolean eq(const oid_t&) const;
Boolean ls(const oid_t&) const;
operator==(const oid_t& arg) const { return eq(arg); };
bool operator==(const oid_t& arg) const { return eq(arg); };
// class code, oid type and instance code export functions
const c_code_t ccode() const { return v_c_code; } ;

View File

@@ -86,7 +86,8 @@ const char* random_gen::get_random_string(int low, int high)
delete buf;
buf = new char[buf_len+1];
}
for ( int i=0; i<buf_len; i++ )
int i;
for ( i=0; i<buf_len; i++ )
buf[i] = char_set[rand_gen.rand() % sizeof(char_set)];
buf[i] = 0;