From b250ead8e7237813e9bbd91cb3a9382592bf4abc Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 12 Feb 2016 16:52:43 +0200
Subject: <types>/<utility> scheme cleanup

---
 brep/types | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 11 deletions(-)

(limited to 'brep/types')

diff --git a/brep/types b/brep/types
index 64d3733..9b5f423 100644
--- a/brep/types
+++ b/brep/types
@@ -7,9 +7,17 @@
 
 #include <vector>
 #include <string>
-#include <memory>   // unique_ptr, weak_ptr, shared_ptr
-#include <cstddef>  // size_t
-#include <cstdint>  // uint{8,16,32,64}_t
+#include <memory>        // unique_ptr, shared_ptr
+#include <utility>       // pair
+#include <cstddef>       // size_t, nullptr_t
+#include <cstdint>       // uint{8,16,32,64}_t
+#include <istream>
+#include <ostream>
+#include <functional>    // function, reference_wrapper
+
+#include <exception>     // exception
+#include <stdexcept>     // logic_error, invalid_argument, runtime_error
+#include <system_error>
 
 #include <odb/lazy-ptr.hxx>
 
@@ -20,28 +28,48 @@
 
 namespace brep
 {
-  // Commonly-used types
+    // Commonly-used types.
   //
   using std::uint8_t;
   using std::uint16_t;
   using std::uint32_t;
   using std::uint64_t;
+
   using std::size_t;
-  using std::vector;
+  using std::nullptr_t;
+
+  using std::pair;
   using std::string;
+  using std::function;
+  using std::reference_wrapper;
+
+  using std::unique_ptr;
+  using std::shared_ptr;
+  using std::weak_ptr;
+
+  using std::vector;
 
   using strings = vector<string>;
+  using cstrings = vector<const char*>;
 
-  using butl::optional;
-  using butl::nullopt;
+  using std::istream;
+  using std::ostream;
 
-  // Smart pointers
+  // Exceptions. While <exception> is included, there is no using for
+  // std::exception -- use qualified.
   //
-  using std::unique_ptr;
+  using std::logic_error;
+  using std::invalid_argument;
+  using std::runtime_error;
+  using std::system_error;
 
-  using std::shared_ptr;
-  using std::weak_ptr;
+  // <butl/optional>
+  //
+  using butl::optional;
+  using butl::nullopt;
 
+  // ODB smart pointers.
+  //
   using odb::lazy_shared_ptr;
   using odb::lazy_weak_ptr;
 
@@ -49,8 +77,12 @@ namespace brep
   //
   using butl::path;
   using butl::dir_path;
+  using butl::basic_path;
   using butl::invalid_path;
 
+  using paths = std::vector<path>;
+  using dir_paths = std::vector<dir_path>;
+
   // <butl/timestamp>
   //
   using butl::timestamp;
-- 
cgit v1.1