diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-10-28 17:12:13 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-10-28 17:12:13 -0230 |
| commit | 8f4803fc0c32a7edf619812be8cb3a66dd16826b (patch) | |
| tree | c1c7739d65616c899c9c39a484c59340edaae0b4 /cpp/src | |
| parent | Travis build fix (diff) | |
| download | ice-8f4803fc0c32a7edf619812be8cb3a66dd16826b.tar.bz2 ice-8f4803fc0c32a7edf619812be8cb3a66dd16826b.tar.xz ice-8f4803fc0c32a7edf619812be8cb3a66dd16826b.zip | |
Linux build fixes
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/Database.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/IceGrid/IceGridDB.cpp | 7 | ||||
| -rw-r--r-- | cpp/src/IceGrid/Makefile | 2 | ||||
| -rw-r--r-- | cpp/src/IceStorm/IceStormDB.cpp | 7 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Instance.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Makefile | 2 |
6 files changed, 14 insertions, 10 deletions
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index 91989d77a01..c492343694c 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -224,7 +224,8 @@ Database::Database(const Ice::ObjectAdapterPtr& registryAdapter, IceDB::IceContext context; context.communicator = _communicator; - context.encoding = { 1, 1 }; + context.encoding.major = 1; + context.encoding.minor = 1; _applications = StringApplicationInfoMap(txn, applicationsDbName, context, MDB_CREATE); diff --git a/cpp/src/IceGrid/IceGridDB.cpp b/cpp/src/IceGrid/IceGridDB.cpp index bbdb2b0666a..1f6da1362d4 100644 --- a/cpp/src/IceGrid/IceGridDB.cpp +++ b/cpp/src/IceGrid/IceGridDB.cpp @@ -227,7 +227,8 @@ Client::run(int argc, char* argv[]) IceDB::IceContext dbContext; dbContext.communicator = communicator(); - dbContext.encoding = { 1, 1 }; + dbContext.encoding.major = 1; + dbContext.encoding.minor = 1; if(import) { @@ -246,7 +247,7 @@ Client::run(int argc, char* argv[]) return EXIT_FAILURE; } - ifstream fs(dbFile, ios::binary); + ifstream fs(dbFile.c_str(), ios::binary); if(fs.fail()) { cerr << "Could not open input file: " << strerror(errno) << endl; @@ -510,7 +511,7 @@ Client::run(int argc, char* argv[]) stream->write(data); pair<const Ice::Byte*, const Ice::Byte*> buf = stream->finished(); - ofstream fs(dbFile, ios::binary); + ofstream fs(dbFile.c_str(), ios::binary); if(fs.fail()) { cerr << "Could not open output file: " << strerror(errno) << endl; diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile index 0e78b8497ff..0c44ad5f27c 100644 --- a/cpp/src/IceGrid/Makefile +++ b/cpp/src/IceGrid/Makefile @@ -107,7 +107,7 @@ RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) include $(top_srcdir)/config/Make.rules -CPPFLAGS := $(CPPFLAGS) -I.. $(READLINE_FLAGS) +CPPFLAGS := $(CPPFLAGS) -I.. $(READLINE_FLAGS) $(LMDB_FLAGS) ICECPPFLAGS := $(ICECPPFLAGS) -I.. SLICE2CPPFLAGS := --checksum --ice --include-dir IceGrid $(SLICE2CPPFLAGS) SLICE2FREEZECMD := $(SLICE2FREEZE) --ice --include-dir IceGrid $(ICECPPFLAGS) diff --git a/cpp/src/IceStorm/IceStormDB.cpp b/cpp/src/IceStorm/IceStormDB.cpp index 2ccd84e5309..e5f2ea0bb06 100644 --- a/cpp/src/IceStorm/IceStormDB.cpp +++ b/cpp/src/IceStorm/IceStormDB.cpp @@ -124,7 +124,8 @@ Client::run(int argc, char* argv[]) IceDB::IceContext dbContext; dbContext.communicator = communicator(); - dbContext.encoding = { 1, 1 }; + dbContext.encoding.major = 1; + dbContext.encoding.minor = 1; if(import) { @@ -143,7 +144,7 @@ Client::run(int argc, char* argv[]) return EXIT_FAILURE; } - ifstream fs(dbFile, ios::binary); + ifstream fs(dbFile.c_str(), ios::binary); if(fs.fail()) { cerr << "Could not open input file: " << strerror(errno) << endl; @@ -280,7 +281,7 @@ Client::run(int argc, char* argv[]) stream->write(data); pair<const Ice::Byte*, const Ice::Byte*> buf = stream->finished(); - ofstream fs(dbFile, ios::binary); + ofstream fs(dbFile.c_str(), ios::binary); if(fs.fail()) { cerr << "Could not open output file: " << strerror(errno) << endl; diff --git a/cpp/src/IceStorm/Instance.cpp b/cpp/src/IceStorm/Instance.cpp index 5be83c5bb99..8674c057ba9 100644 --- a/cpp/src/IceStorm/Instance.cpp +++ b/cpp/src/IceStorm/Instance.cpp @@ -59,7 +59,8 @@ PersistentInstance::PersistentInstance( try { dbContext.communicator = communicator; - dbContext.encoding = { 1, 1 }; + dbContext.encoding.minor = 1; + dbContext.encoding.major = 1; IceDB::ReadWriteTxn txn(_dbEnv); diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile index b520301a05d..c794b439c1a 100644 --- a/cpp/src/IceStorm/Makefile +++ b/cpp/src/IceStorm/Makefile @@ -61,7 +61,7 @@ RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) include $(top_srcdir)/config/Make.rules -CPPFLAGS := $(CPPFLAGS) -I.. $(READLINE_FLAGS) +CPPFLAGS := $(CPPFLAGS) -I.. $(READLINE_FLAGS) $(LMDB_FLAGS) ICECPPFLAGS := $(ICECPPFLAGS) -I.. SLICE2CPPFLAGS := --ice --include-dir IceStorm $(SLICE2CPPFLAGS) LINKWITH := $(BZIP2_RPATH_LINK) -lIceStorm -lIceGrid -lGlacier2 -lIceBox -lIce -lIceUtil -lIceDB |