Changeset 170
- Timestamp:
- 07/25/08 12:17:23 (5 months ago)
- Files:
-
- trunk/dba/bakefile/dba.bkl (modified) (1 diff)
- trunk/dba/dba/xmlutils.cpp (modified) (3 diffs)
- trunk/wxdba/wxdba.bkl (modified) (3 diffs)
- trunk/wxdba/wxdba/csvarchive.cpp (modified) (2 diffs)
- trunk/wxdba/wxdba/csvistream.cpp (modified) (2 diffs)
- trunk/wxdba/wxdba/csvostream.cpp (modified) (2 diffs)
- trunk/wxdba/wxdba/exception.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/dba/bakefile/dba.bkl
r169 r170 126 126 <dll-link>dbaxml</dll-link> 127 127 </template> 128 128 <template id="dbatest-lib-static" template="dba-lib-static"> 129 </template> 130 <template id="dbatest-exe-static" template="dba-exe-static"> 131 <static-link>dbatest</static-link> 132 </template> 129 133 </if> 130 134 </makefile> trunk/dba/dba/xmlutils.cpp
r154 r170 18 18 char* 19 19 XMLUtils::getNsFromName(const char* pName) { 20 c har* nspos = strchr(pName,':');20 const char* nspos = strchr(pName,':'); 21 21 if (nspos == NULL) 22 22 return NULL; … … 30 30 char* 31 31 XMLUtils::getNameWithoutNs(const char* pName) { 32 c har* nspos = strchr(pName,':');32 const char* nspos = strchr(pName,':'); 33 33 if (nspos == NULL) 34 34 return strdup(pName); … … 45 45 void 46 46 XMLUtils::splitName(const char* pName, char* pRetData[1]) { 47 c har* nspos = strchr(pName,':');47 const char* nspos = strchr(pName,':'); 48 48 if (nspos == NULL) { 49 49 pRetData[1] = strdup(pName); trunk/wxdba/wxdba.bkl
r169 r170 160 160 <set var="MSVC6PRJ_MERGED_TARGETS" append="1">libwxdba_gui=libwxdbagui_static+libwxdbagui_dynamic</set> 161 161 162 <set var="CSVLIB_STATIC">163 <if cond="CSV==1">dbacsv$(LIBDEBUGSUFFIX)</if>164 </set>165 <set var="XMLLIB_STATIC">166 <if cond="XML==1">dbaxml$(LIBDEBUGSUFFIX)</if>167 </set>168 169 162 <!-- 170 163 cppunit test … … 183 176 test/xmltestcase.cpp 184 177 </sources> 185 <sys-lib>$(CSVLIB_STATIC)</sys-lib> 186 <sys-lib>$(XMLLIB_STATIC)</sys-lib> 187 </template> 188 189 <exe id="wxdba_test_static" template_append="testbase" cond="SHARED=='0' and USE_GUI=='1' and TESTS=='1'"> 178 </template> 179 180 <exe id="wxdba_test_static" template_append="testbase,dba-csv-exe-static,dba-xml-exe-static" cond="SHARED=='0' and USE_GUI=='1' and TESTS=='1'"> 190 181 <nameexe>wxdba_test_static</nameexe> 191 182 <library>libwxdbabase_static</library> … … 193 184 </exe> 194 185 195 <exe id="wxdba_test_dynamic" template_append="testbase " cond="SHARED=='1' and USE_GUI=='1' and TESTS=='1'">186 <exe id="wxdba_test_dynamic" template_append="testbase,dba-csv-exe-static,dba-xml-exe-static" cond="SHARED=='1' and USE_GUI=='1' and TESTS=='1'"> 196 187 <nameexe>wxdba_test_dynamic</nameexe> 197 188 <library>libwxdbabase_dynamic</library> trunk/wxdba/wxdba/csvarchive.cpp
r20 r170 7 7 // 8 8 // 9 #ifdef USE_CSV 10 9 11 #include "csvarchive.h" 10 12 #include "string_filter.h" … … 171 173 } 172 174 175 } //namespace 173 176 174 } 177 #endif 178 179 trunk/wxdba/wxdba/csvistream.cpp
r20 r170 7 7 // 8 8 // 9 #ifdef USE_CSV 10 9 11 #include "csvistream.h" 10 12 #include "wxutils.h" … … 95 97 } 96 98 99 } //namespace 97 100 98 } 101 #endif 102 trunk/wxdba/wxdba/csvostream.cpp
r21 r170 7 7 // 8 8 // 9 10 #ifdef USE_CSV 11 9 12 #include "csvostream.h" 10 13 #include "exception.h" … … 68 71 } 69 72 73 } //namespace 70 74 71 } 75 #endif 76 trunk/wxdba/wxdba/exception.cpp
r79 r170 48 48 throw StoreableFilterException(static_cast<const dba::StoreableFilterException&>(pEx)); 49 49 }; 50 #ifdef USE_CSV 50 51 if (typeid(pEx) == typeid(dba::CSVFileException)) { 51 52 throw CSVFileException(static_cast<const dba::CSVFileException&>(pEx)); … … 54 55 throw CSVParseException(static_cast<const dba::CSVParseException&>(pEx)); 55 56 }; 57 #endif 58 #ifdef USE_XML 59 if (typeid(pEx) == typeid(dba::XMLException)) { 60 throw XMLException(static_cast<const dba::XMLException&>(pEx)); 61 }; 62 #endif 56 63 throw Exception(pEx); 57 64 };
