Changeset 6469

Show
Ignore:
Timestamp:
02/15/08 14:03:59 (5 years ago)
Author:
bhilburn
Message:

Moving generated code to use DEBUG macros.

Location:
tools/WaveDev/trunk/WaveDev/wavedev/generate/templates
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • tools/WaveDev/trunk/WaveDev/wavedev/generate/templates/basic_ports/genStructure.py

    r6462 r6469  
    947947    #make sure there are properties first 
    948948     
    949     ts = " "*4 + 'std::cout << "props length : " << props.length() << std::endl;\n\n' 
     949    ts = " "*4 + 'DEBUG(3, ' + comp.name + ', "props length : " << props.length());\n\n' 
    950950    ts = ts + " "*4 + "for (unsigned int i = 0; i <props.length(); i++)\n" 
    951951    ts = ts + " "*4 + "{\n"; output.write(ts) 
    952     ts = " "*8 + 'std::cout << "Property id : " << props[i].id << std::endl;\n\n' 
     952    ts = " "*8 + 'DEBUG(3, ' + comp.name + ', "Property id : " << props[i].id);\n\n' 
    953953    output.write(ts) 
    954954         

  • tools/WaveDev/trunk/WaveDev/wavedev/generate/templates/basic_ports/sampleMain.cpp

    r5732 r6469  
    11#include <iostream> 
    22#include "ossie/ossieSupport.h" 
     3#include "ossie/debug.h" 
    34 
    45#include "__IncludeFile__.h" 
    56 
    6  
    77int main(int argc, char* argv[]) 
    8  
    98{ 
    109    ossieSupport::ORB *orb = new ossieSupport::ORB; 
    … …  
    1312 
    1413    if (argc != 3) { 
    15         std::cout << argv[0] << " <id> <usage name> " << std::endl; 
    16         exit (-1); 
     14            std::cout << argv[0] << " <id> <usage name> " << std::endl; 
     15            exit (-1); 
    1716    } 
    1817 
    … …  
    2019    char *label = argv[2]; 
    2120 
    22     std::cout << "Identifier - " << uuid << "  Label - " << label << std::endl; 
     21    DEBUG(3, __ComponentName__, "Identifier : " << uuid); 
     22    DEBUG(3, __ComponentName__, "Label : " << label); 
    2323 
    2424    __Class_name__* __CLASS_VAR___servant; 

  • tools/WaveDev/trunk/WaveDev/wavedev/generate/templates/custom_ports/sampleMain.cpp

    r5731 r6469  
    11#include "ossie/ossieSupport.h" 
     2#include "ossie/debug.h" 
    23 
    34#include "__IncludeFile__.h" 
    45 
    5  
    6  
    76int main(int argc, char* argv[]) 
    8  
    97{ 
    108    ossieSupport::ORB *orb = new ossieSupport::ORB; 
    … …  
    1311 
    1412    if (argc != 3) { 
    15         std::cout << argv[0] << " <id> <usage name> " << std::endl; 
    16         exit (-1); 
     13            std::cout << argv[0] << " <id> <usage name> " << std::endl; 
     14            exit (-1); 
    1715    } 
    1816 
    … …  
    2018    char *label = argv[2]; 
    2119 
    22     std::cout << "Identifier - " << uuid << "  Label - " << label << std::endl; 
     20    DEBUG(3, __ComponentName__, "Identifier : " << uuid); 
     21    DEBUG(3, __ComponentName__, "Label : " << label); 
    2322 
    2423    __Class_name__* __CLASS_VAR___servant;