diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-09-10 08:49:45 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-09-10 08:49:45 +0200 |
| commit | 981d2ac7c8f825f92670f9121a7d29edd94da6f9 (patch) | |
| tree | 286f13f365513c9894c0ec4167b8bbef30965bf9 /cpp/src/Ice/PropertiesI.h | |
| parent | Fixed communicator flushBatchRequests to allow tracing (diff) | |
| parent | Fixed ICE-4863 (IceProxy::Ice::Object derives privately from Mutex) + a few w... (diff) | |
| download | ice-981d2ac7c8f825f92670f9121a7d29edd94da6f9.tar.bz2 ice-981d2ac7c8f825f92670f9121a7d29edd94da6f9.tar.xz ice-981d2ac7c8f825f92670f9121a7d29edd94da6f9.zip | |
Merge remote-tracking branch 'origin/encoding11' into withoutsync
Conflicts:
cpp/src/Ice/PropertyNames.cpp
cpp/src/Ice/PropertyNames.h
Diffstat (limited to 'cpp/src/Ice/PropertiesI.h')
| -rw-r--r-- | cpp/src/Ice/PropertiesI.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/Ice/PropertiesI.h b/cpp/src/Ice/PropertiesI.h index a54b042cff2..5e65f91f330 100644 --- a/cpp/src/Ice/PropertiesI.h +++ b/cpp/src/Ice/PropertiesI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PROPERTIES_I_H +#define ICE_PROPERTIES_I_H #include <IceUtil/Mutex.h> #include <Ice/Properties.h> @@ -73,3 +74,5 @@ private: }; } + +#endif |