summaryrefslogtreecommitdiff
path: root/project2/ice
diff options
context:
space:
mode:
Diffstat (limited to 'project2/ice')
-rw-r--r--project2/ice/iceDaemon.cpp3
-rw-r--r--project2/ice/pch.hpp1
-rw-r--r--project2/ice/slice2Common.cpp15
-rw-r--r--project2/ice/slice2Daemon.cpp5
-rw-r--r--project2/ice/slice2Rows.cpp3
-rw-r--r--project2/ice/slice2Task.cpp3
6 files changed, 12 insertions, 18 deletions
diff --git a/project2/ice/iceDaemon.cpp b/project2/ice/iceDaemon.cpp
index d09f85e..cd752b8 100644
--- a/project2/ice/iceDaemon.cpp
+++ b/project2/ice/iceDaemon.cpp
@@ -7,7 +7,6 @@
#include <scriptLoader.h>
#include <options.h>
#include <sys/stat.h>
-#include <boost/foreach.hpp>
#include <boost/filesystem.hpp>
#include <boost/lexical_cast.hpp>
#include <commonObjects.h>
@@ -102,7 +101,7 @@ class IceDaemonViewHost : public virtual CommonObjects, public virtual CheckHost
Logger()->messagebf(LOG_DEBUG, "%s: execute view", __PRETTY_FUNCTION__);
view->execute(presenter.get(), ec);
// Caches might open transactions
- BOOST_FOREACH(const CommonObjects::DataSources::value_type & ds, CommonObjects::datasources) {
+ for (const CommonObjects::DataSources::value_type & ds : CommonObjects::datasources) {
ds.second->commit();
}
}
diff --git a/project2/ice/pch.hpp b/project2/ice/pch.hpp
index 21f44dc..3ed09f0 100644
--- a/project2/ice/pch.hpp
+++ b/project2/ice/pch.hpp
@@ -4,7 +4,6 @@
#include <Ice/Ice.h>
#include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
#include <boost/function.hpp>
#include <boost/optional.hpp>
#include <commonObjects.h>
diff --git a/project2/ice/slice2Common.cpp b/project2/ice/slice2Common.cpp
index 8068b03..9dfcf9f 100644
--- a/project2/ice/slice2Common.cpp
+++ b/project2/ice/slice2Common.cpp
@@ -1,6 +1,5 @@
#include "slice2Common.h"
#include <Slice/CPlusPlusUtil.h>
-#include <boost/foreach.hpp>
Slice2Common::Slice2Common(FILE * c) :
code(c),
@@ -18,7 +17,7 @@ void
Slice2Common::FunctionBegin(Slice::OperationPtr o)
{
// Create typed variables for call
- BOOST_FOREACH(const auto & p, o->parameters()) {
+ for (const auto & p : o->parameters()) {
if (p->optional()) {
fprintf(code, "\t\t\t\t\t\tconst auto _%s = IceConvert< ::IceUtil::Optional< %s > >::FromVariable(%s(ec));\n",
p->name().c_str(),
@@ -36,12 +35,12 @@ Slice2Common::FunctionBegin(Slice::OperationPtr o)
// Log call and parameters
fprintf(code, "\t\t\t\t\t\tLogger()->messagebf(LOG_DEBUG, \"%%s: ");
- BOOST_FOREACH(const auto & p, o->parameters()) {
+ for (const auto & p : o->parameters()) {
fprintf(code, "%s = %%s, ", p->name().c_str());
}
fprintf(code, "ice @ %%p\", \n");
fprintf(code, "\t\t\t\t\t\t\t\t__PRETTY_FUNCTION__, ");
- BOOST_FOREACH(const auto & p, o->parameters()) {
+ for (const auto & p : o->parameters()) {
fprintf(code, "%s(ec), ", p->name().c_str());
}
fprintf(code, "ice);\n");
@@ -54,7 +53,7 @@ Slice2Common::FunctionBegin(Slice::OperationPtr o)
void
Slice2Common::ParameterVariables(Slice::OperationPtr o)
{
- BOOST_FOREACH(const auto & p, o->parameters()) {
+ for (const auto & p : o->parameters()) {
fprintf(code, "\t\t\t\t\tconst Variable %s;\n", p->name().c_str());
}
}
@@ -62,15 +61,15 @@ Slice2Common::ParameterVariables(Slice::OperationPtr o)
void
Slice2Common::Declaration(Slice::OperationPtr o)
{
- fprintf(code, "\t\t\tDECLARE_LOADER(\"%s-%s-%s\", %s);\n\n",
- module.c_str(), interface.c_str(), o->name().c_str(), o->name().c_str());
+ fprintf(code, "\t\t\tDECLARE_LOADER(\"%s-%s-%s\", %s);\n\n",
+ module.c_str(), interface.c_str(), o->name().c_str(), o->name().c_str());
}
void
Slice2Common::CallOperation(Slice::OperationPtr o)
{
fprintf(code, "service->%s(", o->name().c_str());
- BOOST_FOREACH(const auto & p, o->parameters()) {
+ for (const auto & p : o->parameters()) {
fprintf(code, "_%s, ", p->name().c_str());
}
fprintf(code, "ctx)");
diff --git a/project2/ice/slice2Daemon.cpp b/project2/ice/slice2Daemon.cpp
index 98a3883..177e406 100644
--- a/project2/ice/slice2Daemon.cpp
+++ b/project2/ice/slice2Daemon.cpp
@@ -1,6 +1,5 @@
#include <pch.hpp>
#include "slice2Daemon.h"
-#include <boost/foreach.hpp>
#include <Slice/CPlusPlusUtil.h>
Slice2Daemon::Slice2Daemon(FILE * c) :
@@ -44,7 +43,7 @@ Slice2Daemon::visitOperation(const Slice::OperationPtr & o)
else {
fprintf(code, "\t\t\tvoid %s(", o->name().c_str());
}
- BOOST_FOREACH(const auto & p, o->parameters()) {
+ for (const auto & p : o->parameters()) {
fprintf(code, "%s %s, ", inputTypeToString(p->type(), p->optional(), p->getMetaData(), 0).c_str(), p->name().c_str());
}
fprintf(code, "const ::Ice::Current &) {\n");
@@ -86,7 +85,7 @@ Slice2Daemon::visitParameterMap(const Slice::OperationPtr & o)
if (!code) return;
fprintf(code, "\t\t\t\tParamMap params {\n");
- BOOST_FOREACH(const auto & p, o->parameters()) {
+ for (const auto & p : o->parameters()) {
Slice::StructPtr s = dynamic_cast<Slice::Struct *>(p->type().get());
fprintf(code, "\t\t\t\t\t\t{\"%s\", IceConvert< %s >::ToVariable(%s) },\n",
p->name().c_str(), Slice::typeToString(p->type()).c_str(), p->name().c_str());
diff --git a/project2/ice/slice2Rows.cpp b/project2/ice/slice2Rows.cpp
index 2f1c6f2..1001f4c 100644
--- a/project2/ice/slice2Rows.cpp
+++ b/project2/ice/slice2Rows.cpp
@@ -1,6 +1,5 @@
#include <pch.hpp>
#include "slice2Rows.h"
-#include <boost/foreach.hpp>
#include <Slice/CPlusPlusUtil.h>
Slice2Rows::Slice2Rows(FILE * c) :
@@ -46,7 +45,7 @@ Slice2Rows::visitOperation(const Slice::OperationPtr & o)
// Constructor
fprintf(code, "\t\t\t\t\t%s(ScriptNodePtr p) :\n", o->name().c_str());
fprintf(code, "\t\t\t\t\t\tIceRows< ::%s::%sPrx >(p)", module.c_str(), interface.c_str());
- BOOST_FOREACH(const auto & p, o->parameters()) {
+ for (const auto & p : o->parameters()) {
fprintf(code, ",\n\t\t\t\t\t\t%s(p, \"%s\")", p->name().c_str(), p->name().c_str());
}
fprintf(code, "\n\t\t\t\t\t{\n");
diff --git a/project2/ice/slice2Task.cpp b/project2/ice/slice2Task.cpp
index fa60bd0..84a4f29 100644
--- a/project2/ice/slice2Task.cpp
+++ b/project2/ice/slice2Task.cpp
@@ -1,6 +1,5 @@
#include <pch.hpp>
#include "slice2Task.h"
-#include <boost/foreach.hpp>
#include <Slice/CPlusPlusUtil.h>
Slice2Task::Slice2Task(FILE * c) :
@@ -47,7 +46,7 @@ Slice2Task::visitOperation(const Slice::OperationPtr & o)
fprintf(code, "\t\t\t\t\t%s(ScriptNodePtr p) :\n", o->name().c_str());
fprintf(code, "\t\t\t\t\t\tSourceObject(p),\n");
fprintf(code, "\t\t\t\t\t\tIceTask< ::%s::%sPrx >(p)", module.c_str(), interface.c_str());
- BOOST_FOREACH(const auto & p, o->parameters()) {
+ for (const auto & p : o->parameters()) {
fprintf(code, ",\n\t\t\t\t\t\t%s(p, \"%s\")", p->name().c_str(), p->name().c_str());
}
fprintf(code, "\n\t\t\t\t\t{\n");
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-09 19:12:18 +0000