libetherpix

@@ -270,7 +270,7 @@ static int readDXF(std::string const &strDxfFileName,

   std::map<unsigned int, Layer>::const_iterator itDistri;

   for (itDistri = gLayerDistributors.begin();

        itDistri != gLayerDistributors.end(); ++itDistri)

-    std::cout << "    " << itDistri->first << ": "

+    std::cout << "    0x" << std::hex << itDistri->first << std::dec << ": "

               << itDistri->second.mObjects.size() << std::endl;

   return SUCCESS;

@@ -374,7 +374,8 @@ static int createDistri(Distri &distri, const Layer *pLayer,

   // must have exactly one object

   if (pLayer->mObjects.size() != 1) {

     std::cerr << "layer of distributor 0x" << std::hex << distri.getNo()

-              << "contains no object or multiple objects" << std::endl;

+              << std::dec << " contains no object or multiple objects"

+              << std::endl;

     return ERR_PROC;

   }

   const Object *pObjDistri = pLayer->mObjects[0];

@@ -383,7 +384,7 @@ static int createDistri(Distri &distri, const Layer *pLayer,

   std::vector<Layer::Intersection> intersectsNet;

   gLayerNetwork.getIntersections(pObjDistri, intersectsNet);

   if (intersectsNet.size() != 1) {

-    std::cerr << "distributor 0x" << std::hex << distri.getNo()

+    std::cerr << "distributor 0x" << std::hex << distri.getNo() << std::dec

               << "has no network connection or multiple network connections"

               << std::endl;

     return ERR_PROC;

@@ -613,7 +614,8 @@ int main(int argc, char *argv[])

           std::cerr << "error: missing argument for \"-s\"" << std::endl;

         }

       } else {

-        std::cerr << "error: unknown option \"" << argv[argi] << "\", call without arguments for usage" << std::endl;

+        std::cerr << "error: unknown option \"" << argv[argi]

+                  << "\", call without arguments for usage" << std::endl;

         arg_err = true;

       }

     } // for argi