diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 10:24:57 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 10:24:57 +0200 |
| commit | e6f5dc2c89eda44fb0a3d444223131a31867a1b2 (patch) | |
| tree | b6bddfe0a0cccef45484314f47967d95a01472bb /cpp/src/Freeze/SharedDbEnv.h | |
| parent | more Java changes & tests (diff) | |
| parent | ICE-4804 - Properties and case-mismatch (diff) | |
| download | ice-e6f5dc2c89eda44fb0a3d444223131a31867a1b2.tar.bz2 ice-e6f5dc2c89eda44fb0a3d444223131a31867a1b2.tar.xz ice-e6f5dc2c89eda44fb0a3d444223131a31867a1b2.zip | |
Merge remote-tracking branch 'origin/master' into encoding11
Conflicts:
cpp/include/Ice/Stream.h
cpp/include/Slice/Preprocessor.h
rb/ruby/Makefile.mak
Diffstat (limited to 'cpp/src/Freeze/SharedDbEnv.h')
| -rw-r--r-- | cpp/src/Freeze/SharedDbEnv.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cpp/src/Freeze/SharedDbEnv.h b/cpp/src/Freeze/SharedDbEnv.h index 0afd4b9098f..53c54988bb7 100644 --- a/cpp/src/Freeze/SharedDbEnv.h +++ b/cpp/src/Freeze/SharedDbEnv.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef FREEZE_SHARED_DB_ENV_H -#define FREEZE_SHARED_DB_ENV_H +#pragma once #include <Freeze/Map.h> #include <IceUtil/FileUtil.h> @@ -127,4 +126,3 @@ SharedDbEnv::getEncoding() const } } -#endif |