summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2019-07-25 15:45:24 +0200
committerJose <jose@zeroc.com>2019-07-25 15:45:24 +0200
commitc51e74ae604e1b74c1e61d4ef5ac804d215fdd1a (patch)
treec51eb167187b471a2d7419e1990aeb7bd633d877
parentFixed IceGrid node to not terminate session with master on interrupt, fixes #464 (diff)
downloadice-c51e74ae604e1b74c1e61d4ef5ac804d215fdd1a.tar.bz2
ice-c51e74ae604e1b74c1e61d4ef5ac804d215fdd1a.tar.xz
ice-c51e74ae604e1b74c1e61d4ef5ac804d215fdd1a.zip
White space cleanup
-rw-r--r--cpp/src/Slice/Parser.cpp1
-rw-r--r--man/man1/slice2swift.11
-rw-r--r--swift/.gitignore2
-rw-r--r--swift/README.md2
-rw-r--r--swift/src/Glacier2/Glacier2Swift.h1
-rw-r--r--swift/src/Ice/IceSwift.h1
-rw-r--r--swift/src/IceGrid/IceGridSwift.h1
-rw-r--r--swift/src/IceStorm/IceStormSwift.h1
-rw-r--r--swift/test/TestDriver/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json2
-rw-r--r--swift/test/TestDriver/iOS/Assets.xcassets/Contents.json2
10 files changed, 4 insertions, 10 deletions
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 7e0149b602b..56d482a336e 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -19,7 +19,6 @@
using namespace std;
using namespace Slice;
-
Slice::CompilerException::CompilerException(const char* file, int line, const string& r) :
IceUtil::Exception(file, line),
_reason(r)
diff --git a/man/man1/slice2swift.1 b/man/man1/slice2swift.1
index 8f19b6c5cf3..a47ab7da6f6 100644
--- a/man/man1/slice2swift.1
+++ b/man/man1/slice2swift.1
@@ -100,4 +100,3 @@ generate any code.
.BR slice2php (1),
.BR slice2py (1),
.BR slice2rb (1)
-
diff --git a/swift/.gitignore b/swift/.gitignore
index 7685a8c8f36..13fa892eb02 100644
--- a/swift/.gitignore
+++ b/swift/.gitignore
@@ -1,2 +1,2 @@
/docs
-ice-test.xcodeproj \ No newline at end of file
+ice-test.xcodeproj
diff --git a/swift/README.md b/swift/README.md
index dcd4beb3a23..d11d1ad20b1 100644
--- a/swift/README.md
+++ b/swift/README.md
@@ -14,7 +14,7 @@ resulting build.
## Swift Build Requirements
### Operating Systems
-Ice for Swift builds and runs on macOS and is supported on the platforms listed
+Ice for Swift builds and runs on macOS and is supported on the platforms listed
on the [supported platforms][2] page.
### Slice to Swift Compiler
diff --git a/swift/src/Glacier2/Glacier2Swift.h b/swift/src/Glacier2/Glacier2Swift.h
index 73824b48750..491f3945e88 100644
--- a/swift/src/Glacier2/Glacier2Swift.h
+++ b/swift/src/Glacier2/Glacier2Swift.h
@@ -6,4 +6,3 @@
FOUNDATION_EXPORT double Glacier2VersionNumber;
FOUNDATION_EXPORT const unsigned char Glacier2VersionString[];
-
diff --git a/swift/src/Ice/IceSwift.h b/swift/src/Ice/IceSwift.h
index a3f63e82da4..af1adbf2471 100644
--- a/swift/src/Ice/IceSwift.h
+++ b/swift/src/Ice/IceSwift.h
@@ -6,4 +6,3 @@
FOUNDATION_EXPORT double IceVersionNumber;
FOUNDATION_EXPORT const unsigned char IceVersionString[];
-
diff --git a/swift/src/IceGrid/IceGridSwift.h b/swift/src/IceGrid/IceGridSwift.h
index 73824b48750..491f3945e88 100644
--- a/swift/src/IceGrid/IceGridSwift.h
+++ b/swift/src/IceGrid/IceGridSwift.h
@@ -6,4 +6,3 @@
FOUNDATION_EXPORT double Glacier2VersionNumber;
FOUNDATION_EXPORT const unsigned char Glacier2VersionString[];
-
diff --git a/swift/src/IceStorm/IceStormSwift.h b/swift/src/IceStorm/IceStormSwift.h
index 73824b48750..491f3945e88 100644
--- a/swift/src/IceStorm/IceStormSwift.h
+++ b/swift/src/IceStorm/IceStormSwift.h
@@ -6,4 +6,3 @@
FOUNDATION_EXPORT double Glacier2VersionNumber;
FOUNDATION_EXPORT const unsigned char Glacier2VersionString[];
-
diff --git a/swift/test/TestDriver/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/swift/test/TestDriver/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
index d8db8d65fd7..b542ec24d24 100644
--- a/swift/test/TestDriver/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/swift/test/TestDriver/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -95,4 +95,4 @@
"version" : 1,
"author" : "xcode"
}
-} \ No newline at end of file
+}
diff --git a/swift/test/TestDriver/iOS/Assets.xcassets/Contents.json b/swift/test/TestDriver/iOS/Assets.xcassets/Contents.json
index da4a164c918..2d92bd53fdb 100644
--- a/swift/test/TestDriver/iOS/Assets.xcassets/Contents.json
+++ b/swift/test/TestDriver/iOS/Assets.xcassets/Contents.json
@@ -3,4 +3,4 @@
"version" : 1,
"author" : "xcode"
}
-} \ No newline at end of file
+}