summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2017-03-22 23:12:20 -0400
committerBernard Normier <bernard@zeroc.com>2017-03-22 23:12:20 -0400
commit07376562cfbb0a665a54a9c424899d39de57d9a0 (patch)
tree15769cd3b0e7347e8463845c52340259791980e6
parentICE-7442 - install python files into common subdirectory (diff)
downloadice-07376562cfbb0a665a54a9c424899d39de57d9a0.tar.bz2
ice-07376562cfbb0a665a54a9c424899d39de57d9a0.tar.xz
ice-07376562cfbb0a665a54a9c424899d39de57d9a0.zip
Replaced tabs with spaces
-rw-r--r--cpp/include/IceSSL/Plugin.h2
-rw-r--r--cpp/include/IceUtil/ConsoleUtil.h2
-rw-r--r--cpp/src/IceSSL/UWPPluginI.cpp2
-rw-r--r--cpp/src/IceUtil/ConsoleUtil.cpp2
-rw-r--r--cpp/test/Ice/binding/AllTests.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h
index 94c8da4b841..cc763e77120 100644
--- a/cpp/include/IceSSL/Plugin.h
+++ b/cpp/include/IceSSL/Plugin.h
@@ -159,7 +159,7 @@ public:
protected:
- void unescape();
+ void unescape();
private:
diff --git a/cpp/include/IceUtil/ConsoleUtil.h b/cpp/include/IceUtil/ConsoleUtil.h
index 08959b1a3d3..5927f88d5df 100644
--- a/cpp/include/IceUtil/ConsoleUtil.h
+++ b/cpp/include/IceUtil/ConsoleUtil.h
@@ -37,7 +37,7 @@ private:
std::string toConsoleEncoding(const std::string&) const;
IceUtil::StringConverterPtr _converter;
- IceUtil::StringConverterPtr _consoleConverter;
+ IceUtil::StringConverterPtr _consoleConverter;
static ConsoleUtilPtr _instance;
};
diff --git a/cpp/src/IceSSL/UWPPluginI.cpp b/cpp/src/IceSSL/UWPPluginI.cpp
index 3590c89ae4a..a7ef7fa28ab 100644
--- a/cpp/src/IceSSL/UWPPluginI.cpp
+++ b/cpp/src/IceSSL/UWPPluginI.cpp
@@ -91,4 +91,4 @@ IceSSL::CertificatePtr
IceSSL::Certificate::decode(const std::string& encoding)
{
return IceSSL::UWP::Certificate::decode(encoding);
-} \ No newline at end of file
+}
diff --git a/cpp/src/IceUtil/ConsoleUtil.cpp b/cpp/src/IceUtil/ConsoleUtil.cpp
index dddd76f0e3a..08121a27fd8 100644
--- a/cpp/src/IceUtil/ConsoleUtil.cpp
+++ b/cpp/src/IceUtil/ConsoleUtil.cpp
@@ -67,7 +67,7 @@ ConsoleUtil::toConsoleEncoding(const string& message) const
// Then from UTF-8 to console CP
string consoleString;
- _consoleConverter->fromUTF8(reinterpret_cast<const IceUtil::Byte* > (u8s.data()),
+ _consoleConverter->fromUTF8(reinterpret_cast<const IceUtil::Byte* > (u8s.data()),
reinterpret_cast<const IceUtil::Byte*>(u8s.data() + u8s.size()),
consoleString);
diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp
index cfd6236e73d..645cb5fe47c 100644
--- a/cpp/test/Ice/binding/AllTests.cpp
+++ b/cpp/test/Ice/binding/AllTests.cpp
@@ -108,7 +108,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
RandomNumberGenerator rng;
- cout << "testing binding with single endpoint... " << flush;
+ cout << "testing binding with single endpoint... " << flush;
{
RemoteObjectAdapterPrxPtr adapter = com->createObjectAdapter("Adapter", "default");