[mathicgb] 130/393: Changes to make code compile on GCC 4.6.3.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch upstream
in repository mathicgb.

commit 6f6017e61630203fd9f022d455f88cf0ad240cd6
Author: Sharwan Kumar Tiwari <stiwari at mumin.mathematik.uni-kl.de>
Date:   Thu Dec 13 19:53:08 2012 +0100

    Changes to make code compile on GCC 4.6.3.
---
 src/mathicgb/LogDomain.cpp | 1 +
 src/mathicgb/LogDomain.hpp | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mathicgb/LogDomain.cpp b/src/mathicgb/LogDomain.cpp
index fcf6007..0c06a9d 100755
--- a/src/mathicgb/LogDomain.cpp
+++ b/src/mathicgb/LogDomain.cpp
@@ -87,3 +87,4 @@ void LogDomain<true>::Timer::start() {
   mTimerRunning = true;
   mRealTicks = tbb::tick_count::now();
 }
+
diff --git a/src/mathicgb/LogDomain.hpp b/src/mathicgb/LogDomain.hpp
index 19ff02c..9f59155 100755
--- a/src/mathicgb/LogDomain.hpp
+++ b/src/mathicgb/LogDomain.hpp
@@ -147,7 +147,7 @@ namespace LogDomainInternal {
   template<class L>
   struct LambdaRunner {L& log;};
   template<class L>
-  LambdaRunner<L> lambdaRunner(L& log) {return LambdaRunner{log};}
+  LambdaRunner<L> lambdaRunner(L& log) {return LambdaRunner<L>{log};}
   template<class L, class T>
   void operator+(LambdaRunner<L> runner, T& lambda) {lambda(runner.log);}
 }
@@ -186,7 +186,7 @@ namespace LogDomainInternal {
 ///
 /// Example:
 ///   auto timer = MATHICGB_LOGGER(MyDomain).timer();
-#define MATHICGB_LOGGER(DOMAIN) ::logs::##DOMAIN
+#define MATHICGB_LOGGER(DOMAIN) ::logs::DOMAIN
 
 /// This expression yields the type of the indicated logger.
 ///
@@ -228,7 +228,8 @@ namespace LogDomainInternal {
 /// Example:
 ///   MATHICGB_LOG_SCOPE_TIME(MyDomain) << "Starting timed task";
 #define MATHICGB_LOG_TIME(DOMAIN) \
-  auto MATHICGB_timer##DOMAIN##_##__LINE__##(MATHICGB_LOGGER(DOMAIN).timer()); \
+  auto MATHICGB_timer##DOMAIN##_##__LINE__(MATHICGB_LOGGER(DOMAIN).timer()); \
   MATHICGB_LOG(DOMAIN)
 
 #endif
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathicgb.git