summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/all.dsw36
-rw-r--r--cpp/src/Transform/Data.cpp42
-rw-r--r--cpp/src/Transform/Exception.cpp2
-rw-r--r--cpp/src/Transform/Node.cpp2
-rw-r--r--cpp/src/Transform/transform.dsp4
-rw-r--r--cpp/src/Transform/transformC.dsp118
6 files changed, 179 insertions, 25 deletions
diff --git a/cpp/all.dsw b/cpp/all.dsw
index 366615f8740..9d33dd56128 100644
--- a/cpp/all.dsw
+++ b/cpp/all.dsw
@@ -351,6 +351,42 @@ Package=<4>
###############################################################################
+Project: "Transform"=.\src\Transform\Transform.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name Ice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name IceUtil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name IceXML
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name Slice
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "TransformC"=.\src\Transform\TransformC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "adapterDeactivationC"=.\test\Ice\adapterDeactivation\adapterDeactivationC.dsp - Package Owner=<4>
Package=<5>
diff --git a/cpp/src/Transform/Data.cpp b/cpp/src/Transform/Data.cpp
index 8793320aafe..d36152ba30d 100644
--- a/cpp/src/Transform/Data.cpp
+++ b/cpp/src/Transform/Data.cpp
@@ -1861,11 +1861,11 @@ Transform::StructData::operator<(const Data& rhs) const
}
void
-Transform::StructData::registerObjects(ObjectDataMap& map) const
+Transform::StructData::registerObjects(ObjectDataMap& m) const
{
for(DataMemberMap::const_iterator p = _members.begin(); p != _members.end(); ++p)
{
- p->second->registerObjects(map);
+ p->second->registerObjects(m);
}
}
@@ -2098,13 +2098,13 @@ Transform::SequenceData::operator<(const Data& rhs) const
}
void
-Transform::SequenceData::registerObjects(ObjectDataMap& map) const
+Transform::SequenceData::registerObjects(ObjectDataMap& m) const
{
if(_type->type()->usesClasses())
{
for(DataList::const_iterator p = _elements.begin(); p != _elements.end(); ++p)
{
- (*p)->registerObjects(map);
+ (*p)->registerObjects(m);
}
}
}
@@ -2321,7 +2321,7 @@ Transform::EnumData::operator<(const Data& rhs) const
}
void
-Transform::EnumData::registerObjects(ObjectDataMap& map) const
+Transform::EnumData::registerObjects(ObjectDataMap&) const
{
}
@@ -2554,10 +2554,10 @@ Transform::DictionaryData::DictionaryData(const DataFactoryPtr& factory, const S
}
Transform::DictionaryData::DictionaryData(const DataFactoryPtr& factory, const Slice::DictionaryPtr& type,
- const ErrorReporterPtr& errorReporter, bool readOnly, const DataMap& map) :
+ const ErrorReporterPtr& errorReporter, bool readOnly, const DataMap& m) :
Data(errorReporter, readOnly), _factory(factory), _type(type)
{
- for(DataMap::const_iterator p = map.begin(); p != map.end(); ++p)
+ for(DataMap::const_iterator p = m.begin(); p != m.end(); ++p)
{
_map.insert(DataMap::value_type(p->first->clone(), p->second->clone()));
}
@@ -2622,13 +2622,13 @@ Transform::DictionaryData::operator<(const Data& rhs) const
}
void
-Transform::DictionaryData::registerObjects(ObjectDataMap& map) const
+Transform::DictionaryData::registerObjects(ObjectDataMap& m) const
{
if(_type->valueType()->usesClasses())
{
for(DataMap::const_iterator p = _map.begin(); p != _map.end(); ++p)
{
- p->second->registerObjects(map);
+ p->second->registerObjects(m);
}
}
}
@@ -2767,15 +2767,15 @@ Transform::DictionaryData::transformI(const DataPtr& data, DataInterceptor& inte
DictionaryDataPtr d = DictionaryDataPtr::dynamicCast(data);
if(d && isCompatible(_type, d->_type))
{
- DataMap map;
+ DataMap m;
for(DataMap::const_iterator p = d->_map.begin(); p != d->_map.end(); ++p)
{
DataPtr key = _factory->create(_type->keyType(), _readOnly);
DataPtr value = _factory->create(_type->valueType(), _readOnly);
key->transform(p->first, interceptor);
value->transform(p->second, interceptor);
- DataMap::const_iterator q = map.find(key);
- if(q != map.end())
+ DataMap::const_iterator q = m.find(key);
+ if(q != m.end())
{
ostringstream ostr;
ostr << "duplicate dictionary key (";
@@ -2785,10 +2785,10 @@ Transform::DictionaryData::transformI(const DataPtr& data, DataInterceptor& inte
}
else
{
- map.insert(DataMap::value_type(key, value));
+ m.insert(DataMap::value_type(key, value));
}
}
- _map = map;
+ _map = m;
_length = _factory->createInteger(static_cast<Ice::Long>(_map.size()), true);
}
else
@@ -2924,15 +2924,15 @@ Transform::ObjectData::operator<(const Data& rhs) const
}
void
-Transform::ObjectData::registerObjects(ObjectDataMap& map) const
+Transform::ObjectData::registerObjects(ObjectDataMap& m) const
{
- ObjectDataMap::iterator p = map.find(this);
- if(p == map.end())
+ ObjectDataMap::iterator p = m.find(this);
+ if(p == m.end())
{
- map.insert(ObjectDataMap::value_type(this, 0));
+ m.insert(ObjectDataMap::value_type(this, 0));
for(DataMemberMap::const_iterator q = _members.begin(); q != _members.end(); ++q)
{
- q->second->registerObjects(map);
+ q->second->registerObjects(m);
}
}
}
@@ -3183,11 +3183,11 @@ Transform::ObjectRef::operator<(const Data& rhs) const
}
void
-Transform::ObjectRef::registerObjects(ObjectDataMap& map) const
+Transform::ObjectRef::registerObjects(ObjectDataMap& m) const
{
if(_value)
{
- _value->registerObjects(map);
+ _value->registerObjects(m);
}
}
diff --git a/cpp/src/Transform/Exception.cpp b/cpp/src/Transform/Exception.cpp
index dc25832fa9c..4240f450fb7 100644
--- a/cpp/src/Transform/Exception.cpp
+++ b/cpp/src/Transform/Exception.cpp
@@ -33,7 +33,7 @@ Transform::TransformException::ice_name() const
void
Transform::TransformException::ice_print(ostream& out) const
{
- IceUtil::Exception::ice_print(out);
+ Exception::ice_print(out);
out << ":\nerror occurred during transformation";
if(!_reason.empty())
{
diff --git a/cpp/src/Transform/Node.cpp b/cpp/src/Transform/Node.cpp
index 57b1f426751..4743be5e1f3 100644
--- a/cpp/src/Transform/Node.cpp
+++ b/cpp/src/Transform/Node.cpp
@@ -84,7 +84,7 @@ Transform::EvaluateException::ice_name() const
void
Transform::EvaluateException::ice_print(ostream& out) const
{
- IceUtil::Exception::ice_print(out);
+ Exception::ice_print(out);
out << ":\nerror occurred while evaluating expression";
if(!_reason.empty())
{
diff --git a/cpp/src/Transform/transform.dsp b/cpp/src/Transform/transform.dsp
index e91305ce580..10e4a4a5dd4 100644
--- a/cpp/src/Transform/transform.dsp
+++ b/cpp/src/Transform/transform.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/transform12.dll" /implib:"Release/transform.lib" /libpath:"../../../lib"
+# ADD LINK32 libdb41.lib /nologo /dll /machine:I386 /out:"Release/transform12.dll" /implib:"Release/transform.lib" /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
# Begin Special Build Tool
OutDir=.\Release
@@ -87,7 +87,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/transform12d.dll" /implib:"Debug/transformd.lib" /libpath:"../../../lib"
+# ADD LINK32 libdb41d.lib /nologo /dll /debug /machine:I386 /out:"Debug/transform12d.dll" /implib:"Debug/transformd.lib" /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /nodefaultlib
# Begin Special Build Tool
OutDir=.\Debug
diff --git a/cpp/src/Transform/transformC.dsp b/cpp/src/Transform/transformC.dsp
new file mode 100644
index 00000000000..61c42179121
--- /dev/null
+++ b/cpp/src/Transform/transformC.dsp
@@ -0,0 +1,118 @@
+# Microsoft Developer Studio Project File - Name="TransformC" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=TransformC - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "TransformC.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "TransformC.mak" CFG="TransformC - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "TransformC - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "TransformC - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "TransformC - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I ".." /I "../../include" /I "dummyinclude" /D "NDEBUG" /D "_CONSOLE" /D "_UNICODE" /FD /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 libdb41.lib setargv.obj /nologo /subsystem:console /machine:I386 /out:"Release/transformdb.exe" /libpath:"../../../lib"
+# SUBTRACT LINK32 /debug /nodefaultlib
+# Begin Special Build Tool
+OutDir=.\Release
+TargetName=transformdb
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe ..\..\bin
+# End Special Build Tool
+
+!ELSEIF "$(CFG)" == "TransformC - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /I "dummyinclude" /D "_DEBUG" /D "_CONSOLE" /D "_UNICODE" /FD /GZ /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 libdb41.lib setargv.obj /nologo /subsystem:console /debug /machine:I386 /out:"Debug/transformdb.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
+# Begin Special Build Tool
+OutDir=.\Debug
+TargetName=transformdb
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe ..\..\bin
+# End Special Build Tool
+
+!ENDIF
+
+# Begin Target
+
+# Name "TransformC - Win32 Release"
+# Name "TransformC - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\TransformDB.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 22:43:17 +0000