Reorder components to get headers install correctly

Add RawTime typedef
Move application creation inside the toplevel try-catch

diff --git a/Build b/Build
index b7d5d5b717a2155036d4301e27a8a01b41effaac..03dc8d22c3625eef39df51cc42ba98003c4203c9 100644 (file)
--- a/Build
+++ b/Build
@@ -11,14 +11,6 @@ package "mspcore"
 
        feature "exception_backtrace" "Generate a backtrace when an exception is thrown.";
 
 
        feature "exception_backtrace" "Generate a backtrace when an exception is thrown.";
 

-       library "mspcore"
-       {
-               source "source/core";
-               source "source/debug";
-               source "source/time";
-               install true;
-       };
-

        headers "core"
        {
                source "source/core";
        headers "core"
        {
                source "source/core";


@@ -36,4 +28,12 @@ package "mspcore"
                source "source/debug";
                install_headers "msp/debug";
        };
                source "source/debug";
                install_headers "msp/debug";
        };

+
+       library "mspcore"
+       {
+               source "source/core";
+               source "source/debug";
+               source "source/time";
+               install true;
+       };

 };
 };

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 0ef3443e8eac4fab7173b15df42c9cd1360b4e88..47c176bd8a882a6869df467e7330f2274bfcc5e4 100644 (file)
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -40,16 +40,16 @@ int Application::run(int argc, char **argv)
 
        try
        {
 
        try
        {

-               app_=reg_app_->create_app(argc, argv);
-       }
-       catch(const UsageError &e)
-       {
-               reg_app_->usage(e.what(), argv[0], e.get_brief());
-               return 1;
-       }
+               try
+               {
+                       app_=reg_app_->create_app(argc, argv);
+               }
+               catch(const UsageError &e)
+               {
+                       reg_app_->usage(e.what(), argv[0], e.get_brief());
+                       return 1;
+               }

 
 

-       try
-       {

                int result=app_->main();
                delete app_;
                return result;
                int result=app_->main();
                delete app_;
                return result;

diff --git a/source/time/timedelta.h b/source/time/timedelta.h
index 6ebfcd86afc8b5c042f64b998623251d470aa628..97c8cac03adf5020fb8e168d11d89c37fb653997 100644 (file)
--- a/source/time/timedelta.h
+++ b/source/time/timedelta.h
@@ -9,6 +9,7 @@ Distributed under the LGPL
 #include <stdint.h>
 #include <time.h>
 #include <ostream>
 #include <stdint.h>
 #include <time.h>
 #include <ostream>

+#include "types.h"

 
 namespace Msp {
 namespace Time {
 
 namespace Msp {
 namespace Time {


@@ -29,13 +30,13 @@ public:
        serialization together with the raw() function.  For creating TimeDeltas
        with a specific length, see units.h.
        */
        serialization together with the raw() function.  For creating TimeDeltas
        with a specific length, see units.h.
        */

-       explicit TimeDelta(int64_t u): usec(u) { }
+       explicit TimeDelta(RawTime u): usec(u) { }

 
        /**
        Returns the raw number stored inside the TimeDelta.  This should only be used
        for serialization and the result should not be interpreted in any way.
        */
 
        /**
        Returns the raw number stored inside the TimeDelta.  This should only be used
        for serialization and the result should not be interpreted in any way.
        */

-       int64_t raw() const { return usec; }
+       RawTime raw() const { return usec; }

 
 #ifndef WIN32
        /**
 
 #ifndef WIN32
        /**


@@ -71,7 +72,7 @@ public:
 
        operator bool() const                          { return usec; }
 private:
 
        operator bool() const                          { return usec; }
 private:

-       int64_t usec;
+       RawTime usec;

 };
 
 template<typename T>
 };
 
 template<typename T>

diff --git a/source/time/timestamp.h b/source/time/timestamp.h
index 1e1b275ab97a799cf8450e7c99ecb6472d37b1ed..44387a216b46711a8f73280f54122b9e72990137 100644 (file)
--- a/source/time/timestamp.h
+++ b/source/time/timestamp.h
@@ -8,6 +8,7 @@ Distributed under the LGPL
 
 #include <stdint.h>
 #include "timedelta.h"
 
 #include <stdint.h>
 #include "timedelta.h"

+#include "types.h"

 
 namespace Msp {
 namespace Time {
 
 namespace Msp {
 namespace Time {


@@ -31,13 +32,13 @@ public:
        Constructs a TimeStamp from a plain number.  The purpose of this is to allow
        serialization together with the raw() function.
        */
        Constructs a TimeStamp from a plain number.  The purpose of this is to allow
        serialization together with the raw() function.
        */

-       explicit TimeStamp(int64_t u): usec(u) { }
+       explicit TimeStamp(RawTime u): usec(u) { }

 
        /**
        Returns the raw number stored inside the TimeStamp.  This value should be
        considered opaque and only be used for serialization.
        */
 
        /**
        Returns the raw number stored inside the TimeStamp.  This value should be
        considered opaque and only be used for serialization.
        */

-       int64_t   raw() const { return usec; }
+       RawTime raw() const { return usec; }

 
        TimeStamp operator+(const TimeDelta &t) const  { return TimeStamp(usec+t.raw()); }
        TimeStamp &operator+=(const TimeDelta &t)      { usec+=t.raw(); return *this; }
 
        TimeStamp operator+(const TimeDelta &t) const  { return TimeStamp(usec+t.raw()); }
        TimeStamp &operator+=(const TimeDelta &t)      { usec+=t.raw(); return *this; }


@@ -54,7 +55,7 @@ public:
 
        static TimeStamp from_unixtime(time_t t) { return TimeStamp(t*1000000LL); }
 private:
 
        static TimeStamp from_unixtime(time_t t) { return TimeStamp(t*1000000LL); }
 private:

-       int64_t usec;
+       RawTime usec;

 };
 
 } // namespace Time
 };
 
 } // namespace Time