commit cdb7096fecee73f8716135f53f7fd29df796207b
author Chia-I Wu <olv@google.com> Fri May 13 14:07:36 2016 +0800
committer Tobin Ehlis <tobine@google.com> Tue May 24 06:29:13 2016 -0600
tree ea208e4d15f8a9784f546a82b3696d616c01b6e6
parent 40b8bab26cd0fb2df6d997e2a34bb61b448bfa98

vk-layer-generate.py: put layer functions into a namespace

Move everything into namespace object_tracker and unique_objects
respectively.  I had to add some wrappers to make everything work.

layers/object_tracker.h

diff --git a/layers/object_tracker.h b/layers/object_tracker.h
index 30a1f29..623600a 100644
--- a/layers/object_tracker.h
+++ b/layers/object_tracker.h
@@ -28,6 +28,8 @@
 #include "vk_layer_table.h"
 #include "vk_layer_utils.h"
 
+namespace object_tracker {
+
 // Object Tracker ERROR codes
 enum OBJECT_TRACK_ERROR {
     OBJTRACK_NONE,                     // Used for INFO & other non-error messages
@@ -107,8 +109,6 @@
 static uint64_t numTotalObjs = 0;
 std::vector<VkQueueFamilyProperties> queue_family_properties;
 
-template layer_data *get_my_data_ptr<layer_data>(void *data_key, std::unordered_map<void *, layer_data *> &data_map);
-
 //
 // Internal Object Tracker Functions
 //
@@ -1059,3 +1059,5 @@
     lock.unlock();
     return result;
 }
+
+} // namespace object_tracker

layers/unique_objects.h

diff --git a/layers/unique_objects.h b/layers/unique_objects.h
index 6c2c2e3..0da90a1 100644
--- a/layers/unique_objects.h
+++ b/layers/unique_objects.h
@@ -39,6 +39,8 @@
 #include "vk_safe_struct.h"
 #include "vk_layer_utils.h"
 
+namespace unique_objects {
+
 // All increments must be guarded by global_lock
 static uint64_t global_unique_id = 1;
 
@@ -393,3 +395,5 @@
     }
     return result;
 }
+
+} // namespace unique_objects