c++03 vs c++11 enum namespacing

Change-Id: I91be0e7d2b013221b1d47a5cd1e4e75eb16c2b67
(cherry picked from commit e990e4d145f16c0c7e4e9e12c4882ddde63a3d5a)