summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2020-10-17 12:51:02 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2020-10-17 12:51:02 +0100
commit93de6598bcd18654801965c73368b701379bf159 (patch)
tree3f4b9c6cad9af7c0732d373a615b623e2bea0c9e
parentRemove use of Ice::optional for std::optional (diff)
downloadslicer-93de6598bcd18654801965c73368b701379bf159.tar.bz2
slicer-93de6598bcd18654801965c73368b701379bf159.tar.xz
slicer-93de6598bcd18654801965c73368b701379bf159.zip
Forward declare Ice::*Streams
-rw-r--r--slicer/slicer/modelParts.h8
-rw-r--r--slicer/slicer/modelPartsTypes.h2
2 files changed, 8 insertions, 2 deletions
diff --git a/slicer/slicer/modelParts.h b/slicer/slicer/modelParts.h
index 305e073..a63d035 100644
--- a/slicer/slicer/modelParts.h
+++ b/slicer/slicer/modelParts.h
@@ -1,8 +1,7 @@
#ifndef SLICER_MODELPARTS_H
#define SLICER_MODELPARTS_H
-#include <Ice/InputStream.h>
-#include <Ice/OutputStream.h>
+#include <Ice/Config.h>
#include <functional>
#include <list>
#include <optional>
@@ -10,6 +9,11 @@
#include <vector>
#include <visibility.h>
+namespace Ice {
+ class InputStream;
+ class OutputStream;
+}
+
namespace Slicer {
template<typename T> class TValueTarget {
public:
diff --git a/slicer/slicer/modelPartsTypes.h b/slicer/slicer/modelPartsTypes.h
index 06458d1..35f6cab 100644
--- a/slicer/slicer/modelPartsTypes.h
+++ b/slicer/slicer/modelPartsTypes.h
@@ -2,6 +2,8 @@
#define SLICER_MODELPARTSTYPES_H
#include "modelParts.h"
+#include <Ice/ObjectF.h>
+#include <Ice/Optional.h>
namespace Slicer {
template<typename T> struct isLocal {