summaryrefslogtreecommitdiff
path: root/cpp/src/icecpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/icecpp')
-rw-r--r--cpp/src/icecpp/config.h7
-rw-r--r--cpp/src/icecpp/prefix.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/cpp/src/icecpp/config.h b/cpp/src/icecpp/config.h
index 5eacee9d5f1..1480369ff05 100644
--- a/cpp/src/icecpp/config.h
+++ b/cpp/src/icecpp/config.h
@@ -29,6 +29,13 @@
# ifdef _MSC_VER
# pragma warning( disable : 4018 )
# pragma warning( disable : 4244 )
+//
+//
+// TEMPORARY: move deprecated warning on VC8 to level 4
+# if _MSC_VER==1400
+# pragma warning( 4 : 4996 )
+# pragma warning( 4 : 4267 )
+# endif
# endif
# define alloca _alloca
#endif
diff --git a/cpp/src/icecpp/prefix.c b/cpp/src/icecpp/prefix.c
index 7f56057a55d..075e148de88 100644
--- a/cpp/src/icecpp/prefix.c
+++ b/cpp/src/icecpp/prefix.c
@@ -137,7 +137,7 @@ concat VPROTO((char *first, ...))
while (arg != 0)
{
- length += strlen (arg);
+ length += (int) strlen (arg);
arg = va_arg (args, char *);
}
@@ -272,7 +272,7 @@ translate_name (name)
#endif
)
{
- prefix = save_string (prefix, strlen (prefix));
+ prefix = save_string (prefix, (int)strlen (prefix));
prefix[strlen (prefix) - 1] = 0;
}