summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test')
-rw-r--r--cpp/test/Ice/custom/AllTests.cpp3
-rw-r--r--cpp/test/Ice/custom/Client.cpp3
-rw-r--r--cpp/test/Ice/custom/Collocated.cpp3
-rw-r--r--cpp/test/Ice/custom/Makefile2
-rw-r--r--cpp/test/Ice/custom/Server.cpp3
-rw-r--r--cpp/test/Ice/custom/ServerAMD.cpp3
-rw-r--r--cpp/test/Ice/custom/Test.ice2
-rw-r--r--cpp/test/Ice/custom/TestAMD.ice2
-rw-r--r--cpp/test/Ice/custom/TestAMDI.cpp5
-rw-r--r--cpp/test/Ice/custom/TestI.cpp5
-rwxr-xr-xcpp/test/Ice/custom/customAMDS.dsp8
-rw-r--r--cpp/test/Ice/custom/customC.dsp8
-rw-r--r--cpp/test/Ice/custom/customCOL.dsp8
-rw-r--r--cpp/test/Ice/custom/customS.dsp8
14 files changed, 23 insertions, 40 deletions
diff --git a/cpp/test/Ice/custom/AllTests.cpp b/cpp/test/Ice/custom/AllTests.cpp
index c5a6d2e9d6e..9dd0c219a94 100644
--- a/cpp/test/Ice/custom/AllTests.cpp
+++ b/cpp/test/Ice/custom/AllTests.cpp
@@ -9,9 +9,6 @@
#include <Ice/Ice.h>
#include <TestCommon.h>
-#include <deque>
-#include <list>
-#include <MyByteSeq.h>
#include <Test.h>
using namespace std;
diff --git a/cpp/test/Ice/custom/Client.cpp b/cpp/test/Ice/custom/Client.cpp
index 422611add8a..fb5bdd565f6 100644
--- a/cpp/test/Ice/custom/Client.cpp
+++ b/cpp/test/Ice/custom/Client.cpp
@@ -9,9 +9,6 @@
#include <Ice/Ice.h>
#include <TestCommon.h>
-#include <deque>
-#include <list>
-#include <MyByteSeq.h>
#include <Test.h>
using namespace std;
diff --git a/cpp/test/Ice/custom/Collocated.cpp b/cpp/test/Ice/custom/Collocated.cpp
index 6f85c42876a..6cbd32a7316 100644
--- a/cpp/test/Ice/custom/Collocated.cpp
+++ b/cpp/test/Ice/custom/Collocated.cpp
@@ -9,9 +9,6 @@
#include <Ice/Ice.h>
#include <TestCommon.h>
-#include <deque>
-#include <list>
-#include <MyByteSeq.h>
#include <TestI.h>
using namespace std;
diff --git a/cpp/test/Ice/custom/Makefile b/cpp/test/Ice/custom/Makefile
index 2f6139680d1..a76f600b569 100644
--- a/cpp/test/Ice/custom/Makefile
+++ b/cpp/test/Ice/custom/Makefile
@@ -46,7 +46,7 @@ SLICE_SRCS = Test.ice TestAMD.ice
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. -I../../include $(CPPFLAGS)
-SLICE2CPPFLAGS := --stream --add-header MyByteSeq.h --add-header deque --add-header list $(SLICE2CPPFLAGS)
+SLICE2CPPFLAGS := --stream $(SLICE2CPPFLAGS)
$(CLIENT): $(COBJS)
rm -f $@
diff --git a/cpp/test/Ice/custom/Server.cpp b/cpp/test/Ice/custom/Server.cpp
index 412b7d316e7..05d8c9a227e 100644
--- a/cpp/test/Ice/custom/Server.cpp
+++ b/cpp/test/Ice/custom/Server.cpp
@@ -9,9 +9,6 @@
#include <Ice/Ice.h>
#include <TestCommon.h>
-#include <deque>
-#include <list>
-#include <MyByteSeq.h>
#include <TestI.h>
using namespace std;
diff --git a/cpp/test/Ice/custom/ServerAMD.cpp b/cpp/test/Ice/custom/ServerAMD.cpp
index ff130ef3b91..d6fea972523 100644
--- a/cpp/test/Ice/custom/ServerAMD.cpp
+++ b/cpp/test/Ice/custom/ServerAMD.cpp
@@ -9,9 +9,6 @@
#include <Ice/Ice.h>
#include <TestCommon.h>
-#include <deque>
-#include <list>
-#include <MyByteSeq.h>
#include <TestAMDI.h>
using namespace std;
diff --git a/cpp/test/Ice/custom/Test.ice b/cpp/test/Ice/custom/Test.ice
index 18f7f91c88c..bb96b774ae5 100644
--- a/cpp/test/Ice/custom/Test.ice
+++ b/cpp/test/Ice/custom/Test.ice
@@ -10,6 +10,8 @@
#ifndef TEST_ICE
#define TEST_ICE
+[["cpp:include:deque", "cpp:include:list", "cpp:include:MyByteSeq.h"]]
+
module Test
{
diff --git a/cpp/test/Ice/custom/TestAMD.ice b/cpp/test/Ice/custom/TestAMD.ice
index 68b5a53c4c2..42b164224f1 100644
--- a/cpp/test/Ice/custom/TestAMD.ice
+++ b/cpp/test/Ice/custom/TestAMD.ice
@@ -10,6 +10,8 @@
#ifndef TEST_ICE
#define TEST_ICE
+[["cpp:include:deque", "cpp:include:list", "cpp:include:MyByteSeq.h"]]
+
module Test
{
diff --git a/cpp/test/Ice/custom/TestAMDI.cpp b/cpp/test/Ice/custom/TestAMDI.cpp
index 1a00141fb4f..cf0ce022387 100644
--- a/cpp/test/Ice/custom/TestAMDI.cpp
+++ b/cpp/test/Ice/custom/TestAMDI.cpp
@@ -7,10 +7,7 @@
//
// **********************************************************************
-#include <Ice/Ice.h>
-#include <MyByteSeq.h>
-#include <deque>
-#include <list>
+#include <Ice/Communicator.h>
#include <TestAMDI.h>
TestIntfI::TestIntfI(const Ice::CommunicatorPtr& communicator)
diff --git a/cpp/test/Ice/custom/TestI.cpp b/cpp/test/Ice/custom/TestI.cpp
index 1fa5e275c94..6acedc87000 100644
--- a/cpp/test/Ice/custom/TestI.cpp
+++ b/cpp/test/Ice/custom/TestI.cpp
@@ -7,10 +7,7 @@
//
// **********************************************************************
-#include <Ice/Ice.h>
-#include <deque>
-#include <list>
-#include <MyByteSeq.h>
+#include <Ice/Communicator.h>
#include <TestI.h>
TestIntfI::TestIntfI(const Ice::CommunicatorPtr& communicator)
diff --git a/cpp/test/Ice/custom/customAMDS.dsp b/cpp/test/Ice/custom/customAMDS.dsp
index 67065873301..6b9eaf955de 100755
--- a/cpp/test/Ice/custom/customAMDS.dsp
+++ b/cpp/test/Ice/custom/customAMDS.dsp
@@ -193,7 +193,7 @@ SOURCE=.\TestAMD.ice
InputPath=.\TestAMD.ice
BuildCmds= \
- slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list TestAMD.ice
+ slice2cpp.exe -I. --stream TestAMD.ice
"TestAMD.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -208,7 +208,7 @@ BuildCmds= \
InputPath=.\TestAMD.ice
BuildCmds= \
- slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list TestAMD.ice
+ slice2cpp.exe -I. --stream TestAMD.ice
"TestAMD.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -223,7 +223,7 @@ BuildCmds= \
InputPath=.\TestAMD.ice
BuildCmds= \
- slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list TestAMD.ice
+ slice2cpp.exe -I. --stream TestAMD.ice
"TestAMD.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -238,7 +238,7 @@ BuildCmds= \
InputPath=.\TestAMD.ice
BuildCmds= \
- slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list TestAMD.ice
+ slice2cpp.exe -I. --stream TestAMD.ice
"TestAMD.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cpp/test/Ice/custom/customC.dsp b/cpp/test/Ice/custom/customC.dsp
index 583b6d6cdfd..30415c965d8 100644
--- a/cpp/test/Ice/custom/customC.dsp
+++ b/cpp/test/Ice/custom/customC.dsp
@@ -189,7 +189,7 @@ SOURCE=.\Test.ice
InputPath=.\Test.ice
BuildCmds= \
- slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -204,7 +204,7 @@ BuildCmds= \
InputPath=.\Test.ice
BuildCmds= \
- slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -219,7 +219,7 @@ BuildCmds= \
InputPath=.\Test.ice
BuildCmds= \
- slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -234,7 +234,7 @@ BuildCmds= \
InputPath=.\Test.ice
BuildCmds= \
- slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cpp/test/Ice/custom/customCOL.dsp b/cpp/test/Ice/custom/customCOL.dsp
index 9df67f1d0a1..7bd85b45578 100644
--- a/cpp/test/Ice/custom/customCOL.dsp
+++ b/cpp/test/Ice/custom/customCOL.dsp
@@ -197,7 +197,7 @@ SOURCE=.\Test.ice
InputPath=.\Test.ice
BuildCmds= \
- slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -212,7 +212,7 @@ BuildCmds= \
InputPath=.\Test.ice
BuildCmds= \
- slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -227,7 +227,7 @@ BuildCmds= \
InputPath=.\Test.ice
BuildCmds= \
- slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -242,7 +242,7 @@ BuildCmds= \
InputPath=.\Test.ice
BuildCmds= \
- slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cpp/test/Ice/custom/customS.dsp b/cpp/test/Ice/custom/customS.dsp
index fc9dcd43623..681ec06bcaa 100644
--- a/cpp/test/Ice/custom/customS.dsp
+++ b/cpp/test/Ice/custom/customS.dsp
@@ -193,7 +193,7 @@ SOURCE=.\Test.ice
InputPath=.\Test.ice
BuildCmds= \
- slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -208,7 +208,7 @@ BuildCmds= \
InputPath=.\Test.ice
BuildCmds= \
- slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -223,7 +223,7 @@ BuildCmds= \
InputPath=.\Test.ice
BuildCmds= \
- slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -238,7 +238,7 @@ BuildCmds= \
InputPath=.\Test.ice
BuildCmds= \
- slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-06 05:39:12 +0000