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/include/Slice/Preprocessor.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/include/Slice/Preprocessor.h')
| -rw-r--r-- | cpp/include/Slice/Preprocessor.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/cpp/include/Slice/Preprocessor.h b/cpp/include/Slice/Preprocessor.h index 969f4e09054..ee58e8f312c 100644 --- a/cpp/include/Slice/Preprocessor.h +++ b/cpp/include/Slice/Preprocessor.h @@ -7,16 +7,11 @@ // // ********************************************************************** -#ifndef PREPROCESSOR_H -#define PREPROCESSOR_H +#pragma once #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> #include <vector> -#include <cstdio> -#ifdef __BCPLUSPLUS__ -# include <stdio.h> -#endif #ifndef SLICE_API # ifdef SLICE_API_EXPORTS @@ -68,5 +63,3 @@ private: }; } - -#endif |