summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-08-10 01:17:09 +0200
committerJose <jose@zeroc.com>2012-08-10 01:17:09 +0200
commit9c6a27b2189744e4a3ec9c09705f0d35607c2671 (patch)
tree2f2f4a96d19956bc38b2cd1f96839f2bba01febf
parentFixed file permissions (diff)
downloadice-9c6a27b2189744e4a3ec9c09705f0d35607c2671.tar.bz2
ice-9c6a27b2189744e4a3ec9c09705f0d35607c2671.tar.xz
ice-9c6a27b2189744e4a3ec9c09705f0d35607c2671.zip
Minor fixes to Scanner generated files to just include ScannerConfig.h.
Diffstat
-rw-r--r--cpp/config/Make.rules1
-rw-r--r--cpp/demo/Freeze/library/Makefile.mak1
-rw-r--r--cpp/demo/Freeze/library/Scanner.cpp1
-rw-r--r--cpp/demo/Freeze/phonebook/Makefile.mak1
-rw-r--r--cpp/demo/Freeze/phonebook/Scanner.cpp1
-rw-r--r--cpp/demo/book/evictor_filesystem/Makefile.mak1
-rw-r--r--cpp/demo/book/evictor_filesystem/Scanner.cpp1
-rw-r--r--cpp/demo/book/lifecycle/Makefile.mak1
-rw-r--r--cpp/demo/book/lifecycle/Scanner.cpp1
-rw-r--r--cpp/demo/book/map_filesystem/Makefile.mak1
-rw-r--r--cpp/demo/book/map_filesystem/Scanner.cpp1
-rw-r--r--cpp/include/IceUtil/ScannerConfig.h2
-rw-r--r--cpp/src/FreezeScript/Makefile.mak1
-rw-r--r--cpp/src/FreezeScript/Scanner.cpp1
-rw-r--r--cpp/src/IceGrid/Makefile.mak1
-rw-r--r--cpp/src/IceGrid/Scanner.cpp1
-rw-r--r--cpp/src/IceStorm/Makefile.mak1
-rw-r--r--cpp/src/IceStorm/Scanner.cpp1
-rw-r--r--cpp/src/Slice/Makefile.mak1
-rw-r--r--cpp/src/Slice/Scanner.cpp1
-rw-r--r--cpp/test/Freeze/complex/Makefile.mak1
-rw-r--r--cpp/test/Freeze/complex/Scanner.cpp1
22 files changed, 2 insertions, 21 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index bb4d057b9d8..878b330e3ce 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -356,7 +356,6 @@ $(HDIR)/%.h %.cpp: $(SDIR)/%.ice $(SLICE2CPP) $(SLICEPARSERLIB)
%.cpp: %.l
flex $(FLEXFLAGS) $<
rm -f $@
- echo '#include <IceUtil/Config.h>' > $@
echo '#include <IceUtil/ScannerConfig.h>' >> $@
cat lex.yy.c >> $@
rm -f lex.yy.c
diff --git a/cpp/demo/Freeze/library/Makefile.mak b/cpp/demo/Freeze/library/Makefile.mak
index 95477459972..8f19b19c836 100644
--- a/cpp/demo/Freeze/library/Makefile.mak
+++ b/cpp/demo/Freeze/library/Makefile.mak
@@ -75,7 +75,6 @@ LibraryTypes.h LibraryTypes.cpp: Library.ice "$(SLICE2FREEZE)" "$(SLICEPARSERLIB
Scanner.cpp : Scanner.l
flex Scanner.l
del /q $@
- echo #include "IceUtil/Config.h" > Scanner.cpp
echo #include "IceUtil/ScannerConfig.h" >> Scanner.cpp
type lex.yy.c >> Scanner.cpp
del /q lex.yy.c
diff --git a/cpp/demo/Freeze/library/Scanner.cpp b/cpp/demo/Freeze/library/Scanner.cpp
index f354a8c8213..1b215e134d4 100644
--- a/cpp/demo/Freeze/library/Scanner.cpp
+++ b/cpp/demo/Freeze/library/Scanner.cpp
@@ -1,4 +1,3 @@
-#include <IceUtil/Config.h>
#include <IceUtil/ScannerConfig.h>
#line 3 "lex.yy.c"
diff --git a/cpp/demo/Freeze/phonebook/Makefile.mak b/cpp/demo/Freeze/phonebook/Makefile.mak
index 31dc02813b4..dd6a1f5d63a 100644
--- a/cpp/demo/Freeze/phonebook/Makefile.mak
+++ b/cpp/demo/Freeze/phonebook/Makefile.mak
@@ -74,7 +74,6 @@ NameIndex.h NameIndex.cpp: PhoneBook.ice "$(SLICE2FREEZE)" "$(SLICEPARSERLIB)"
Scanner.cpp : Scanner.l
flex Scanner.l
del /q $@
- echo #include "IceUtil/Config.h" > Scanner.cpp
echo #include "IceUtil/ScannerConfig.h" >> Scanner.cpp
type lex.yy.c >> Scanner.cpp
del /q lex.yy.c
diff --git a/cpp/demo/Freeze/phonebook/Scanner.cpp b/cpp/demo/Freeze/phonebook/Scanner.cpp
index 24531195c85..852d8f9f795 100644
--- a/cpp/demo/Freeze/phonebook/Scanner.cpp
+++ b/cpp/demo/Freeze/phonebook/Scanner.cpp
@@ -1,4 +1,3 @@
-#include <IceUtil/Config.h>
#include <IceUtil/ScannerConfig.h>
#line 3 "lex.yy.c"
diff --git a/cpp/demo/book/evictor_filesystem/Makefile.mak b/cpp/demo/book/evictor_filesystem/Makefile.mak
index a9ba2402486..7a9a6adf028 100644
--- a/cpp/demo/book/evictor_filesystem/Makefile.mak
+++ b/cpp/demo/book/evictor_filesystem/Makefile.mak
@@ -52,7 +52,6 @@ $(SERVER): $(OBJS) $(SOBJS)
Scanner.cpp: Scanner.l
flex Scanner.l
-del /q $@
- echo #include "IceUtil/Config.h" > Scanner.cpp
echo #include "IceUtil/ScannerConfig.h" >> Scanner.cpp
type lex.yy.c >> Scanner.cpp
-del /q lex.yy.c
diff --git a/cpp/demo/book/evictor_filesystem/Scanner.cpp b/cpp/demo/book/evictor_filesystem/Scanner.cpp
index cd5a1436767..bc4b1c7f7a3 100644
--- a/cpp/demo/book/evictor_filesystem/Scanner.cpp
+++ b/cpp/demo/book/evictor_filesystem/Scanner.cpp
@@ -1,4 +1,3 @@
-#include <IceUtil/Config.h>
#include <IceUtil/ScannerConfig.h>
#line 3 "lex.yy.c"
diff --git a/cpp/demo/book/lifecycle/Makefile.mak b/cpp/demo/book/lifecycle/Makefile.mak
index c4278fd7189..68226186bb4 100644
--- a/cpp/demo/book/lifecycle/Makefile.mak
+++ b/cpp/demo/book/lifecycle/Makefile.mak
@@ -50,7 +50,6 @@ $(SERVER): $(OBJS) $(SOBJS)
Scanner.cpp: Scanner.l
flex Scanner.l
-del /q $@
- echo #include "IceUtil/Config.h" > Scanner.cpp
echo #include "IceUtil/ScannerConfig.h" >> Scanner.cpp
type lex.yy.c >> Scanner.cpp
-del /q lex.yy.c
diff --git a/cpp/demo/book/lifecycle/Scanner.cpp b/cpp/demo/book/lifecycle/Scanner.cpp
index cd5a1436767..bc4b1c7f7a3 100644
--- a/cpp/demo/book/lifecycle/Scanner.cpp
+++ b/cpp/demo/book/lifecycle/Scanner.cpp
@@ -1,4 +1,3 @@
-#include <IceUtil/Config.h>
#include <IceUtil/ScannerConfig.h>
#line 3 "lex.yy.c"
diff --git a/cpp/demo/book/map_filesystem/Makefile.mak b/cpp/demo/book/map_filesystem/Makefile.mak
index 95891231e38..4ff671ece4e 100644
--- a/cpp/demo/book/map_filesystem/Makefile.mak
+++ b/cpp/demo/book/map_filesystem/Makefile.mak
@@ -68,7 +68,6 @@ IdentityDirectoryEntryMap.cpp: FilesystemDB.ice Filesystem.ice "$(SLICE2FREEZE)"
Scanner.cpp: Scanner.l
flex Scanner.l
-del /q $@
- echo #include "IceUtil/Config.h" > Scanner.cpp
echo #include "IceUtil/ScannerConfig.h" >> Scanner.cpp
type lex.yy.c >> Scanner.cpp
-del /q lex.yy.c
diff --git a/cpp/demo/book/map_filesystem/Scanner.cpp b/cpp/demo/book/map_filesystem/Scanner.cpp
index cd5a1436767..bc4b1c7f7a3 100644
--- a/cpp/demo/book/map_filesystem/Scanner.cpp
+++ b/cpp/demo/book/map_filesystem/Scanner.cpp
@@ -1,4 +1,3 @@
-#include <IceUtil/Config.h>
#include <IceUtil/ScannerConfig.h>
#line 3 "lex.yy.c"
diff --git a/cpp/include/IceUtil/ScannerConfig.h b/cpp/include/IceUtil/ScannerConfig.h
index aa3786ecc48..dee5caeb80f 100644
--- a/cpp/include/IceUtil/ScannerConfig.h
+++ b/cpp/include/IceUtil/ScannerConfig.h
@@ -9,6 +9,8 @@
#pragma once
+#include <IceUtil/Config.h> // Required by generated Scanners.
+
//
// COMPILERFIX: VC compilers does not provide stdint.h header until VC100
// the header must be included before that macros for integral types
diff --git a/cpp/src/FreezeScript/Makefile.mak b/cpp/src/FreezeScript/Makefile.mak
index c9171d9cc03..2d41a1b864a 100644
--- a/cpp/src/FreezeScript/Makefile.mak
+++ b/cpp/src/FreezeScript/Makefile.mak
@@ -65,7 +65,6 @@ $(DUMPDB): $(DUMP_OBJS) $(COMMON_OBJS) DumpDB.res
Scanner.cpp : Scanner.l
flex Scanner.l
del /q $@
- echo #include "IceUtil/Config.h" > Scanner.cpp
echo #include "IceUtil/ScannerConfig.h" >> Scanner.cpp
type lex.yy.c >> Scanner.cpp
del /q lex.yy.c
diff --git a/cpp/src/FreezeScript/Scanner.cpp b/cpp/src/FreezeScript/Scanner.cpp
index 7d6d74a323c..6b9c34b3314 100644
--- a/cpp/src/FreezeScript/Scanner.cpp
+++ b/cpp/src/FreezeScript/Scanner.cpp
@@ -1,4 +1,3 @@
-#include <IceUtil/Config.h>
#include <IceUtil/ScannerConfig.h>
#line 2 "lex.yy.c"
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak
index c7b1f01ac39..f9e582fa235 100644
--- a/cpp/src/IceGrid/Makefile.mak
+++ b/cpp/src/IceGrid/Makefile.mak
@@ -129,7 +129,6 @@ $(NODE_SERVER): $(NODE_SVR_OBJS) IceGridNode.res
Scanner.cpp : Scanner.l
flex Scanner.l
del /q $@
- echo #include "IceUtil/Config.h" > Scanner.cpp
echo #include "IceUtil/ScannerConfig.h" >> Scanner.cpp
type lex.yy.c >> Scanner.cpp
del /q lex.yy.c
diff --git a/cpp/src/IceGrid/Scanner.cpp b/cpp/src/IceGrid/Scanner.cpp
index 7764b17081e..7a5103303c3 100644
--- a/cpp/src/IceGrid/Scanner.cpp
+++ b/cpp/src/IceGrid/Scanner.cpp
@@ -1,4 +1,3 @@
-#include <IceUtil/Config.h>
#include <IceUtil/ScannerConfig.h>
#line 3 "lex.yy.c"
diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak
index 7aa1fb4fa59..1e59d63ab50 100644
--- a/cpp/src/IceStorm/Makefile.mak
+++ b/cpp/src/IceStorm/Makefile.mak
@@ -85,7 +85,6 @@ $(ADMIN): $(AOBJS) IceStormAdmin.res
Scanner.cpp: Scanner.l
flex Scanner.l
del /q $@
- echo #include "IceUtil/Config.h" > Scanner.cpp
echo #include "IceUtil/ScannerConfig.h" >> Scanner.cpp
type lex.yy.c >> Scanner.cpp
del /q lex.yy.c
diff --git a/cpp/src/IceStorm/Scanner.cpp b/cpp/src/IceStorm/Scanner.cpp
index 3ec213592fa..7c38d13adde 100644
--- a/cpp/src/IceStorm/Scanner.cpp
+++ b/cpp/src/IceStorm/Scanner.cpp
@@ -1,4 +1,3 @@
-#include <IceUtil/Config.h>
#include <IceUtil/ScannerConfig.h>
#line 3 "lex.yy.c"
diff --git a/cpp/src/Slice/Makefile.mak b/cpp/src/Slice/Makefile.mak
index 0411567b9a9..2d90e21eb18 100644
--- a/cpp/src/Slice/Makefile.mak
+++ b/cpp/src/Slice/Makefile.mak
@@ -67,7 +67,6 @@ $(DLLNAME): $(OBJS) Slice.res
Scanner.cpp : Scanner.l
flex Scanner.l
del /q $@
- echo #include "IceUtil/Config.h" > Scanner.cpp
echo #include "IceUtil/ScannerConfig.h" >> Scanner.cpp
type lex.yy.c >> Scanner.cpp
del /q lex.yy.c
diff --git a/cpp/src/Slice/Scanner.cpp b/cpp/src/Slice/Scanner.cpp
index 68dff0905ba..54541891c2e 100644
--- a/cpp/src/Slice/Scanner.cpp
+++ b/cpp/src/Slice/Scanner.cpp
@@ -1,4 +1,3 @@
-#include <IceUtil/Config.h>
#include <IceUtil/ScannerConfig.h>
#line 2 "lex.yy.c"
diff --git a/cpp/test/Freeze/complex/Makefile.mak b/cpp/test/Freeze/complex/Makefile.mak
index 03fb8f9a5cf..6e3b57df38c 100644
--- a/cpp/test/Freeze/complex/Makefile.mak
+++ b/cpp/test/Freeze/complex/Makefile.mak
@@ -42,7 +42,6 @@ ComplexDict.h ComplexDict.cpp: Complex.ice "$(SLICE2FREEZE)" "$(SLICEPARSERLIB)"
Scanner.cpp : Scanner.l
flex Scanner.l
del /q $@
- echo #include "IceUtil/Config.h" > Scanner.cpp
echo #include "IceUtil/ScannerConfig.h" >> Scanner.cpp
type lex.yy.c >> Scanner.cpp
del /q lex.yy.c
diff --git a/cpp/test/Freeze/complex/Scanner.cpp b/cpp/test/Freeze/complex/Scanner.cpp
index cc02c896c6e..57f18d355a4 100644
--- a/cpp/test/Freeze/complex/Scanner.cpp
+++ b/cpp/test/Freeze/complex/Scanner.cpp
@@ -1,4 +1,3 @@
-#include <IceUtil/Config.h>
#include <IceUtil/ScannerConfig.h>
#line 3 "lex.yy.c"
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 22:57:10 +0000