commit fb37b11703cb95bef058b29715f879c5afd7b908
author Chih-hung Hsieh <chh@google.com> Thu Oct 16 20:48:46 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 16 20:48:47 2014 +0000
tree 67fe576e807acdf68db3747ef60533cb4415ff7c
parent 0de50bb3810cc5dd47b435d8ef2a5c7364b1d83f
parent ce2c4b317470ee8d66333f14fea27c0189197c50

Merge "Use standard initializers"

msm8960/libgralloc/alloc_controller.cpp

diff --git a/msm8960/libgralloc/alloc_controller.cpp b/msm8960/libgralloc/alloc_controller.cpp
index 16a908b..fc78cb6 100644
--- a/msm8960/libgralloc/alloc_controller.cpp
+++ b/msm8960/libgralloc/alloc_controller.cpp
@@ -48,7 +48,9 @@
 using namespace gralloc;
 using namespace qdutils;
 
+namespace android {
 ANDROID_SINGLETON_STATIC_INSTANCE(AdrenoMemInfo);
+}
 
 //Common functions
 static bool canFallback(int usage, bool triedSystem)

msm8960/libqdutils/comptype.cpp

diff --git a/msm8960/libqdutils/comptype.cpp b/msm8960/libqdutils/comptype.cpp
index a29158a..89e3b4c 100644
--- a/msm8960/libqdutils/comptype.cpp
+++ b/msm8960/libqdutils/comptype.cpp
@@ -30,4 +30,6 @@
 #include<comptype.h>
 
 //Instanticate the QCCompositionType Singleton
+namespace android {
 ANDROID_SINGLETON_STATIC_INSTANCE(qdutils::QCCompositionType);
+}

msm8960/libqdutils/mdp_version.cpp

diff --git a/msm8960/libqdutils/mdp_version.cpp b/msm8960/libqdutils/mdp_version.cpp
index cd21490..b3f5c8a 100644
--- a/msm8960/libqdutils/mdp_version.cpp
+++ b/msm8960/libqdutils/mdp_version.cpp
@@ -33,7 +33,10 @@
 #include <linux/msm_mdp.h>
 #include "mdp_version.h"
 
+namespace android {
 ANDROID_SINGLETON_STATIC_INSTANCE(qdutils::MDPVersion);
+}
+
 namespace qdutils {
 
 MDPVersion::MDPVersion()

msm8960/libqdutils/profiler.cpp

diff --git a/msm8960/libqdutils/profiler.cpp b/msm8960/libqdutils/profiler.cpp
index 3c04382..3f028ff 100644
--- a/msm8960/libqdutils/profiler.cpp
+++ b/msm8960/libqdutils/profiler.cpp
@@ -32,8 +32,9 @@
 
 #ifdef DEBUG_CALC_FPS
 
-
+namespace android {
 ANDROID_SINGLETON_STATIC_INSTANCE(qdutils::CalcFps) ;
+}
 
 namespace qdutils {