Ignore:
Timestamp:
10/28/09 14:26:09 (10 years ago)
Author:
curtis
Message:

Cease blanket namespace usage, to avoid global name conflicts.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/native/bf-cpp/include/jace.h

    r5338 r5648  
    3131#include "jace/OptionList.h" 
    3232#include "jace/StaticVmLoader.h" 
    33 using namespace jace; 
     33//using namespace jace; 
    3434 
    3535#include "jace/proxy/types/JBoolean.h" 
     
    4242#include "jace/proxy/types/JShort.h" 
    4343#include "jace/proxy/types/JVoid.h" 
    44 using namespace jace::proxy::types; 
     44//using namespace jace::proxy::types; 
    4545 
    46 typedef JArray<JBoolean> BooleanArray; 
    47 typedef JArray<BooleanArray> BooleanArray2D; 
    48 typedef JArray<BooleanArray2D> BooleanArray3D; 
    49 typedef JArray<BooleanArray3D> BooleanArray4D; 
    50 typedef JArray<JByte> ByteArray; 
    51 typedef JArray<ByteArray> ByteArray2D; 
    52 typedef JArray<ByteArray2D> ByteArray3D; 
    53 typedef JArray<ByteArray3D> ByteArray4D; 
    54 typedef JArray<JChar> CharArray; 
    55 typedef JArray<CharArray> CharArray2D; 
    56 typedef JArray<CharArray2D> CharArray3D; 
    57 typedef JArray<CharArray3D> CharArray4D; 
    58 typedef JArray<JDouble> DoubleArray; 
    59 typedef JArray<DoubleArray> DoubleArray2D; 
    60 typedef JArray<DoubleArray2D> DoubleArray3D; 
    61 typedef JArray<DoubleArray3D> DoubleArray4D; 
    62 typedef JArray<JFloat> FloatArray; 
    63 typedef JArray<FloatArray> FloatArray2D; 
    64 typedef JArray<FloatArray2D> FloatArray3D; 
    65 typedef JArray<FloatArray3D> FloatArray4D; 
    66 typedef JArray<JInt> IntArray; 
    67 typedef JArray<IntArray> IntArray2D; 
    68 typedef JArray<IntArray2D> IntArray3D; 
    69 typedef JArray<IntArray3D> IntArray4D; 
    70 typedef JArray<JLong> LongArray; 
    71 typedef JArray<LongArray> LongArray2D; 
    72 typedef JArray<LongArray2D> LongArray3D; 
    73 typedef JArray<LongArray3D> LongArray4D; 
    74 typedef JArray<JShort> ShortArray; 
    75 typedef JArray<ShortArray> ShortArray2D; 
    76 typedef JArray<ShortArray2D> ShortArray3D; 
    77 typedef JArray<ShortArray3D> ShortArray4D; 
     46typedef jace::JArray<jace::proxy::types::JBoolean> BooleanArray; 
     47typedef jace::JArray<BooleanArray> BooleanArray2D; 
     48typedef jace::JArray<BooleanArray2D> BooleanArray3D; 
     49typedef jace::JArray<BooleanArray3D> BooleanArray4D; 
     50typedef jace::JArray<jace::proxy::types::JByte> ByteArray; 
     51typedef jace::JArray<ByteArray> ByteArray2D; 
     52typedef jace::JArray<ByteArray2D> ByteArray3D; 
     53typedef jace::JArray<ByteArray3D> ByteArray4D; 
     54typedef jace::JArray<jace::proxy::types::JChar> CharArray; 
     55typedef jace::JArray<CharArray> CharArray2D; 
     56typedef jace::JArray<CharArray2D> CharArray3D; 
     57typedef jace::JArray<CharArray3D> CharArray4D; 
     58typedef jace::JArray<jace::proxy::types::JDouble> DoubleArray; 
     59typedef jace::JArray<DoubleArray> DoubleArray2D; 
     60typedef jace::JArray<DoubleArray2D> DoubleArray3D; 
     61typedef jace::JArray<DoubleArray3D> DoubleArray4D; 
     62typedef jace::JArray<jace::proxy::types::JFloat> FloatArray; 
     63typedef jace::JArray<FloatArray> FloatArray2D; 
     64typedef jace::JArray<FloatArray2D> FloatArray3D; 
     65typedef jace::JArray<FloatArray3D> FloatArray4D; 
     66typedef jace::JArray<jace::proxy::types::JInt> IntArray; 
     67typedef jace::JArray<IntArray> IntArray2D; 
     68typedef jace::JArray<IntArray2D> IntArray3D; 
     69typedef jace::JArray<IntArray3D> IntArray4D; 
     70typedef jace::JArray<jace::proxy::types::JLong> LongArray; 
     71typedef jace::JArray<LongArray> LongArray2D; 
     72typedef jace::JArray<LongArray2D> LongArray3D; 
     73typedef jace::JArray<LongArray3D> LongArray4D; 
     74typedef jace::JArray<jace::proxy::types::JShort> ShortArray; 
     75typedef jace::JArray<ShortArray> ShortArray2D; 
     76typedef jace::JArray<ShortArray2D> ShortArray3D; 
     77typedef jace::JArray<ShortArray3D> ShortArray4D; 
    7878 
    7979#include "jace/proxy/java/lang/Boolean.h" 
     
    8686#include "jace/proxy/java/lang/Short.h" 
    8787#include "jace/proxy/java/lang/String.h" 
    88 using namespace jace::proxy::java::lang; 
     88//using namespace jace::proxy::java::lang; 
    8989 
    90 typedef JArray<String> StringArray; 
    91 typedef JArray<StringArray> StringArray2D; 
    92 typedef JArray<StringArray2D> StringArray3D; 
    93 typedef JArray<StringArray3D> StringArray4D; 
     90typedef jace::JArray<jace::proxy::java::lang::String> StringArray; 
     91typedef jace::JArray<StringArray> StringArray2D; 
     92typedef jace::JArray<StringArray2D> StringArray3D; 
     93typedef jace::JArray<StringArray3D> StringArray4D; 
    9494 
    9595#include "jace/proxy/java/io/IOException.h" 
    96 using namespace jace::proxy::java::io; 
     96//using namespace jace::proxy::java::io; 
    9797 
    9898#include "jace/proxy/java/util/Hashtable.h" 
    99 using namespace jace::proxy::java::util; 
     99//using namespace jace::proxy::java::util; 
    100100 
    101101#endif 
Note: See TracChangeset for help on using the changeset viewer.