Get rid of brep namespace in loader's options.cli

2 files changed, 36 insertions, 38 deletions

diff --git a/loader/buildfile b/loader/buildfile
index ffa8a9c..d40b643 100644
--- a/loader/buildfile
+++ b/loader/buildfile
@@ -15,6 +15,6 @@ exe{brep-loader}:            \
 ../brep/lib{brep} $libs
 
 cli.options += -I $src_root --include-with-brackets --include-prefix loader \
---guard-prefix LOADER --cli-namespace brep::cli
+--guard-prefix LOADER
 
 {hxx ixx cxx}{options}: cli{options}
diff --git a/loader/options.cli b/loader/options.cli
index e46a548..2539a0c 100644
--- a/loader/options.cli
+++ b/loader/options.cli
@@ -2,47 +2,45 @@
 // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <brep/types>;
+include <string>;
+include <cstdint>; // uint16_t
 
-namespace brep
+class options
 {
-  class options
-  {
-    bool --help {"Print usage information and exit."}
-    bool --version {"Print version and exit."}
+  bool --help {"Print usage information and exit."}
+  bool --version {"Print version and exit."}
 
-    string --db-user|-u
-    {
-      "<user>",
-      "Database user name. If not specified, then operating system (login)
-       name is used."
-    }
+  std::string --db-user|-u
+  {
+    "<user>",
+    "Database user name. If not specified, then operating system (login)
+     name is used."
+  }
 
-    string --db-password
-    {
-      "<pass>",
-      "Database password. If not specified, then login without password is
-       expected to work."
-    }
+  std::string --db-password
+  {
+    "<pass>",
+    "Database password. If not specified, then login without password is
+     expected to work."
+  }
 
-    string --db-name|-n = "brep"
-    {
-      "<name>",
-      "Database name. If not specified, then '\cb{brep}' is used by default."
-    }
+  std::string --db-name|-n = "brep"
+  {
+    "<name>",
+    "Database name. If not specified, then '\cb{brep}' is used by default."
+  }
 
-    string --db-host|-h
-    {
-      "<host>",
-      "Database host name, address, or socket. If not specified, then connect
-       to \cb{localhost} using the operating system-default mechanism
-       (Unix-domain socket, etc)."
-    }
+  std::string --db-host|-h
+  {
+    "<host>",
+    "Database host name, address, or socket. If not specified, then connect
+     to \cb{localhost} using the operating system-default mechanism
+     (Unix-domain socket, etc)."
+  }
 
-    uint16_t --db-port|-p = 0
-    {
-      "<port>",
-      "Database port number. If not specified, the default port is used."
-    }
-  };
-}
+  std::uint16_t --db-port|-p = 0
+  {
+    "<port>",
+    "Database port number. If not specified, the default port is used."
+  }
+};