summaryrefslogtreecommitdiff
path: root/cpp/src/FreezeScript
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/FreezeScript')
-rw-r--r--[-rwxr-xr-x]cpp/src/FreezeScript/DumpDB.cpp36
-rw-r--r--[-rwxr-xr-x]cpp/src/FreezeScript/TransformVisitor.cpp2
-rw-r--r--[-rwxr-xr-x]cpp/src/FreezeScript/Transformer.cpp2
-rw-r--r--[-rwxr-xr-x]cpp/src/FreezeScript/transformdb.cpp136
4 files changed, 88 insertions, 88 deletions
diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp
index b2da041ec3d..27aef7b463d 100755..100644
--- a/cpp/src/FreezeScript/DumpDB.cpp
+++ b/cpp/src/FreezeScript/DumpDB.cpp
@@ -357,8 +357,8 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator
if(inputFile.empty())
{
const string evictorKeyTypeName = "::Ice::Identity";
- const string oldEvictorValueTypeName = "::Freeze::ObjectRecord";
- const string newEvictorValueTypeName = "Object";
+ const string oldEvictorValueTypeName = "::Freeze::ObjectRecord";
+ const string newEvictorValueTypeName = "Object";
if((!keyTypeName.empty() && valueTypeName.empty()) || (keyTypeName.empty() && !valueTypeName.empty() && !evictor))
{
@@ -388,32 +388,32 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator
{
evictor = true;
}
- keyTypeName = p->second.key;
- valueTypeName = p->second.value;
+ keyTypeName = p->second.key;
+ valueTypeName = p->second.value;
- if(evictor && valueTypeName.empty())
- {
- valueTypeName = oldEvictorValueTypeName;
- }
+ if(evictor && valueTypeName.empty())
+ {
+ valueTypeName = oldEvictorValueTypeName;
+ }
}
}
catch(const FreezeScript::FailureException& ex)
{
- cerr << appName << ": " << ex.reason() << endl;
- return EXIT_FAILURE;
+ cerr << appName << ": " << ex.reason() << endl;
+ return EXIT_FAILURE;
}
}
if(evictor)
{
- if(keyTypeName.empty())
- {
- keyTypeName = evictorKeyTypeName;
- }
- if(valueTypeName.empty())
- {
- valueTypeName = newEvictorValueTypeName;
- }
+ if(keyTypeName.empty())
+ {
+ keyTypeName = evictorKeyTypeName;
+ }
+ if(valueTypeName.empty())
+ {
+ valueTypeName = newEvictorValueTypeName;
+ }
}
Slice::TypePtr keyType, valueType;
diff --git a/cpp/src/FreezeScript/TransformVisitor.cpp b/cpp/src/FreezeScript/TransformVisitor.cpp
index 86dd1a72bd4..4a5d4c6ff98 100755..100644
--- a/cpp/src/FreezeScript/TransformVisitor.cpp
+++ b/cpp/src/FreezeScript/TransformVisitor.cpp
@@ -529,7 +529,7 @@ FreezeScript::TransformVisitor::transformObject(const ObjectDataPtr& dest, const
objectDataMap.erase(p);
#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
- objectDataMap.insert(ObjectDataMap::value_type(src.get(), nullptr));
+ objectDataMap.insert(ObjectDataMap::value_type(src.get(), nullptr));
#else
objectDataMap.insert(ObjectDataMap::value_type(src.get(), 0));
#endif
diff --git a/cpp/src/FreezeScript/Transformer.cpp b/cpp/src/FreezeScript/Transformer.cpp
index 3d699d65491..3fda2cf467e 100755..100644
--- a/cpp/src/FreezeScript/Transformer.cpp
+++ b/cpp/src/FreezeScript/Transformer.cpp
@@ -2652,7 +2652,7 @@ FreezeScript::ObjectVisitor::visitObject(const ObjectRefPtr& data)
#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
_map.insert(ObjectDataMap::value_type(value.get(), nullptr));
#else
- _map.insert(ObjectDataMap::value_type(value.get(), 0));
+ _map.insert(ObjectDataMap::value_type(value.get(), 0));
#endif
DataMemberMap& members = value->getMembers();
for(DataMemberMap::iterator q = members.begin(); q != members.end(); ++q)
diff --git a/cpp/src/FreezeScript/transformdb.cpp b/cpp/src/FreezeScript/transformdb.cpp
index f4583394b5c..8de1709ae4a 100755..100644
--- a/cpp/src/FreezeScript/transformdb.cpp
+++ b/cpp/src/FreezeScript/transformdb.cpp
@@ -490,8 +490,8 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator
FreezeScript::TransformAnalyzer analyzer(oldUnit, newUnit, ignoreTypeChanges, out, missingTypes, analyzeErrors);
const string evictorKeyName = "::Ice::Identity";
- const string oldEvictorValueName = "::Freeze::ObjectRecord";
- const string newEvictorValueName = "Object";
+ const string oldEvictorValueName = "::Freeze::ObjectRecord";
+ const string newEvictorValueName = "Object";
if(allDb)
{
@@ -507,14 +507,14 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator
keyName = p->second.key;
valueName = p->second.value;
- if(keyName.empty())
- {
- keyName = evictorKeyName;
- }
- if(valueName.empty())
- {
- valueName = oldEvictorValueName;
- }
+ if(keyName.empty())
+ {
+ keyName = evictorKeyName;
+ }
+ if(valueName.empty())
+ {
+ valueName = oldEvictorValueName;
+ }
}
else
{
@@ -544,18 +544,18 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator
<< "' not found in old Slice definitions" << endl;
}
- Slice::TypePtr newValueType;
- if(p->second.evictor)
- {
- //
- // The new evictor does not keep stats
- //
- newValueType = findType(newUnit, newEvictorValueName);
- }
- else
- {
- newValueType = findType(newUnit, valueName);
- }
+ Slice::TypePtr newValueType;
+ if(p->second.evictor)
+ {
+ //
+ // The new evictor does not keep stats
+ //
+ newValueType = findType(newUnit, newEvictorValueName);
+ }
+ else
+ {
+ newValueType = findType(newUnit, valueName);
+ }
if(!newValueType)
{
@@ -576,44 +576,44 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator
{
return EXIT_FAILURE;
}
-
+
analyzer.addDatabase(p->first, oldKeyType, newKeyType, oldValueType, newValueType);
}
}
else
{
string oldKeyName, newKeyName, oldValueName, newValueName;
-
- string::size_type pos;
-
- if(!evictor && (keyTypeNames.empty() || valueTypeNames.empty()))
- {
- usage(appName);
- return EXIT_FAILURE;
- }
-
- if(!keyTypeNames.empty())
- {
- pos = keyTypeNames.find(',');
- if(pos == 0 || pos == keyTypeNames.size())
- {
- usage(appName);
- return EXIT_FAILURE;
- }
- if(pos == string::npos)
- {
- oldKeyName = keyTypeNames;
- newKeyName = keyTypeNames;
- }
+
+ string::size_type pos;
+
+ if(!evictor && (keyTypeNames.empty() || valueTypeNames.empty()))
+ {
+ usage(appName);
+ return EXIT_FAILURE;
+ }
+
+ if(!keyTypeNames.empty())
+ {
+ pos = keyTypeNames.find(',');
+ if(pos == 0 || pos == keyTypeNames.size())
+ {
+ usage(appName);
+ return EXIT_FAILURE;
+ }
+ if(pos == string::npos)
+ {
+ oldKeyName = keyTypeNames;
+ newKeyName = keyTypeNames;
+ }
else
{
oldKeyName = keyTypeNames.substr(0, pos);
newKeyName = keyTypeNames.substr(pos + 1);
}
- }
+ }
- if(!valueTypeNames.empty())
- {
+ if(!valueTypeNames.empty())
+ {
pos = valueTypeNames.find(',');
if(pos == 0 || pos == valueTypeNames.size())
{
@@ -631,26 +631,26 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator
newValueName = valueTypeNames.substr(pos + 1);
}
}
-
- if(evictor)
- {
- if(oldKeyName.empty())
- {
- oldKeyName = evictorKeyName;
- }
- if(newKeyName.empty())
- {
- newKeyName = evictorKeyName;
- }
- if(oldValueName.empty())
- {
- oldValueName = newEvictorValueName;
- }
- if(newValueName.empty())
- {
- newValueName = newEvictorValueName;
- }
- }
+
+ if(evictor)
+ {
+ if(oldKeyName.empty())
+ {
+ oldKeyName = evictorKeyName;
+ }
+ if(newKeyName.empty())
+ {
+ newKeyName = evictorKeyName;
+ }
+ if(oldValueName.empty())
+ {
+ oldValueName = newEvictorValueName;
+ }
+ if(newValueName.empty())
+ {
+ newValueName = newEvictorValueName;
+ }
+ }
//
// Look up the key and value types in the old and new Slice definitions.
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 21:18:42 +0000