[android] #352 - correct namespaces, renaming conversion to feature e…

…quivalent, removed duplicate src file names
mapbox · Jul 26, 2016 · da58545 · da58545
1 parent 32e306c
commit da58545
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...ndroid/src/feature/android_conversion.hpp → ...m/android/src/feature/android_feature.hpp b/...ndroid/src/feature/android_conversion.hpp → ...m/android/src/feature/android_feature.hpp
@@ -3,15 +3,15 @@
 #include "value.hpp"
 
 #include <mbgl/platform/log.hpp>
-#include <mbgl/style/conversion.hpp>
+#include <mbgl/geometry/feature.hpp>
 #include <mbgl/util/feature.hpp>
 #include <mbgl/util/optional.hpp>
 
 #include <jni/jni.hpp>
 
 namespace mbgl {
-namespace style {
-namespace conversion {
+namespace geometry {
+namespace feature {
 
 
 //XXX
@@ -90,6 +90,6 @@ inline optional<Value> toValue(const mbgl::android::Value& value) {
     }
 }
 
-} // namespace conversion
-} // namespace style
+} // namespace feature
+} // namespace geometry
 } // namespace mbgl
diff --git a/platform/android/src/feature/feature.cpp b/platform/android/src/feature/feature.cpp
diff --git a/platform/android/src/feature/feature.hpp b/platform/android/src/feature/feature.hpp