summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2019-03-13 20:25:45 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2019-03-13 20:25:45 +0000
commita0ce0b48af073209e7738758c87098f03bb3d7e9 (patch)
tree8a5368e6807ff6910abc7d319bcb48387f83501b
parentBump Ice v3.7.2 (diff)
downloadproject2-a0ce0b48af073209e7738758c87098f03bb3d7e9.tar.bz2
project2-a0ce0b48af073209e7738758c87098f03bb3d7e9.tar.xz
project2-a0ce0b48af073209e7738758c87098f03bb3d7e9.zip
Minor build fixes
-rw-r--r--project2/compression/gzip.cpp2
-rw-r--r--project2/ice/iceConvert.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/project2/compression/gzip.cpp b/project2/compression/gzip.cpp
index 973e4d6..de80401 100644
--- a/project2/compression/gzip.cpp
+++ b/project2/compression/gzip.cpp
@@ -34,7 +34,7 @@ class GZip : public Decompressor {
switch (status) {
case Z_NEED_DICT:
status = Z_DATA_ERROR;
- // fall-through
+ [[ fallthrough ]];
case Z_DATA_ERROR:
case Z_MEM_ERROR:
throw std::runtime_error("inflate failed");
diff --git a/project2/ice/iceConvert.h b/project2/ice/iceConvert.h
index 4eff923..c22d655 100644
--- a/project2/ice/iceConvert.h
+++ b/project2/ice/iceConvert.h
@@ -3,7 +3,7 @@
#include <variableType.h>
#include <IceUtil/Exception.h>
-#include <IceUtil/Optional.h>
+#include <Ice/Optional.h>
#include <visibility.h>
template <typename IceType>