[Bug 2193] Building timestruct tests with Clang 3.1 fails.

bk: 4fbeb7f55NjMmLOw9xnfsQCzUy0UPQ

diff --git a/ChangeLog b/ChangeLog
index 2cca6add6e89eed210b640193be4dfeef0351fd6..ed55b6c29a01c7fc867be0be6a9397007a3d7597 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2193] Building timestruct tests with Clang 3.1 fails.
 (4.2.7p276) 2012/05/15 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2179] Remove sntp/header.h.
 (4.2.7p275) 2012/04/28 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/tests/libntp/timestructs.cpp b/tests/libntp/timestructs.cpp
index ac7323dac7ba63ec8a279b270784fbb9ca9f3951..3cd0c543fb004c272679235b197d11cd4b587d18 100644 (file)
--- a/tests/libntp/timestructs.cpp
+++ b/tests/libntp/timestructs.cpp
@@ -13,6 +13,8 @@ extern "C" {
 #include "timespecops.h"
 }
 
+namespace timeStruct {
+
 std::ostream&
 operator << (std::ostream& os, const timeStruct::l_fp_wrap& val)
 {
@@ -49,8 +51,6 @@ operator << (std::ostream& os, const timeStruct::timespec_wrap& val)
        return os;
 }
 
-namespace timeStruct {
-
 // Implementation of the l_fp closeness predicate
 
 AssertFpClose::AssertFpClose(

diff --git a/tests/libntp/timestructs.h b/tests/libntp/timestructs.h
index 42be3725cffc98aec33af7f930e3460c0b9eaf80..7bc4ffdcf8caada13fc23288abf706a2c1dcef67 100644 (file)
--- a/tests/libntp/timestructs.h
+++ b/tests/libntp/timestructs.h
@@ -169,8 +169,6 @@ public:
 };
 
 
-} // namespace timeStruct
-
 // since googletest wants to string format items, we declare the
 // necessary operators. Since all adaptors have only public members
 // there is need for friend declarations anywhere.
@@ -182,4 +180,6 @@ extern std::ostream& operator << (std::ostream& os,
 extern std::ostream& operator << (std::ostream& os,
                                  const timeStruct::timespec_wrap& val);
 
+} // namespace timeStruct
+
 #endif // TIMESTRUCTS_H