summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test')
-rwxr-xr-xcpp/test/Freeze/fileLock/run.py2
-rw-r--r--cpp/test/Ice/interceptor/TestI.cpp28
-rw-r--r--cpp/test/IceBox/configuration/config.service1-22
-rw-r--r--cpp/test/IceGrid/replication/useraccounts.txt4
-rw-r--r--cpp/test/IceUtil/fileLock/Makefile.mak2
-rwxr-xr-xcpp/test/IceUtil/fileLock/run.py2
-rwxr-xr-xcpp/test/IceUtil/unicode/LICENSE6
-rw-r--r--cpp/test/IceUtil/unicode/filename.txt2
-rw-r--r--cpp/test/Slice/errorDetection/IllegalLocal.err46
-rw-r--r--cpp/test/Slice/parser/Makefile.mak56
10 files changed, 75 insertions, 75 deletions
diff --git a/cpp/test/Freeze/fileLock/run.py b/cpp/test/Freeze/fileLock/run.py
index 3e743ae91c7..73defbe6c19 100755
--- a/cpp/test/Freeze/fileLock/run.py
+++ b/cpp/test/Freeze/fileLock/run.py
@@ -46,4 +46,4 @@ clientExe.sendline('go')
clientExe.expect('File lock released.')
clientExe.waitTestSuccess()
-print "ok" \ No newline at end of file
+print "ok"
diff --git a/cpp/test/Ice/interceptor/TestI.cpp b/cpp/test/Ice/interceptor/TestI.cpp
index 4cd1f54ea2a..e5e74ae0015 100644
--- a/cpp/test/Ice/interceptor/TestI.cpp
+++ b/cpp/test/Ice/interceptor/TestI.cpp
@@ -6,20 +6,20 @@
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
+
#ifndef INTERCEPTOR_TEST_API_EXPORTS
# define INTERCEPTOR_TEST_API_EXPORTS
#endif
-#include <Ice/Ice.h>
-#include <Test.h>
-#include <iostream>
-
-using namespace IceUtil;
-using namespace std;
-
-void
-Test::RetryException::ice_print(ostream& out) const
-{
- Exception::ice_print(out);
- out << ":\nretry dispatch";
-}
+#include <Ice/Ice.h>
+#include <Test.h>
+#include <iostream>
+
+using namespace IceUtil;
+using namespace std;
+
+void
+Test::RetryException::ice_print(ostream& out) const
+{
+ Exception::ice_print(out);
+ out << ":\nretry dispatch";
+}
diff --git a/cpp/test/IceBox/configuration/config.service1-2 b/cpp/test/IceBox/configuration/config.service1-2
index 76064138212..c173914db2a 100644
--- a/cpp/test/IceBox/configuration/config.service1-2
+++ b/cpp/test/IceBox/configuration/config.service1-2
@@ -8,4 +8,4 @@ OverrideMe=2
UnsetMe=
-Ice.PrintAdapterReady=0 \ No newline at end of file
+Ice.PrintAdapterReady=0
diff --git a/cpp/test/IceGrid/replication/useraccounts.txt b/cpp/test/IceGrid/replication/useraccounts.txt
index de136797a01..98b9109d438 100644
--- a/cpp/test/IceGrid/replication/useraccounts.txt
+++ b/cpp/test/IceGrid/replication/useraccounts.txt
@@ -1,2 +1,2 @@
-dummy1 Dummy User Account1
-dummy2 Dummy User Account2 \ No newline at end of file
+dummy1 Dummy User Account1
+dummy2 Dummy User Account2
diff --git a/cpp/test/IceUtil/fileLock/Makefile.mak b/cpp/test/IceUtil/fileLock/Makefile.mak
index 15e910f44db..02b98eb081d 100644
--- a/cpp/test/IceUtil/fileLock/Makefile.mak
+++ b/cpp/test/IceUtil/fileLock/Makefile.mak
@@ -40,4 +40,4 @@ $(CLIENTF): $(OBJFS)
clean::
del /q run.pid
-!include .depend.mak
+!include .depend.mak
diff --git a/cpp/test/IceUtil/fileLock/run.py b/cpp/test/IceUtil/fileLock/run.py
index e84ffa2ee09..9232b4b2448 100755
--- a/cpp/test/IceUtil/fileLock/run.py
+++ b/cpp/test/IceUtil/fileLock/run.py
@@ -53,4 +53,4 @@ clientExe.expect('File lock acquired.\.*')
clientExe.sendline('go')
clientExe.expect('File lock released.')
clientExe.waitTestSuccess()
-print "ok" \ No newline at end of file
+print "ok"
diff --git a/cpp/test/IceUtil/unicode/LICENSE b/cpp/test/IceUtil/unicode/LICENSE
index 06484a8c158..7b66698dba5 100755
--- a/cpp/test/IceUtil/unicode/LICENSE
+++ b/cpp/test/IceUtil/unicode/LICENSE
@@ -1,3 +1,3 @@
-The content of the *.utf* files comes from Wikipedia and is licensed
-under the GNU Free Document License version 1.2 (see FDL file).
-
+The content of the *.utf* files comes from Wikipedia and is licensed
+under the GNU Free Document License version 1.2 (see FDL file).
+
diff --git a/cpp/test/IceUtil/unicode/filename.txt b/cpp/test/IceUtil/unicode/filename.txt
index e6373bde83b..269631e158c 100644
--- a/cpp/test/IceUtil/unicode/filename.txt
+++ b/cpp/test/IceUtil/unicode/filename.txt
@@ -1 +1 @@
-cœur.txt \ No newline at end of file
+cœur.txt
diff --git a/cpp/test/Slice/errorDetection/IllegalLocal.err b/cpp/test/Slice/errorDetection/IllegalLocal.err
index fa56f466c01..3acc9aa5e5c 100644
--- a/cpp/test/Slice/errorDetection/IllegalLocal.err
+++ b/cpp/test/Slice/errorDetection/IllegalLocal.err
@@ -1,23 +1,23 @@
-IllegalLocal.ice:17: local interface `i2' cannot have non-local base interface `i1'
-IllegalLocal.ice:19: non-local interface `i3' cannot have local base interface `i2'
-IllegalLocal.ice:25: non-local class `c2' cannot have local base interface `i2'
-IllegalLocal.ice:31: non-local interface `i' cannot have operation `op' throwing local exception `le'
-IllegalLocal.ice:34: non-local exception `le2' cannot have local base exception `le'
-IllegalLocal.ice:40: non-local class`c3' cannot contain local member `lo1'
-IllegalLocal.ice:41: cannot create proxy for local interface `i2'
-IllegalLocal.ice:41: non-local class`c3' cannot contain local member `lo2'
-IllegalLocal.ice:42: non-local class`c3' cannot contain local member `lo3'
-IllegalLocal.ice:43: non-local class`c3' cannot contain local member `ls'
-IllegalLocal.ice:48: non-local struct`s1' cannot contain local member `ls'
-IllegalLocal.ice:53: non-local exception`e3' cannot contain local member `ls'
-IllegalLocal.ice:56: non-local sequence `los' cannot have local element type
-IllegalLocal.ice:59: warning: use of sequences in dictionary keys has been deprecated
-IllegalLocal.ice:59: non-local dictionary `d1' cannot have local key type
-IllegalLocal.ice:60: non-local dictionary `d2' cannot have local value type
-IllegalLocal.ice:61: warning: use of sequences in dictionary keys has been deprecated
-IllegalLocal.ice:61: non-local dictionary `d3' cannot have local key type
-IllegalLocal.ice:61: non-local dictionary `d3' cannot have local value type
-IllegalLocal.ice:66: non-local struct`s2' cannot contain local member `m'
-IllegalLocal.ice:72: non-local struct`s3' cannot contain local member `e'
-IllegalLocal.ice:77: non-local interface `i5' cannot have local parameter `p' in operation `op'
-IllegalLocal.ice:78: non-local interface `i5' cannot have operation `op2' with local return type
+IllegalLocal.ice:17: local interface `i2' cannot have non-local base interface `i1'
+IllegalLocal.ice:19: non-local interface `i3' cannot have local base interface `i2'
+IllegalLocal.ice:25: non-local class `c2' cannot have local base interface `i2'
+IllegalLocal.ice:31: non-local interface `i' cannot have operation `op' throwing local exception `le'
+IllegalLocal.ice:34: non-local exception `le2' cannot have local base exception `le'
+IllegalLocal.ice:40: non-local class`c3' cannot contain local member `lo1'
+IllegalLocal.ice:41: cannot create proxy for local interface `i2'
+IllegalLocal.ice:41: non-local class`c3' cannot contain local member `lo2'
+IllegalLocal.ice:42: non-local class`c3' cannot contain local member `lo3'
+IllegalLocal.ice:43: non-local class`c3' cannot contain local member `ls'
+IllegalLocal.ice:48: non-local struct`s1' cannot contain local member `ls'
+IllegalLocal.ice:53: non-local exception`e3' cannot contain local member `ls'
+IllegalLocal.ice:56: non-local sequence `los' cannot have local element type
+IllegalLocal.ice:59: warning: use of sequences in dictionary keys has been deprecated
+IllegalLocal.ice:59: non-local dictionary `d1' cannot have local key type
+IllegalLocal.ice:60: non-local dictionary `d2' cannot have local value type
+IllegalLocal.ice:61: warning: use of sequences in dictionary keys has been deprecated
+IllegalLocal.ice:61: non-local dictionary `d3' cannot have local key type
+IllegalLocal.ice:61: non-local dictionary `d3' cannot have local value type
+IllegalLocal.ice:66: non-local struct`s2' cannot contain local member `m'
+IllegalLocal.ice:72: non-local struct`s3' cannot contain local member `e'
+IllegalLocal.ice:77: non-local interface `i5' cannot have local parameter `p' in operation `op'
+IllegalLocal.ice:78: non-local interface `i5' cannot have operation `op2' with local return type
diff --git a/cpp/test/Slice/parser/Makefile.mak b/cpp/test/Slice/parser/Makefile.mak
index 9a49c02162e..f917a6c74d9 100644
--- a/cpp/test/Slice/parser/Makefile.mak
+++ b/cpp/test/Slice/parser/Makefile.mak
@@ -1,28 +1,28 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..\..\..
-
-TARGETS = $(OBJS)
-
-OBJS = CircularA.obj \
- CircularB.obj
-
-SRCS = $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-SLICE2CPPFLAGS = -I. $(SLICE2CPPFLAGS)
-CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-clean::
- del /q CircularA.cpp CircularA.h
- del /q CircularB.cpp CircularB.h
-
-!include .depend.mak
+# **********************************************************************
+#
+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+TARGETS = $(OBJS)
+
+OBJS = CircularA.obj \
+ CircularB.obj
+
+SRCS = $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+SLICE2CPPFLAGS = -I. $(SLICE2CPPFLAGS)
+CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+clean::
+ del /q CircularA.cpp CircularA.h
+ del /q CircularB.cpp CircularB.h
+
+!include .depend.mak