summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2017-10-25 19:40:14 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2017-12-16 20:39:16 +0000
commit87fff9d7a08298d20b5783e1fbd92e58b9ce3587 (patch)
treee8bf3354b3171621601cfa9b4255aafc2b885cef
parentRun lto in parallel (diff)
downloadnetfs-87fff9d7a08298d20b5783e1fbd92e58b9ce3587.tar.bz2
netfs-87fff9d7a08298d20b5783e1fbd92e58b9ce3587.tar.xz
netfs-87fff9d7a08298d20b5783e1fbd92e58b9ce3587.zip
Configuration types can be local with modern Slicer
-rw-r--r--netfs/daemon/daemonConfig.ice12
-rw-r--r--netfs/fuse/fuseConfig.ice8
2 files changed, 10 insertions, 10 deletions
diff --git a/netfs/daemon/daemonConfig.ice b/netfs/daemon/daemonConfig.ice
index 07fef60..ac438fb 100644
--- a/netfs/daemon/daemonConfig.ice
+++ b/netfs/daemon/daemonConfig.ice
@@ -1,14 +1,14 @@
module NetFS {
module Daemon {
- class Host {
+ local class Host {
["slicer:name:endpoint"]
string Endpoint;
};
["slicer:key:hostname","slicer:value:host","slicer:item:host"]
- dictionary<string, Host> HostMap;
+ local dictionary<string, Host> HostMap;
- class Export {
+ local class Export {
["slicer:name:root"]
string RootPath;
@@ -17,10 +17,10 @@ module NetFS {
};
["slicer:key:name","slicer:value:export","slicer:item:export"]
- dictionary<string, Export> ExportMap;
+ local dictionary<string, Export> ExportMap;
["slicer:root:config"]
- class Configuration {
+ local class Configuration {
["slicer:name:exports"]
ExportMap Exports;
@@ -29,7 +29,7 @@ module NetFS {
};
["slicer:ignore"]
- class RuntimeConfiguration {
+ local class RuntimeConfiguration {
Configuration CurrentConfiguration;
Host Self;
};
diff --git a/netfs/fuse/fuseConfig.ice b/netfs/fuse/fuseConfig.ice
index d4cee41..91740fc 100644
--- a/netfs/fuse/fuseConfig.ice
+++ b/netfs/fuse/fuseConfig.ice
@@ -1,9 +1,9 @@
module NetFS {
module Client {
["slicer:element:endpoint"]
- sequence<string> EndpointList;
+ local sequence<string> EndpointList;
- class Resource {
+ local class Resource {
["slicer:name:export"]
string ExportName;
@@ -18,10 +18,10 @@ module NetFS {
};
["slicer:key:name","slicer:value:resource","slicer:item:resource"]
- dictionary<string, Resource> ResourceMap;
+ local dictionary<string, Resource> ResourceMap;
["slicer:root:config"]
- class Configuration {
+ local class Configuration {
["slicer:name:resources"]
ResourceMap Resources;
};