summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Freeze/DBI.cpp14
-rw-r--r--cpp/src/Ice/BasicStream.cpp20
-rw-r--r--cpp/src/Ice/Connection.cpp8
-rw-r--r--cpp/src/Ice/TcpTransceiver.cpp4
-rw-r--r--cpp/src/Ice/UdpTransceiver.cpp6
-rw-r--r--cpp/src/IcePack/Makefile4
-rw-r--r--cpp/src/IcePack/icepackC.dsp6
-rw-r--r--cpp/src/IceSSL/CertificateDesc.cpp9
-rw-r--r--cpp/src/IceSSL/CertificateDesc.h4
-rw-r--r--cpp/src/IceSSL/ConfigParser.cpp17
-rw-r--r--cpp/src/IceSSL/GeneralConfig.cpp11
-rw-r--r--cpp/src/IceSSL/GeneralConfig.h2
-rw-r--r--cpp/src/IceSSL/OpenSSLPluginI.cpp9
-rw-r--r--cpp/src/IceSSL/SslAcceptor.cpp9
-rw-r--r--cpp/src/IceSSL/SslConnectionOpenSSL.cpp11
-rw-r--r--cpp/src/IceSSL/SslConnectionOpenSSLClient.cpp2
-rw-r--r--cpp/src/IceSSL/SslConnectionOpenSSLServer.cpp2
-rw-r--r--cpp/src/IceSSL/SslConnector.cpp9
-rw-r--r--cpp/src/IceSSL/SslException.cpp9
-rw-r--r--cpp/src/IceStorm/Makefile4
-rw-r--r--cpp/src/IceStorm/icestormC.dsp6
-rw-r--r--cpp/src/Slice/Makefile4
-rw-r--r--cpp/src/Slice/slice.dsp6
23 files changed, 58 insertions, 118 deletions
diff --git a/cpp/src/Freeze/DBI.cpp b/cpp/src/Freeze/DBI.cpp
index e3680afee97..9e4b725b936 100644
--- a/cpp/src/Freeze/DBI.cpp
+++ b/cpp/src/Freeze/DBI.cpp
@@ -391,7 +391,7 @@ DBCursorI::set(const Value& value)
DBT dbKey, dbData;
memset(&dbKey, 0, sizeof(dbKey));
memset(&dbData, 0, sizeof(dbData));
- dbData.data = const_cast<void*>(static_cast<const void*>(value.begin()));
+ dbData.data = const_cast<void*>(static_cast<const void*>(&value[0]));
dbData.size = value.size();
if (_trace >= 1)
@@ -699,7 +699,7 @@ Freeze::DBI::getCursorAtKey(const Key& key)
memset(&dbData, 0, sizeof(dbData));
dbData.flags = DB_DBT_PARTIAL;
- dbKey.data = const_cast<void*>(static_cast<const void*>(key.begin()));
+ dbKey.data = const_cast<void*>(static_cast<const void*>(&key[0]));
dbKey.size = key.size();
try
{
@@ -734,9 +734,9 @@ Freeze::DBI::put(const Key& key, const Value& value)
DBT dbKey, dbData;
memset(&dbKey, 0, sizeof(dbKey));
memset(&dbData, 0, sizeof(dbData));
- dbKey.data = const_cast<void*>(static_cast<const void*>(key.begin()));
+ dbKey.data = const_cast<void*>(static_cast<const void*>(&key[0]));
dbKey.size = key.size();
- dbData.data = const_cast<void*>(static_cast<const void*>(value.begin()));
+ dbData.data = const_cast<void*>(static_cast<const void*>(&value[0]));
dbData.size = value.size();
if (_trace >= 1)
@@ -764,7 +764,7 @@ Freeze::DBI::contains(const Key& key)
DBT dbKey;
memset(&dbKey, 0, sizeof(dbKey));
- dbKey.data = const_cast<void*>(static_cast<const void*>(key.begin()));
+ dbKey.data = const_cast<void*>(static_cast<const void*>(&key[0]));
dbKey.size = key.size();
DBT dbData;
@@ -804,7 +804,7 @@ Freeze::DBI::get(const Key& key)
DBT dbKey, dbData;
memset(&dbKey, 0, sizeof(dbKey));
memset(&dbData, 0, sizeof(dbData));
- dbKey.data = const_cast<void*>(static_cast<const void*>(key.begin()));
+ dbKey.data = const_cast<void*>(static_cast<const void*>(&key[0]));
dbKey.size = key.size();
if (_trace >= 1)
@@ -834,7 +834,7 @@ Freeze::DBI::del(const Key& key)
DBT dbKey;
memset(&dbKey, 0, sizeof(dbKey));
- dbKey.data = const_cast<void*>(static_cast<const void*>(key.begin()));
+ dbKey.data = const_cast<void*>(static_cast<const void*>(&key[0]));
dbKey.size = key.size();
if (_trace >= 1)
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index 6ff3b3e6d63..68694d43dc7 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -330,7 +330,7 @@ IceInternal::BasicStream::write(const vector<Short>& v)
writeSize(sz);
int pos = b.size();
resize(pos + sz * sizeof(Short));
- const Byte* p = reinterpret_cast<const Byte*>(v.begin());
+ const Byte* p = reinterpret_cast<const Byte*>(&v[0]);
#ifdef ICE_UTIL_BIGENDIAN
for (int j = 0 ; j < sz ; ++j)
{
@@ -378,7 +378,7 @@ IceInternal::BasicStream::read(vector<Short>& v)
begin += sizeof(Short);
}
#else
- copy(begin, i, reinterpret_cast<Byte*>(v.begin()));
+ copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
#endif
}
@@ -402,7 +402,7 @@ IceInternal::BasicStream::write(const vector<Int>& v)
writeSize(sz);
int pos = b.size();
resize(pos + sz * sizeof(Int));
- const Byte* p = reinterpret_cast<const Byte*>(v.begin());
+ const Byte* p = reinterpret_cast<const Byte*>(&v[0]);
#ifdef ICE_UTIL_BIGENDIAN
for (int j = 0 ; j < sz ; ++j)
{
@@ -450,7 +450,7 @@ IceInternal::BasicStream::read(vector<Int>& v)
begin += sizeof(Int);
}
#else
- copy(begin, i, reinterpret_cast<Byte*>(v.begin()));
+ copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
#endif
}
@@ -474,7 +474,7 @@ IceInternal::BasicStream::write(const vector<Long>& v)
writeSize(sz);
int pos = b.size();
resize(pos + sz * sizeof(Long));
- const Byte* p = reinterpret_cast<const Byte*>(v.begin());
+ const Byte* p = reinterpret_cast<const Byte*>(&v[0]);
#ifdef ICE_UTIL_BIGENDIAN
for (int j = 0 ; j < sz ; ++j)
{
@@ -522,7 +522,7 @@ IceInternal::BasicStream::read(vector<Long>& v)
begin += sizeof(Long);
}
#else
- copy(begin, i, reinterpret_cast<Byte*>(v.begin()));
+ copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
#endif
}
@@ -546,7 +546,7 @@ IceInternal::BasicStream::write(const vector<Float>& v)
writeSize(sz);
int pos = b.size();
resize(pos + sz * sizeof(Float));
- const Byte* p = reinterpret_cast<const Byte*>(v.begin());
+ const Byte* p = reinterpret_cast<const Byte*>(&v[0]);
#ifdef ICE_UTIL_BIGENDIAN
for (int j = 0 ; j < sz ; ++j)
{
@@ -594,7 +594,7 @@ IceInternal::BasicStream::read(vector<Float>& v)
begin += sizeof(Float);
}
#else
- copy(begin, i, reinterpret_cast<Byte*>(v.begin()));
+ copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
#endif
}
@@ -618,7 +618,7 @@ IceInternal::BasicStream::write(const vector<Double>& v)
writeSize(sz);
int pos = b.size();
resize(pos + sz * sizeof(Double));
- const Byte* p = reinterpret_cast<const Byte*>(v.begin());
+ const Byte* p = reinterpret_cast<const Byte*>(&v[0]);
#ifdef ICE_UTIL_BIGENDIAN
for (int j = 0 ; j < sz ; ++j)
{
@@ -666,7 +666,7 @@ IceInternal::BasicStream::read(vector<Double>& v)
begin += sizeof(Double);
}
#else
- copy(begin, i, reinterpret_cast<Byte*>(v.begin()));
+ copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
#endif
}
diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp
index 6b99accd7ed..dbebc358240 100644
--- a/cpp/src/Ice/Connection.cpp
+++ b/cpp/src/Ice/Connection.cpp
@@ -1031,8 +1031,8 @@ IceInternal::Connection::compress(BasicStream& uncompressed, BasicStream& compre
unsigned int uncompressedLen = uncompressed.b.size() - headerSize;
unsigned int compressedLen = static_cast<int>(uncompressedLen * 1.01 + 600);
compressed.b.resize(headerSize + sizeof(Int) + compressedLen);
- int bzError = BZ2_bzBuffToBuffCompress(compressed.b.begin() + headerSize + sizeof(Int), &compressedLen,
- uncompressed.b.begin() + headerSize, uncompressedLen,
+ int bzError = BZ2_bzBuffToBuffCompress(&compressed.b[0] + headerSize + sizeof(Int), &compressedLen,
+ &uncompressed.b[0] + headerSize, uncompressedLen,
1, 0, 0);
if (bzError != BZ_OK)
{
@@ -1077,9 +1077,9 @@ IceInternal::Connection::uncompress(BasicStream& compressed, BasicStream& uncomp
uncompressed.resize(uncompressedSize);
unsigned int uncompressedLen = uncompressedSize - headerSize;
unsigned int compressedLen = compressed.b.size() - headerSize - sizeof(Int);
- int bzError = BZ2_bzBuffToBuffDecompress(uncompressed.b.begin() + headerSize,
+ int bzError = BZ2_bzBuffToBuffDecompress(&uncompressed.b[0] + headerSize,
&uncompressedLen,
- compressed.b.begin() + headerSize + sizeof(Int),
+ &compressed.b[0] + headerSize + sizeof(Int),
compressedLen,
0, 0);
if (bzError != BZ_OK)
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp
index b98a4f1cd14..6c8cf640dd8 100644
--- a/cpp/src/Ice/TcpTransceiver.cpp
+++ b/cpp/src/Ice/TcpTransceiver.cpp
@@ -70,7 +70,7 @@ IceInternal::TcpTransceiver::write(Buffer& buf, int timeout)
while (buf.i != buf.b.end())
{
- int ret = ::send(_fd, buf.i, packetSize, 0);
+ int ret = ::send(_fd, &*buf.i, packetSize, 0);
if (ret == 0)
{
@@ -169,7 +169,7 @@ IceInternal::TcpTransceiver::read(Buffer& buf, int timeout)
while (buf.i != buf.b.end())
{
- int ret = ::recv(_fd, buf.i, packetSize, 0);
+ int ret = ::recv(_fd, &*buf.i, packetSize, 0);
if (ret == 0)
{
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index bae7154e868..c62a75f11a2 100644
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -55,7 +55,7 @@ IceInternal::UdpTransceiver::write(Buffer& buf, int)
#endif
repeat:
- int ret = ::send(_fd, buf.b.begin(), buf.b.size(), 0);
+ int ret = ::send(_fd, &buf.b[0], buf.b.size(), 0);
if (ret == SOCKET_ERROR)
{
@@ -125,7 +125,7 @@ repeat:
struct sockaddr_in peerAddr;
memset(&peerAddr, 0, sizeof(struct sockaddr_in));
socklen_t len = sizeof(peerAddr);
- ret = recvfrom(_fd, buf.b.begin(), packetSize, 0, reinterpret_cast<struct sockaddr*>(&peerAddr), &len);
+ ret = recvfrom(_fd, &buf.b[0], packetSize, 0, reinterpret_cast<struct sockaddr*>(&peerAddr), &len);
if (ret != SOCKET_ERROR)
{
doConnect(_fd, peerAddr, -1);
@@ -140,7 +140,7 @@ repeat:
}
else
{
- ret = ::recv(_fd, buf.b.begin(), packetSize, 0);
+ ret = ::recv(_fd, &buf.b[0], packetSize, 0);
}
if (ret == SOCKET_ERROR)
diff --git a/cpp/src/IcePack/Makefile b/cpp/src/IcePack/Makefile
index 660a8bb25f6..a669287f789 100644
--- a/cpp/src/IcePack/Makefile
+++ b/cpp/src/IcePack/Makefile
@@ -68,7 +68,9 @@ Grammar.cpp Grammar.h: Grammar.y
Scanner.cpp: Scanner.l Grammar.h
flex Scanner.l
- rm -f Scanner.cpp ; mv lex.yy.c Scanner.cpp
+ rm -f Scanner.cpp
+ echo '#include <IceUtil/Config.h>' > Scanner.cpp
+ cat lex.yy.c >> Scanner.cpp
clean::
-rm -f Grammar.cpp Grammar.h Grammar.output
diff --git a/cpp/src/IcePack/icepackC.dsp b/cpp/src/IcePack/icepackC.dsp
index 5900494e951..21ac233364b 100644
--- a/cpp/src/IcePack/icepackC.dsp
+++ b/cpp/src/IcePack/icepackC.dsp
@@ -175,7 +175,8 @@ InputPath=.\Scanner.l
"Scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
flex Scanner.l
- move lex.yy.c Scanner.cpp
+ echo #include "IceUtil/Config.h" > Scanner.cpp
+ type lex.yy.c >> Scanner.cpp
# End Custom Build
@@ -186,7 +187,8 @@ InputPath=.\Scanner.l
"Scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
flex Scanner.l
- move lex.yy.c Scanner.cpp
+ echo #include "IceUtil/Config.h" > Scanner.cpp
+ type lex.yy.c >> Scanner.cpp
# End Custom Build
diff --git a/cpp/src/IceSSL/CertificateDesc.cpp b/cpp/src/IceSSL/CertificateDesc.cpp
index d13836b52b8..5c654f75050 100644
--- a/cpp/src/IceSSL/CertificateDesc.cpp
+++ b/cpp/src/IceSSL/CertificateDesc.cpp
@@ -8,15 +8,6 @@
//
// **********************************************************************
-// Note: This pragma is used to disable spurious warning messages having
-// to do with the length of debug symbols exceeding 255 characters.
-// This is due to STL template identifiers expansion.
-// The MSDN Library recommends that you put this pragma directive
-// in place to avoid the warnings.
-#ifdef _WIN32
-#pragma warning(disable:4786)
-#endif
-
#include <IceSSL/CertificateDesc.h>
using namespace std;
diff --git a/cpp/src/IceSSL/CertificateDesc.h b/cpp/src/IceSSL/CertificateDesc.h
index d2361669272..c49204786da 100644
--- a/cpp/src/IceSSL/CertificateDesc.h
+++ b/cpp/src/IceSSL/CertificateDesc.h
@@ -11,9 +11,7 @@
#ifndef ICE_SSL_CERTIFICATE_DESC_H
#define ICE_SSL_CERTIFICATE_DESC_H
-#ifdef _WIN32
-#pragma warning(disable:4786)
-#endif
+#include <Ice/Config.h>
#include <openssl/ssl.h>
diff --git a/cpp/src/IceSSL/ConfigParser.cpp b/cpp/src/IceSSL/ConfigParser.cpp
index f402fc09b3b..2d6a66717da 100644
--- a/cpp/src/IceSSL/ConfigParser.cpp
+++ b/cpp/src/IceSSL/ConfigParser.cpp
@@ -8,25 +8,16 @@
//
// **********************************************************************
-// Note: This pragma is used to disable spurious warning messages having
-// to do with the length of debug symbols exceeding 255 characters.
-// This is due to STL template identifiers expansion.
-// The MSDN Library recommends that you put this pragma directive
-// in place to avoid the warnings.
-#ifdef _WIN32
-#pragma warning(disable:4786)
-#endif
+#include <IceSSL/ConfigParser.h>
+#include <IceSSL/ConfigParserErrorReporter.h>
+#include <IceSSL/OpenSSL.h>
+#include <IceSSL/Exception.h>
#include <util/PlatformUtils.hpp>
#include <parsers/DOMParser.hpp>
#include <framework/LocalFileInputSource.hpp>
#include <util/Janitor.hpp>
-#include <IceSSL/OpenSSL.h>
-#include <IceSSL/Exception.h>
-#include <IceSSL/ConfigParserErrorReporter.h>
-#include <IceSSL/ConfigParser.h>
-
#include <algorithm>
using namespace std;
diff --git a/cpp/src/IceSSL/GeneralConfig.cpp b/cpp/src/IceSSL/GeneralConfig.cpp
index 3ad39917e1e..541614d8ad4 100644
--- a/cpp/src/IceSSL/GeneralConfig.cpp
+++ b/cpp/src/IceSSL/GeneralConfig.cpp
@@ -8,20 +8,11 @@
//
// **********************************************************************
-// Note: This pragma is used to disable spurious warning messages having
-// to do with the length of debug symbols exceeding 255 characters.
-// This is due to STL template identifiers expansion.
-// The MSDN Library recommends that you put this pragma directive
-// in place to avoid the warnings.
-#ifdef _WIN32
-#pragma warning(disable:4786)
-#endif
+#include <IceSSL/GeneralConfig.h>
#include <string>
#include <algorithm>
-#include <IceSSL/GeneralConfig.h>
-
using namespace std;
IceSSL::GeneralConfig::GeneralConfig()
diff --git a/cpp/src/IceSSL/GeneralConfig.h b/cpp/src/IceSSL/GeneralConfig.h
index c9bca2c9090..97500969d4c 100644
--- a/cpp/src/IceSSL/GeneralConfig.h
+++ b/cpp/src/IceSSL/GeneralConfig.h
@@ -11,6 +11,8 @@
#ifndef ICE_SSL_GENERAL_CONFIG_H
#define ICE_SSL_GENERAL_CONFIG_H
+#include <Ice/Config.h>
+
#include <IceSSL/OpenSSL.h>
namespace IceSSL
diff --git a/cpp/src/IceSSL/OpenSSLPluginI.cpp b/cpp/src/IceSSL/OpenSSLPluginI.cpp
index 487091e25bc..3c913d40016 100644
--- a/cpp/src/IceSSL/OpenSSLPluginI.cpp
+++ b/cpp/src/IceSSL/OpenSSLPluginI.cpp
@@ -8,15 +8,6 @@
//
// **********************************************************************
-// Note: This pragma is used to disable spurious warning messages having
-// to do with the length of debug symbols exceeding 255 characters.
-// This is due to STL template identifiers expansion.
-// The MSDN Library recommends that you put this pragma directive
-// in place to avoid the warnings.
-#ifdef _WIN32
-# pragma warning(disable:4786)
-#endif
-
//
// This needs to be first since <openssl/e_os.h> #include <windows.h>
// without our configuration settings.
diff --git a/cpp/src/IceSSL/SslAcceptor.cpp b/cpp/src/IceSSL/SslAcceptor.cpp
index 9c08b2c8caa..8218a47ccb0 100644
--- a/cpp/src/IceSSL/SslAcceptor.cpp
+++ b/cpp/src/IceSSL/SslAcceptor.cpp
@@ -8,15 +8,6 @@
//
// **********************************************************************
-// Note: This pragma is used to disable spurious warning messages having
-// to do with the length of debug symbols exceeding 255 characters.
-// This is due to STL template identifiers expansion.
-// The MSDN Library recommends that you put this pragma directive
-// in place to avoid the warnings.
-#ifdef _WIN32
-# pragma warning(disable:4786)
-#endif
-
#include <Ice/Logger.h>
#include <Ice/Network.h>
diff --git a/cpp/src/IceSSL/SslConnectionOpenSSL.cpp b/cpp/src/IceSSL/SslConnectionOpenSSL.cpp
index 043ccd06184..dba97fde2d2 100644
--- a/cpp/src/IceSSL/SslConnectionOpenSSL.cpp
+++ b/cpp/src/IceSSL/SslConnectionOpenSSL.cpp
@@ -8,15 +8,6 @@
//
// **********************************************************************
-// Note: This pragma is used to disable spurious warning messages having
-// to do with the length of debug symbols exceeding 255 characters.
-// This is due to STL template identifiers expansion.
-// The MSDN Library recommends that you put this pragma directive
-// in place to avoid the warnings.
-#ifdef _WIN32
-#pragma warning(disable:4786)
-#endif
-
#include <Ice/Network.h>
#include <Ice/Logger.h>
#include <Ice/LocalException.h>
@@ -596,7 +587,7 @@ IceSSL::OpenSSL::Connection::read(Buffer& buf, int timeout)
_readTimeout = timeout;
- bytesRead = sslRead((char *)buf.i, packetSize);
+ bytesRead = sslRead(static_cast<char*>(&*buf.i), packetSize);
switch (getLastError())
{
diff --git a/cpp/src/IceSSL/SslConnectionOpenSSLClient.cpp b/cpp/src/IceSSL/SslConnectionOpenSSLClient.cpp
index dd7c527a8b8..acfbdd6bc71 100644
--- a/cpp/src/IceSSL/SslConnectionOpenSSLClient.cpp
+++ b/cpp/src/IceSSL/SslConnectionOpenSSLClient.cpp
@@ -256,7 +256,7 @@ IceSSL::OpenSSL::ClientConnection::write(Buffer& buf, int timeout)
break;
}
- bytesWritten = sslWrite((char *)buf.i, packetSize);
+ bytesWritten = sslWrite(static_cast<char*>(&*buf.i), packetSize);
switch (getLastError())
{
diff --git a/cpp/src/IceSSL/SslConnectionOpenSSLServer.cpp b/cpp/src/IceSSL/SslConnectionOpenSSLServer.cpp
index 14bb5dc75e3..1933a5056a1 100644
--- a/cpp/src/IceSSL/SslConnectionOpenSSLServer.cpp
+++ b/cpp/src/IceSSL/SslConnectionOpenSSLServer.cpp
@@ -246,7 +246,7 @@ IceSSL::OpenSSL::ServerConnection::write(Buffer& buf, int timeout)
break;
}
- bytesWritten = sslWrite((char *)buf.i, packetSize);
+ bytesWritten = sslWrite(static_cast<char*>(&*buf.i), packetSize);
switch (getLastError())
{
diff --git a/cpp/src/IceSSL/SslConnector.cpp b/cpp/src/IceSSL/SslConnector.cpp
index c6d8375054b..be354757e81 100644
--- a/cpp/src/IceSSL/SslConnector.cpp
+++ b/cpp/src/IceSSL/SslConnector.cpp
@@ -8,15 +8,6 @@
//
// **********************************************************************
-// Note: This pragma is used to disable spurious warning messages having
-// to do with the length of debug symbols exceeding 255 characters.
-// This is due to STL template identifiers expansion.
-// The MSDN Library recommends that you put this pragma directive
-// in place to avoid the warnings.
-#ifdef _WIN32
-# pragma warning(disable:4786)
-#endif
-
#include <Ice/Logger.h>
#include <Ice/Network.h>
diff --git a/cpp/src/IceSSL/SslException.cpp b/cpp/src/IceSSL/SslException.cpp
index e0ccf7f56bb..bc5d645450a 100644
--- a/cpp/src/IceSSL/SslException.cpp
+++ b/cpp/src/IceSSL/SslException.cpp
@@ -8,15 +8,6 @@
//
// **********************************************************************
-// Note: This pragma is used to disable spurious warning messages having
-// to do with the length of debug symbols exceeding 255 characters.
-// This is due to STL template identifiers expansion.
-// The MSDN Library recommends that you put this pragma directive
-// in place to avoid the warnings.
-#ifdef _WIN32
-#pragma warning(disable:4786)
-#endif
-
#include <Ice/LocalException.h>
#include <IceSSL/Exception.h>
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index 625032064df..cb17e4a8596 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -118,7 +118,9 @@ Grammar.cpp Grammar.h: Grammar.y
Scanner.cpp: Scanner.l Grammar.h
flex Scanner.l
- rm -f Scanner.cpp ; mv lex.yy.c Scanner.cpp
+ rm -f Scanner.cpp
+ echo '#include <IceUtil/Config.h>' > Scanner.cpp
+ cat lex.yy.c >> Scanner.cpp
clean::
-rm -f Grammar.cpp Grammar.h Grammar.output
diff --git a/cpp/src/IceStorm/icestormC.dsp b/cpp/src/IceStorm/icestormC.dsp
index 1a67b227211..f856704d4c7 100644
--- a/cpp/src/IceStorm/icestormC.dsp
+++ b/cpp/src/IceStorm/icestormC.dsp
@@ -183,7 +183,8 @@ InputPath=.\Scanner.l
"Scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
flex Scanner.l
- move lex.yy.c Scanner.cpp
+ echo #include "IceUtil/Config.h" > Scanner.cpp
+ type lex.yy.c >> Scanner.cpp
# End Custom Build
@@ -194,7 +195,8 @@ InputPath=.\Scanner.l
"Scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
flex Scanner.l
- move lex.yy.c Scanner.cpp
+ echo #include "IceUtil/Config.h" > Scanner.cpp
+ type lex.yy.c >> Scanner.cpp
# End Custom Build
diff --git a/cpp/src/Slice/Makefile b/cpp/src/Slice/Makefile
index 96c8d93866c..a9ada1884c5 100644
--- a/cpp/src/Slice/Makefile
+++ b/cpp/src/Slice/Makefile
@@ -45,7 +45,9 @@ Grammar.cpp Grammar.h: Grammar.y
Scanner.cpp: Scanner.l Grammar.h
flex Scanner.l
- rm -f Scanner.cpp ; mv lex.yy.c Scanner.cpp
+ rm -f Scanner.cpp
+ echo '#include <IceUtil/Config.h>' > Scanner.cpp
+ cat lex.yy.c >> Scanner.cpp
clean::
-rm -f Grammar.cpp Grammar.h Grammar.output
diff --git a/cpp/src/Slice/slice.dsp b/cpp/src/Slice/slice.dsp
index 5e029a7171b..0f2c1688f08 100644
--- a/cpp/src/Slice/slice.dsp
+++ b/cpp/src/Slice/slice.dsp
@@ -204,7 +204,8 @@ InputPath=.\Scanner.l
"Scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
flex Scanner.l
- move lex.yy.c Scanner.cpp
+ echo #include "IceUtil/Config.h" > Scanner.cpp
+ type lex.yy.c >> Scanner.cpp
# End Custom Build
@@ -215,7 +216,8 @@ InputPath=.\Scanner.l
"Scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
flex Scanner.l
- move lex.yy.c Scanner.cpp
+ echo #include "IceUtil/Config.h" > Scanner.cpp
+ type lex.yy.c >> Scanner.cpp
# End Custom Build
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 20:58:34 +0000