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/Slice/GrammarUtil.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/Slice/GrammarUtil.h')
| -rw-r--r-- | cpp/src/Slice/GrammarUtil.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cpp/src/Slice/GrammarUtil.h b/cpp/src/Slice/GrammarUtil.h index c803152dd24..756eda5d17b 100644 --- a/cpp/src/Slice/GrammarUtil.h +++ b/cpp/src/Slice/GrammarUtil.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef SLICE_GRAMMAR_UTIL_H -#define SLICE_GRAMMAR_UTIL_H +#pragma once #include <Slice/Parser.h> @@ -215,5 +214,3 @@ int slice_parse(); // yyoverflow. // #define yyoverflow(a, b, c, d, e, f) yyerror(a) - -#endif |