diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ingen/Clock.hpp | 4 | ||||
| -rw-r--r-- | include/ingen/Configuration.hpp | 2 | ||||
| -rw-r--r-- | include/ingen/Log.hpp | 2 | ||||
| -rw-r--r-- | include/ingen/Serialiser.hpp | 4 | ||||
| -rw-r--r-- | include/ingen/URIMap.hpp | 2 | ||||
| -rw-r--r-- | include/ingen/client/GraphModel.hpp | 1 | ||||
| -rw-r--r-- | include/ingen/client/ObjectModel.hpp | 2 | ||||
| -rw-r--r-- | include/ingen/client/PluginUI.hpp | 2 | ||||
| -rw-r--r-- | include/ingen/client/PortModel.hpp | 2 |
9 files changed, 7 insertions, 14 deletions
diff --git a/include/ingen/Clock.hpp b/include/ingen/Clock.hpp index 6a966701..9e20a031 100644 --- a/include/ingen/Clock.hpp +++ b/include/ingen/Clock.hpp @@ -48,8 +48,8 @@ private: uint64_t now_microseconds() const { struct timespec time{}; clock_gettime(_clock, &time); - return static_cast<uint64_t>(time.tv_sec) * 1000000U + - static_cast<uint64_t>(time.tv_nsec) / 1000U; + return (static_cast<uint64_t>(time.tv_sec) * 1000000U) + + (static_cast<uint64_t>(time.tv_nsec) / 1000U); } private: diff --git a/include/ingen/Configuration.hpp b/include/ingen/Configuration.hpp index 4a7168b1..5c4d2841 100644 --- a/include/ingen/Configuration.hpp +++ b/include/ingen/Configuration.hpp @@ -82,7 +82,7 @@ public: /** Parse a command line. * - * @throw OptionError + * @throw OptionError An option is unknown or an option value is invalid. */ void parse(int argc, char **argv); diff --git a/include/ingen/Log.hpp b/include/ingen/Log.hpp index 173127a1..afde276a 100644 --- a/include/ingen/Log.hpp +++ b/include/ingen/Log.hpp @@ -26,7 +26,6 @@ #include <cstdarg> #include <functional> -#include <memory> #include <string> #include <utility> @@ -34,7 +33,6 @@ namespace ingen { class Node; class URIs; -class World; class INGEN_API Log { diff --git a/include/ingen/Serialiser.hpp b/include/ingen/Serialiser.hpp index 72941866..6e9d6ad4 100644 --- a/include/ingen/Serialiser.hpp +++ b/include/ingen/Serialiser.hpp @@ -77,14 +77,14 @@ public: /** Serialize an object (graph, block, or port). * - * @throw std::logic_error + * @throw std::logic_error A serialization hasn't been started. */ virtual void serialise(const std::shared_ptr<const Node>& object, Property::Graph context = Property::Graph::DEFAULT); /** Serialize an arc. * - * @throw std::logic_error + * @throw std::logic_error A serialization hasn't been started. */ virtual void serialise_arc(const Sord::Node& parent, const std::shared_ptr<const Arc>& arc); diff --git a/include/ingen/URIMap.hpp b/include/ingen/URIMap.hpp index 2f90ec7f..fbb0523c 100644 --- a/include/ingen/URIMap.hpp +++ b/include/ingen/URIMap.hpp @@ -34,8 +34,6 @@ namespace ingen { class Log; -class Node; -class World; /** URI to integer map and implementation of LV2 URID extension. * @ingroup IngenShared diff --git a/include/ingen/client/GraphModel.hpp b/include/ingen/client/GraphModel.hpp index 08251663..837a28a5 100644 --- a/include/ingen/client/GraphModel.hpp +++ b/include/ingen/client/GraphModel.hpp @@ -36,7 +36,6 @@ class URIs; namespace client { class ArcModel; -class ObjectModel; class PortModel; /** Client's model of a graph. diff --git a/include/ingen/client/ObjectModel.hpp b/include/ingen/client/ObjectModel.hpp index 01528e3d..f9f0e041 100644 --- a/include/ingen/client/ObjectModel.hpp +++ b/include/ingen/client/ObjectModel.hpp @@ -22,7 +22,6 @@ #define INGEN_CLIENT_OBJECTMODEL_HPP #include <ingen/Node.hpp> -#include <ingen/URI.hpp> #include <ingen/URIs.hpp> #include <ingen/client/signal.hpp> #include <ingen/ingen.h> @@ -34,6 +33,7 @@ namespace ingen { class Atom; +class URI; namespace client { diff --git a/include/ingen/client/PluginUI.hpp b/include/ingen/client/PluginUI.hpp index 036872d7..6ecaed89 100644 --- a/include/ingen/client/PluginUI.hpp +++ b/include/ingen/client/PluginUI.hpp @@ -61,7 +61,7 @@ public: /** Instantiate the UI. * - * If true is returned, instantiation was successfull and the widget can be + * If true is returned, instantiation was successful and the widget can be * obtained with get_widget(). Otherwise, instantiation failed, so there is * no widget and the UI can not be used. */ diff --git a/include/ingen/client/PortModel.hpp b/include/ingen/client/PortModel.hpp index ec1e325c..c87f2f03 100644 --- a/include/ingen/client/PortModel.hpp +++ b/include/ingen/client/PortModel.hpp @@ -18,7 +18,6 @@ #define INGEN_CLIENT_PORTMODEL_HPP #include <ingen/Node.hpp> -#include <ingen/URI.hpp> #include <ingen/URIs.hpp> #include <ingen/client/ObjectModel.hpp> #include <ingen/client/signal.hpp> @@ -26,7 +25,6 @@ #include <raul/Path.hpp> #include <cstdint> -#include <memory> #include <string> namespace ingen { |