diff options
| author | Jose <jose@zeroc.com> | 2015-12-01 17:36:19 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-12-01 17:36:19 +0100 |
| commit | 2029ff368e49fae489b8ec8fc12f7d126b182dfb (patch) | |
| tree | 6075d652b7851831c39e6f22004d8720864f1a60 /cpp/include/Ice/ACMF.h | |
| parent | The default LMDB map size for IceGrid and IceStorm is now 10MB (Windows) (diff) | |
| download | ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.tar.bz2 ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.tar.xz ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.zip | |
C++11 mapping initial commit
Diffstat (limited to 'cpp/include/Ice/ACMF.h')
| -rw-r--r-- | cpp/include/Ice/ACMF.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cpp/include/Ice/ACMF.h b/cpp/include/Ice/ACMF.h index f4d9d581a36..9f2bebfd358 100644 --- a/cpp/include/Ice/ACMF.h +++ b/cpp/include/Ice/ACMF.h @@ -18,12 +18,18 @@ namespace IceInternal { class ACMMonitor; +class FactoryACMMonitor; + +#ifdef ICE_CPP11_MAPPING +typedef ::std::shared_ptr<ACMMonitor> ACMMonitorPtr; +typedef ::std::shared_ptr<FactoryACMMonitor> FactoryACMMonitorPtr; +#else ICE_API IceUtil::Shared* upCast(ACMMonitor*); typedef IceInternal::Handle<ACMMonitor> ACMMonitorPtr; -class FactoryACMMonitor; ICE_API IceUtil::Shared* upCast(FactoryACMMonitor*); typedef IceInternal::Handle<FactoryACMMonitor> FactoryACMMonitorPtr; +#endif } |