summaryrefslogtreecommitdiff
path: root/cpp/src/Slice
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Slice')
-rw-r--r--cpp/src/Slice/CPlusPlusUtil.cpp4
-rw-r--r--cpp/src/Slice/FileTracker.cpp2
-rw-r--r--cpp/src/Slice/Grammar.y1
-rw-r--r--cpp/src/Slice/JavaUtil.cpp1
-rw-r--r--cpp/src/Slice/JavaUtil.h2
-rw-r--r--cpp/src/Slice/MD5I.cpp1
-rw-r--r--cpp/src/Slice/Parser.cpp2
-rw-r--r--cpp/src/Slice/Parser.h2
-rw-r--r--cpp/src/Slice/PythonUtil.cpp2
-rw-r--r--cpp/src/Slice/RubyUtil.cpp4
-rw-r--r--cpp/src/Slice/Util.h2
11 files changed, 0 insertions, 23 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index a6e0408189f..4c0667aa6ad 100644
--- a/cpp/src/Slice/CPlusPlusUtil.cpp
+++ b/cpp/src/Slice/CPlusPlusUtil.cpp
@@ -67,7 +67,6 @@ toOptional(const string& s, int typeCtx)
return result;
}
-
string
stringTypeToString(const TypePtr& type, const StringList& metaData, int typeCtx)
{
@@ -348,7 +347,6 @@ writeMarshalUnmarshalParams(Output& out, const ParamDeclList& params, const Oper
}
}
-
if(!requiredParams.empty() || (op && op->returnType() && !op->returnIsOptional()))
{
if(cpp11)
@@ -513,7 +511,6 @@ Slice::ToIfdef::operator()(char c)
}
}
-
void
Slice::printHeader(Output& out)
{
@@ -1781,7 +1778,6 @@ Slice::inWstringModule(const SequencePtr& seq)
return false;
}
-
string
Slice::getDataMemberRef(const DataMemberPtr& p)
{
diff --git a/cpp/src/Slice/FileTracker.cpp b/cpp/src/Slice/FileTracker.cpp
index 20dfc7ae93c..9379ed6ee01 100644
--- a/cpp/src/Slice/FileTracker.cpp
+++ b/cpp/src/Slice/FileTracker.cpp
@@ -7,7 +7,6 @@
//
// **********************************************************************
-
#include <Slice/FileTracker.h>
#include <IceUtil/ConsoleUtil.h>
#include <IceUtil/FileUtil.h>
@@ -60,7 +59,6 @@ Slice::FileException::reason() const
return _reason;
}
-
static Slice::FileTrackerPtr Instance;
Slice::FileTracker::FileTracker() :
diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y
index 0c4900ec2f3..0ff80451885 100644
--- a/cpp/src/Slice/Grammar.y
+++ b/cpp/src/Slice/Grammar.y
@@ -108,7 +108,6 @@ slice_error(const char* s)
%%
-
// ----------------------------------------------------------------------
start
// ----------------------------------------------------------------------
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 3d0784e3e37..9b3b1b81f53 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -3218,7 +3218,6 @@ Slice::JavaCompatGenerator::sequenceHasHolder(const SequencePtr& p) const
return true;
}
-
JavaOutput*
Slice::JavaCompatGenerator::createOutput()
{
diff --git a/cpp/src/Slice/JavaUtil.h b/cpp/src/Slice/JavaUtil.h
index ce16795bdb2..2ae8f2ebd3d 100644
--- a/cpp/src/Slice/JavaUtil.h
+++ b/cpp/src/Slice/JavaUtil.h
@@ -97,7 +97,6 @@ protected:
const std::string& = std::string(),
const std::string& = std::string()) const;
-
//
// Returns the package prefix for a give Slice file.
//
@@ -264,7 +263,6 @@ protected:
const std::string& = std::string(),
const std::string& = std::string()) const;
-
//
// Returns the package prefix for a give Slice file.
//
diff --git a/cpp/src/Slice/MD5I.cpp b/cpp/src/Slice/MD5I.cpp
index c74241e8491..79071b34452 100644
--- a/cpp/src/Slice/MD5I.cpp
+++ b/cpp/src/Slice/MD5I.cpp
@@ -131,7 +131,6 @@
#define T63 0x2ad7d2bb
#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
-
static void
md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
{
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 593cf4c846e..4b701381319 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -1538,7 +1538,6 @@ Slice::Container::unit() const
return SyntaxTreeBase::unit();
}
-
ModuleList
Slice::Container::modules() const
{
@@ -6767,7 +6766,6 @@ Slice::cICompare(const std::string& s1, const std::string& s2)
}
#endif
-
// ----------------------------------------------------------------------
// DerivedToBaseCompare
// ----------------------------------------------------------------------
diff --git a/cpp/src/Slice/Parser.h b/cpp/src/Slice/Parser.h
index 3b593eaf25d..662e289d720 100644
--- a/cpp/src/Slice/Parser.h
+++ b/cpp/src/Slice/Parser.h
@@ -20,7 +20,6 @@
#include <set>
#include <stdio.h>
-
namespace Slice
{
@@ -992,7 +991,6 @@ public:
virtual std::string kindOf() const;
virtual void visit(ParserVisitor*, bool);
-
protected:
DataMember(const ContainerPtr&, const std::string&, const TypePtr&, bool, int, const SyntaxTreeBasePtr&,
diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp
index 92560601189..188a5617c0c 100644
--- a/cpp/src/Slice/PythonUtil.cpp
+++ b/cpp/src/Slice/PythonUtil.cpp
@@ -897,7 +897,6 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
_out << nl << "return _M_" << prxAbs << ".ice_uncheckedCast(proxy, facet)";
_out.dec();
-
//
// ice_staticId
//
@@ -1041,7 +1040,6 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
_out << "))";
_out << nl << className << "._ice_type = _M_" << classType;
-
//
// Define each operation. The arguments to the IcePy.Operation constructor are:
//
diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp
index 28ef26a0987..b66335fcc7e 100644
--- a/cpp/src/Slice/RubyUtil.cpp
+++ b/cpp/src/Slice/RubyUtil.cpp
@@ -19,7 +19,6 @@ using namespace Slice;
using namespace IceUtil;
using namespace IceUtilInternal;
-
namespace
{
@@ -238,7 +237,6 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
bool isLocal = p->isLocal();
bool isAbstract = isInterface || p->allOperations().size() > 0; // Don't use isAbstract() - see bug 3739
-
//
// Do not generate any code for local interfaces.
//
@@ -466,7 +464,6 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
const bool preserved = p->hasMetaData("preserve-slice") || p->inheritsMetaData("preserve-slice");
-
_out << sp << nl << "T_" << name << ".defineClass("
<< (isInterface ? "::Ice::Value" : name) << ", "
<< p->compactId() << ", "
@@ -516,7 +513,6 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
}
_out << "])";
-
//
// Define each operation. The arguments to __defineOperation are:
//
diff --git a/cpp/src/Slice/Util.h b/cpp/src/Slice/Util.h
index a3d22074911..a31536a6ed8 100644
--- a/cpp/src/Slice/Util.h
+++ b/cpp/src/Slice/Util.h
@@ -31,7 +31,6 @@ std::vector<std::string> argvToArgs(int argc, wchar_t* argv[]);
std::vector<std::string> argvToArgs(int argc, char* argv[]);
#endif
-
enum EscapeMode { UCN, Octal, ShortUCN, EC6UCN };
// Parameters:
@@ -47,7 +46,6 @@ enum EscapeMode { UCN, Octal, ShortUCN, EC6UCN };
std::string
toStringLiteral(const std::string&, const std::string&, const std::string&, EscapeMode, unsigned char);
-
void
writeDependencies(const std::string&, const std::string&);