diff options
author | John Reck <jreck@google.com> | 2015-04-16 15:27:12 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2015-04-27 17:23:29 +0000 |
commit | 8920e81717c6e51b92ff8f4479a1f959af260556 (patch) | |
tree | 3b2e119d4c5dbd14500898fabefa8467897d8608 /sample | |
parent | 68ae337aa05f598af18b09fe4125146d4d67db83 (diff) | |
download | android_frameworks_minikin-8920e81717c6e51b92ff8f4479a1f959af260556.tar.gz android_frameworks_minikin-8920e81717c6e51b92ff8f4479a1f959af260556.tar.bz2 android_frameworks_minikin-8920e81717c6e51b92ff8f4479a1f959af260556.zip |
Move Bitmap to a different namespace
namespace naming collision. Move minikin's
Bitmap out of android:: and into minikin::
Change-Id: I5ae3925f81b848dc79576429ab55243b96f7fed2
Diffstat (limited to 'sample')
-rw-r--r-- | sample/example.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sample/example.cpp b/sample/example.cpp index 487357a..3fbfa79 100644 --- a/sample/example.cpp +++ b/sample/example.cpp @@ -28,8 +28,8 @@ #include <minikin/Layout.h> using std::vector; - -namespace android { +using namespace android; +using namespace minikin; FT_Library library; // TODO: this should not be a global @@ -99,8 +99,6 @@ int runMinikinTest() { return 0; } -} - int main(int argc, const char** argv) { - return android::runMinikinTest(); + return runMinikinTest(); } |