diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
| commit | 7047b953adab26c7098cbfaea2b69f9d36231cd3 (patch) | |
| tree | 8668c830838184ebc465554b85c085da42fb6f6a /cpp/src/Freeze/ObjectStore.h | |
| parent | Missing files (diff) | |
| parent | Removed Stream::format method, replace with startWriteEncaps parameter (diff) | |
| download | ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.bz2 ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.xz ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/src/Ice/.depend
cpp/src/Ice/.depend.mak
cpp/src/slice2cpp/Gen.cpp
Diffstat (limited to 'cpp/src/Freeze/ObjectStore.h')
| -rw-r--r-- | cpp/src/Freeze/ObjectStore.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/cpp/src/Freeze/ObjectStore.h b/cpp/src/Freeze/ObjectStore.h index 579344e0c2c..a78c3e197d9 100644 --- a/cpp/src/Freeze/ObjectStore.h +++ b/cpp/src/Freeze/ObjectStore.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef FREEZE_OBJECT_STORE_H -#define FREEZE_OBJECT_STORE_H +#pragma once #include <Ice/Ice.h> #include <Ice/Identity.h> @@ -96,14 +95,7 @@ class ObjectStore : public ObjectStoreBase, public IceUtil::Cache<Ice::Identity, { } -#ifdef __BCPLUSPLUS__ - bool load(const Ice::Identity& ident, const TransactionIPtr& trans, ObjectRecord& rec) - { - return ObjectStoreBase::load(ident, trans, rec); - } -#else using ObjectStoreBase::load; -#endif typedef IceUtil::Cache<Ice::Identity, T> Cache; @@ -171,6 +163,3 @@ ObjectStoreBase::sampleServant() const } } - -#endif - |