Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 030f5360 authored by Dan Albert's avatar Dan Albert
Browse files

Stop using namespace std. 

The pattern of #include and using namespace std here fails to build
with GCC. At first glance it's a GCC bug rather than libc++ doing
something wrong. Regardless, it can be worked around by just
specifying std:: where appropriate.

Bug: 19606303
Change-Id: I5652682eae7ca7559cf2a9307909859013440781
parent 56fde9e7

tools/aapt/Images.cpp

+3 −2
Original line number Diff line number Diff line
@@ -481,7 +481,8 @@ static void get_outline(image_info* image) 


    // assuming the image is a round rect, compute the radius by marching

    // diagonally from the top left corner towards the center

    image->outlineAlpha = max(max_alpha_over_row(image->rows[innerMidY], innerStartX, innerEndX),

    image->outlineAlpha = std::max(

        max_alpha_over_row(image->rows[innerMidY], innerStartX, innerEndX),

        max_alpha_over_col(image->rows, innerMidX, innerStartY, innerStartY));



    int diagonalInset = 0;

tools/aapt/ResourceTable.cpp

+11 −17
Original line number Diff line number Diff line
@@ -1802,7 +1802,7 @@ status_t ResourceTable::addIncludedResources(Bundle* bundle, const sp<AaptAssets 
        }



        const ResTable& featureTable = featureAssetManager.getResources(false);

        mTypeIdOffset = max(mTypeIdOffset,

        mTypeIdOffset = std::max(mTypeIdOffset,

                findLargestTypeIdForPackage(featureTable, mAssetsPackage)); 

    }
@@ -2667,20 +2667,16 @@ ResourceTable::validateLocalizations(void) 
    const String8 defaultLocale;



    // For all strings...

    for (map<String16, map<String8, SourcePos> >::iterator nameIter = mLocalizations.begin();

         nameIter != mLocalizations.end();

         nameIter++) {

        const map<String8, SourcePos>& configSrcMap = nameIter->second;

    for (const auto& nameIter : mLocalizations) {

        const std::map<String8, SourcePos>& configSrcMap = nameIter.second;



        // Look for strings with no default localization

        if (configSrcMap.count(defaultLocale) == 0) {

            SourcePos().warning("string '%s' has no default translation.",

                    String8(nameIter->first).string());

                    String8(nameIter.first).string());

            if (mBundle->getVerbose()) {

                for (map<String8, SourcePos>::const_iterator locales = configSrcMap.begin();

                    locales != configSrcMap.end();

                    locales++) {

                    locales->second.printf("locale %s found", locales->first.string());

                for (const auto& locale : configSrcMap) {

                    locale.second.printf("locale %s found", locale.first.string());

                }

            }

            // !!! TODO: throw an error here in some circumstances
@@ -2692,7 +2688,7 @@ ResourceTable::validateLocalizations(void) 
            const char* start = allConfigs;

            const char* comma;



            set<String8> missingConfigs;

            std::set<String8> missingConfigs;

            AaptLocaleValue locale;

            do {

                String8 config;
@@ -2726,13 +2722,11 @@ ResourceTable::validateLocalizations(void) 


            if (!missingConfigs.empty()) {

                String8 configStr;

                for (set<String8>::iterator iter = missingConfigs.begin();

                     iter != missingConfigs.end();

                     iter++) {

                    configStr.appendFormat(" %s", iter->string());

                for (const auto& iter : missingConfigs) {

                    configStr.appendFormat(" %s", iter.string());

                }

                SourcePos().warning("string '%s' is missing %u required localizations:%s",

                        String8(nameIter->first).string(),

                        String8(nameIter.first).string(),

                        (unsigned int)missingConfigs.size(),

                        configStr.string());

            }

tools/aapt/ResourceTable.h

+5 −7
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
#include <queue>

#include <set>



using namespace std;



class XMLNode;

class ResourceTable;
@@ -115,7 +113,7 @@ public: 
     * and would mess up iteration order for the existing

     * resources.

     */

    queue<CompileResourceWorkItem>& getWorkQueue() {

    std::queue<CompileResourceWorkItem>& getWorkQueue() {

        return mWorkQueue;

    }
@@ -579,8 +577,8 @@ private: 
    Bundle* mBundle;



    // key = string resource name, value = set of locales in which that name is defined

    map<String16, map<String8, SourcePos> > mLocalizations;

    queue<CompileResourceWorkItem> mWorkQueue;

    std::map<String16, std::map<String8, SourcePos>> mLocalizations;

    std::queue<CompileResourceWorkItem> mWorkQueue;

};



#endif