summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rwxr-xr-x[-rw-r--r--]cpp/src/Freeze/EvictorI.h3
-rwxr-xr-x[-rw-r--r--]cpp/src/FreezeScript/DumpDB.cpp2
-rwxr-xr-x[-rw-r--r--]cpp/src/FreezeScript/TransformVisitor.cpp5
-rwxr-xr-x[-rw-r--r--]cpp/src/FreezeScript/Transformer.cpp6
-rwxr-xr-x[-rw-r--r--]cpp/src/FreezeScript/transformdb.cpp2
-rwxr-xr-x[-rw-r--r--]cpp/src/Glacier2/Blobject.cpp4
-rwxr-xr-x[-rw-r--r--]cpp/src/Glacier2/ProxyVerifier.cpp2
-rwxr-xr-x[-rw-r--r--]cpp/src/Glacier2/RequestQueue.cpp12
-rwxr-xr-x[-rw-r--r--]cpp/src/Ice/Base64.cpp4
-rwxr-xr-x[-rw-r--r--]cpp/src/Ice/BasicStream.cpp4
-rwxr-xr-x[-rw-r--r--]cpp/src/Ice/ConnectionFactory.cpp4
-rwxr-xr-x[-rw-r--r--]cpp/src/IceGrid/SessionServantManager.cpp1
-rwxr-xr-x[-rw-r--r--]cpp/src/IceGrid/Util.h5
-rwxr-xr-x[-rw-r--r--]cpp/src/IcePatch2/Calc.cpp1
-rwxr-xr-x[-rw-r--r--]cpp/src/IcePatch2/FileServerI.cpp5
-rwxr-xr-x[-rw-r--r--]cpp/src/IcePatch2/Makefile.mak12
-rwxr-xr-x[-rw-r--r--]cpp/src/IcePatch2Lib/ClientUtil.cpp5
-rwxr-xr-x[-rw-r--r--]cpp/src/IcePatch2Lib/Util.cpp4
-rwxr-xr-x[-rw-r--r--]cpp/src/IceStorm/Subscriber.cpp2
-rwxr-xr-x[-rw-r--r--]cpp/src/Slice/Parser.cpp4
-rwxr-xr-x[-rw-r--r--]cpp/src/Slice/PythonUtil.cpp4
-rwxr-xr-x[-rw-r--r--]cpp/src/Slice/RubyUtil.cpp3
-rwxr-xr-x[-rw-r--r--]cpp/src/iceserviceinstall/Makefile.mak5
-rwxr-xr-x[-rw-r--r--]cpp/src/slice2freezej/Main.cpp1
-rwxr-xr-x[-rw-r--r--]cpp/src/slice2html/Gen.cpp4
-rwxr-xr-x[-rw-r--r--]cpp/src/slice2html/Main.cpp0
-rwxr-xr-x[-rw-r--r--]cpp/src/slice2java/Main.cpp1
27 files changed, 63 insertions, 42 deletions
diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h
index f72665ca556..6ceaa52380a 100644..100755
--- a/cpp/src/Freeze/EvictorI.h
+++ b/cpp/src/Freeze/EvictorI.h
@@ -236,6 +236,9 @@ protected:
#if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1300))
std::pair<StoreMap::iterator, bool> ir =
_storeMap.insert(StoreMap::value_type(facet, 0));
+#elif (defined(_MSC_VER) && (_MSC_VER >= 1600))
+ std::pair<typename StoreMap::iterator, bool> ir =
+ _storeMap.insert(typename StoreMap::value_type(facet, nullptr));
#else
std::pair<typename StoreMap::iterator, bool> ir =
_storeMap.insert(typename StoreMap::value_type(facet, 0));
diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp
index 0a99da28a25..f5ab1653de3 100644..100755
--- a/cpp/src/FreezeScript/DumpDB.cpp
+++ b/cpp/src/FreezeScript/DumpDB.cpp
@@ -439,7 +439,7 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator
while(true)
{
in.read(buff, 1024);
- descriptors.append(buff, in.gcount());
+ descriptors.append(buff, static_cast<size_t>(in.gcount()));
if(in.gcount() < 1024)
{
break;
diff --git a/cpp/src/FreezeScript/TransformVisitor.cpp b/cpp/src/FreezeScript/TransformVisitor.cpp
index e0ba143e66b..ad47f9ca2a8 100644..100755
--- a/cpp/src/FreezeScript/TransformVisitor.cpp
+++ b/cpp/src/FreezeScript/TransformVisitor.cpp
@@ -527,7 +527,12 @@ FreezeScript::TransformVisitor::transformObject(const ObjectDataPtr& dest, const
catch(...)
{
objectDataMap.erase(p);
+
+#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
+ objectDataMap.insert(ObjectDataMap::value_type(src.get(), nullptr));
+#else
objectDataMap.insert(ObjectDataMap::value_type(src.get(), 0));
+#endif
throw;
}
}
diff --git a/cpp/src/FreezeScript/Transformer.cpp b/cpp/src/FreezeScript/Transformer.cpp
index adb1601c5de..b509c1a0045 100644..100755
--- a/cpp/src/FreezeScript/Transformer.cpp
+++ b/cpp/src/FreezeScript/Transformer.cpp
@@ -2649,7 +2649,11 @@ FreezeScript::ObjectVisitor::visitObject(const ObjectRefPtr& data)
ObjectDataMap::iterator p = _map.find(value.get());
if(p == _map.end())
{
- _map.insert(ObjectDataMap::value_type(value.get(), 0));
+#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
+ _map.insert(ObjectDataMap::value_type(value.get(), nullptr));
+#else
+ _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 1e9dc8e5eea..9d5afb3f8b9 100644..100755
--- a/cpp/src/FreezeScript/transformdb.cpp
+++ b/cpp/src/FreezeScript/transformdb.cpp
@@ -686,7 +686,7 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator
while(true)
{
in.read(buff, 1024);
- descriptors.append(buff, in.gcount());
+ descriptors.append(buff, static_cast<size_t>(in.gcount()));
if(in.gcount() < 1024)
{
break;
diff --git a/cpp/src/Glacier2/Blobject.cpp b/cpp/src/Glacier2/Blobject.cpp
index b9531f5daf2..43270817851 100644..100755
--- a/cpp/src/Glacier2/Blobject.cpp
+++ b/cpp/src/Glacier2/Blobject.cpp
@@ -99,7 +99,11 @@ public:
virtual void
ice_sent()
{
+#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
+ _amdCB->ice_response(true, pair<const Byte*, const Byte*>(nullptr, nullptr));
+#else
_amdCB->ice_response(true, pair<const Byte*, const Byte*>(0, 0));
+#endif
}
virtual void
diff --git a/cpp/src/Glacier2/ProxyVerifier.cpp b/cpp/src/Glacier2/ProxyVerifier.cpp
index bdbd08993bc..6fcc25f8d71 100644..100755
--- a/cpp/src/Glacier2/ProxyVerifier.cpp
+++ b/cpp/src/Glacier2/ProxyVerifier.cpp
@@ -346,7 +346,7 @@ public:
{
return false;
}
- pos += istr.tellg();
+ pos += static_cast<string::size_type>(istr.tellg());
{
for(vector<int>::const_iterator i = _values.begin(); i != _values.end(); ++i)
{
diff --git a/cpp/src/Glacier2/RequestQueue.cpp b/cpp/src/Glacier2/RequestQueue.cpp
index 185ad783209..a901b6208a1 100644..100755
--- a/cpp/src/Glacier2/RequestQueue.cpp
+++ b/cpp/src/Glacier2/RequestQueue.cpp
@@ -102,7 +102,11 @@ public:
virtual void
ice_sent()
{
+#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
+ _amdCB->ice_response(true, pair<const Byte*, const Byte*>(nullptr, nullptr));
+#else
_amdCB->ice_response(true, pair<const Byte*, const Byte*>(0, 0));
+#endif
}
};
@@ -123,7 +127,11 @@ Glacier2::Request::Request(const ObjectPrx& proxy, const std::pair<const Byte*,
//
if(_proxy->ice_isBatchOneway() || _proxy->ice_isBatchDatagram())
{
+#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
+ _amdCB->ice_response(true, pair<const Byte*, const Byte*>(nullptr, nullptr));
+#else
_amdCB->ice_response(true, pair<const Byte*, const Byte*>(0, 0));
+#endif
}
Context::const_iterator p = current.ctx.find("_ovrd");
@@ -216,7 +224,11 @@ Glacier2::Request::invoke(const InstancePtr& instance, const Ice::ConnectionPtr&
}
if(sent && !_proxy->ice_isTwoway())
{
+#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
+ _amdCB->ice_response(true, pair<const Byte*, const Byte*>(nullptr, nullptr));
+#else
_amdCB->ice_response(true, pair<const Byte*, const Byte*>(0, 0));
+#endif
}
return false; // Not a batch invocation.
}
diff --git a/cpp/src/Ice/Base64.cpp b/cpp/src/Ice/Base64.cpp
index fa8bae38773..12ebd4929ca 100644..100755
--- a/cpp/src/Ice/Base64.cpp
+++ b/cpp/src/Ice/Base64.cpp
@@ -8,9 +8,7 @@
// **********************************************************************
#include <Ice/Base64.h>
-#ifdef __BCPLUSPLUS__
-# include <iterator>
-#endif
+#include <iterator>
using namespace std;
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index 3e94e6569d4..217069d06c2 100644..100755
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -24,9 +24,7 @@
#include <Ice/LoggerUtil.h>
#include <Ice/StringConverter.h>
#include <IceUtil/Unicode.h>
-#ifdef __BCPLUSPLUS__
-# include <iterator>
-#endif
+#include <iterator>
using namespace std;
using namespace Ice;
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index 1c95fb35c5a..015818d7ce0 100644..100755
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -25,9 +25,7 @@
#include <Ice/LocalException.h>
#include <Ice/Functional.h>
#include <IceUtil/Random.h>
-#ifdef __BCPLUSPLUS__
-# include <iterator>
-#endif
+#include <iterator>
using namespace std;
using namespace Ice;
diff --git a/cpp/src/IceGrid/SessionServantManager.cpp b/cpp/src/IceGrid/SessionServantManager.cpp
index cafb2493f59..29e6cfb0ee8 100644..100755
--- a/cpp/src/IceGrid/SessionServantManager.cpp
+++ b/cpp/src/IceGrid/SessionServantManager.cpp
@@ -11,6 +11,7 @@
#include <Ice/LocalException.h>
#include <Ice/ObjectAdapter.h>
#include <IceGrid/SessionServantManager.h>
+#include <iterator>
using namespace std;
using namespace IceGrid;
diff --git a/cpp/src/IceGrid/Util.h b/cpp/src/IceGrid/Util.h
index 1da82ced159..a0e0404248d 100644..100755
--- a/cpp/src/IceGrid/Util.h
+++ b/cpp/src/IceGrid/Util.h
@@ -14,11 +14,8 @@
#include <IceUtil/StringUtil.h>
#include <IceGrid/Exception.h>
#include <IceUtil/Random.h>
-
#include <functional>
-#ifdef __BCPLUSPLUS__
-# include <iterator>
-#endif
+#include <iterator>
namespace IceGrid
{
diff --git a/cpp/src/IcePatch2/Calc.cpp b/cpp/src/IcePatch2/Calc.cpp
index fe99e7dda3b..5151ae9d133 100644..100755
--- a/cpp/src/IcePatch2/Calc.cpp
+++ b/cpp/src/IcePatch2/Calc.cpp
@@ -12,6 +12,7 @@
#include <IceUtil/StringUtil.h>
#include <IceUtil/FileUtil.h>
#include <IcePatch2/Util.h>
+#include <iterator>
using namespace std;
using namespace Ice;
diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp
index 62bfa08ac68..cee2e9fe934 100644..100755
--- a/cpp/src/IcePatch2/FileServerI.cpp
+++ b/cpp/src/IcePatch2/FileServerI.cpp
@@ -84,7 +84,12 @@ IcePatch2::FileServerI::getFileCompressed_async(const AMD_FileServer_getFileComp
return;
}
+#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
+ pair<const Byte*, const Byte*> ret(nullptr, nullptr);
+#else
pair<const Byte*, const Byte*> ret(0, 0);
+#endif
+
if(num <= 0 || pos < 0)
{
cb->ice_response(ret);
diff --git a/cpp/src/IcePatch2/Makefile.mak b/cpp/src/IcePatch2/Makefile.mak
index 865ecabc478..8fa47dc6fd1 100644..100755
--- a/cpp/src/IcePatch2/Makefile.mak
+++ b/cpp/src/IcePatch2/Makefile.mak
@@ -30,6 +30,12 @@ SRCS = $(SOBJS:.obj=.cpp) \
CPPFLAGS = -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+!if "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" || \
+ "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS"
+LD_EXEFLAGS = /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" $(LD_EXEFLAGS)
+!endif
+
+
!if "$(GENERATE_PDB)" == "yes"
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
@@ -44,19 +50,19 @@ $(SERVER): $(SOBJS) IcePatch2Server.res
$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \
icepatch2$(LIBSUFFIX).lib $(SRES_FILE)
@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
$(CLIENT): $(COBJS) IcePatch2Client.res
$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \
icepatch2$(LIBSUFFIX).lib $(CRES_FILE)
@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
$(CALC): $(CALCOBJS) IcePatch2Calc.res
$(LINK) $(LD_EXEFLAGS) $(CAPDBFLAGS) $(SETARGV) $(CALCOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \
icepatch2$(LIBSUFFIX).lib $(CARES_FILE)
@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
clean::
-del /q $(SERVER:.exe=.*)
diff --git a/cpp/src/IcePatch2Lib/ClientUtil.cpp b/cpp/src/IcePatch2Lib/ClientUtil.cpp
index 70c641860e8..8bba1cc3784 100644..100755
--- a/cpp/src/IcePatch2Lib/ClientUtil.cpp
+++ b/cpp/src/IcePatch2Lib/ClientUtil.cpp
@@ -16,10 +16,7 @@
#include <IcePatch2/Util.h>
#include <IcePatch2/FileServerI.h>
#include <list>
-
-#ifdef __BCPLUSPLUS__
-# include <iterator>
-#endif
+#include <iterator>
using namespace std;
using namespace Ice;
diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp
index 9eaa712190b..d6bd48e1bd1 100644..100755
--- a/cpp/src/IcePatch2Lib/Util.cpp
+++ b/cpp/src/IcePatch2Lib/Util.cpp
@@ -32,9 +32,7 @@
# include <dirent.h>
#endif
-#ifdef __BCPLUSPLUS__
-# include <iterator>
-#endif
+#include <iterator>
const char* IcePatch2::checksumFile = "IcePatch2.sum";
const char* IcePatch2::logFile = "IcePatch2.log";
diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp
index a7563d9cc08..6ce6be549ce 100644..100755
--- a/cpp/src/IceStorm/Subscriber.cpp
+++ b/cpp/src/IceStorm/Subscriber.cpp
@@ -11,8 +11,8 @@
#include <IceStorm/Instance.h>
#include <IceStorm/TraceLevels.h>
#include <IceStorm/NodeI.h>
-
#include <Ice/LoggerUtil.h>
+#include <iterator>
using namespace std;
using namespace IceStorm;
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index f926ca4de80..70bfd33d573 100644..100755
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -15,9 +15,7 @@
#include <Slice/GrammarUtil.h>
#include <Slice/Util.h>
#include <cstring>
-#ifdef __BCPLUSPLUS__
-# include <iterator>
-#endif
+#include <iterator>
#ifdef _WIN32
# include <io.h>
diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp
index e00e869c3a5..8a9d96da270 100644..100755
--- a/cpp/src/Slice/PythonUtil.cpp
+++ b/cpp/src/Slice/PythonUtil.cpp
@@ -14,9 +14,7 @@
#include <IceUtil/StringUtil.h>
#include <IceUtil/InputUtil.h>
#include <climits>
-#ifdef __BCPLUSPLUS__
-# include <iterator>
-#endif
+#include <iterator>
using namespace std;
using namespace Slice;
diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp
index ea516807ca2..ada72fe1ce3 100644..100755
--- a/cpp/src/Slice/RubyUtil.cpp
+++ b/cpp/src/Slice/RubyUtil.cpp
@@ -12,10 +12,7 @@
#include <Slice/Util.h>
#include <IceUtil/Functional.h>
#include <IceUtil/InputUtil.h>
-
-#ifdef __BCPLUSPLUS__
#include <iterator>
-#endif
using namespace std;
using namespace Slice;
diff --git a/cpp/src/iceserviceinstall/Makefile.mak b/cpp/src/iceserviceinstall/Makefile.mak
index 71fca32fef5..94fe0dc39aa 100644..100755
--- a/cpp/src/iceserviceinstall/Makefile.mak
+++ b/cpp/src/iceserviceinstall/Makefile.mak
@@ -23,8 +23,9 @@ SRCS = $(OBJS:.obj=.cpp)
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
LINKWITH = $(LIBS)
-!if "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS"
-LINKWITH = /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'" $(LINKWITH)
+!if "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" || \
+ "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS"
+LINKWITH = /MANIFEST /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'" $(LINKWITH)
!else
EXTRA_MANIFEST = security.manifest
!endif
diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp
index 3341b03fe89..2504a2597cd 100644..100755
--- a/cpp/src/slice2freezej/Main.cpp
+++ b/cpp/src/slice2freezej/Main.cpp
@@ -16,6 +16,7 @@
#include <Slice/FileTracker.h>
#include <Slice/JavaUtil.h>
#include <Slice/Util.h>
+#include <iterator>
using namespace std;
using namespace Slice;
diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp
index 3c51d5d716e..ab26b6b4e4b 100644..100755
--- a/cpp/src/slice2html/Gen.cpp
+++ b/cpp/src/slice2html/Gen.cpp
@@ -26,9 +26,7 @@
#include <unistd.h>
#endif
-#ifdef __BCPLUSPLUS__
-# include <iterator>
-#endif
+#include <iterator>
#include <string.h>
diff --git a/cpp/src/slice2html/Main.cpp b/cpp/src/slice2html/Main.cpp
index f281be68a6c..f281be68a6c 100644..100755
--- a/cpp/src/slice2html/Main.cpp
+++ b/cpp/src/slice2html/Main.cpp
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 90c0af9169f..be133161324 100644..100755
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -15,6 +15,7 @@
#include <Slice/FileTracker.h>
#include <Slice/Util.h>
#include <Gen.h>
+#include <iterator>
using namespace std;
using namespace Slice;
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 20:57:27 +0000