From: <nn...@us...> - 2008-02-16 19:26:17
|
Revision: 2585 http://tora.svn.sourceforge.net/tora/?rev=2585&view=rev Author: nneul Date: 2008-02-16 11:26:10 -0800 (Sat, 16 Feb 2008) Log Message: ----------- catch up to current OTL release Modified Paths: -------------- trunk/tora/src/otl/otlv4.h Modified: trunk/tora/src/otl/otlv4.h =================================================================== --- trunk/tora/src/otl/otlv4.h 2008-02-16 19:09:21 UTC (rev 2584) +++ trunk/tora/src/otl/otlv4.h 2008-02-16 19:26:10 UTC (rev 2585) @@ -1,6 +1,6 @@ // ============================================================== -// Oracle, ODBC and DB2/CLI Template Library, Version 4.0.159, -// Copyright (C) Sergei Kuchin, 1996,2007 +// ORACLE, ODBC and DB2/CLI Template Library, Version 4.0.162, +// Copyright (C) Sergei Kuchin, 1996,2008 // Author: Sergei Kuchin // This library is free software. Permission to use, copy, // modify and redistribute it for any purpose is hereby granted @@ -11,7 +11,7 @@ #ifndef __OTL_H__ #define __OTL_H__ -#define OTL_VERSION_NUMBER (0x04009FL) +#define OTL_VERSION_NUMBER (0x0400A2L) #if defined(_MSC_VER) #if (_MSC_VER >= 1400) @@ -76,6 +76,15 @@ // option, e.g.: -DOTL_ODBC, -DOTL_ORA7, -DOTL_ORA8, -DOTL_ORA8I, -DOTL_ODBC_UNIX // -DOTL_ODBC_MYSQL, -DOTL_DB2_CLI +// this becomes the default from version 4.0.162 and on. +#if !defined(OTL_UNCAUGHT_EXCEPTION_ON) +#define OTL_UNCAUGHT_EXCEPTION_ON +#endif + +#if defined(OTL_ORA11G) +#define OTL_ORA10G_R2 +#endif + #if defined(OTL_STREAM_LEGACY_BUFFER_SIZE_TYPE) typedef short int otl_stream_buffer_size_type; #else @@ -108,6 +117,10 @@ #include <timesten.h> #endif +#if defined(OTL_ODBC_ENTERPRISEDB) +#define OTL_ODBC_POSTGRESQL +#endif + #if defined(OTL_ODBC_POSTGRESQL) #define OTL_ODBC #endif @@ -567,7 +580,7 @@ if(OTL_TRACE_LEVEL & level){ \ char temp_connect_str2[2048]; \ OTL_STRCPY_S(temp_connect_str2,sizeof(temp_connect_str2),userid); \ - OTL_STRCPY_S(temp_connect_str2,sizeof(temp_connect_str2),"/"); \ + OTL_STRCAT_S(temp_connect_str2,sizeof(temp_connect_str2),"/"); \ size_t sz=strlen(passwd); \ for(size_t i=0;i<sz;++i) \ OTL_STRCAT_S(temp_connect_str2,sizeof(temp_connect_str2),"*"); \ @@ -1197,7 +1210,7 @@ const int otl_error_code_31=32032; #define otl_error_msg_31 \ -"SELECT otl_stream buffer size for TimesTen should be in [1..128] range" +"SELECT otl_stream buffer size for TimesTen should be in [0..128] range" const int otl_error_code_32=32033; #define otl_error_msg_32 \ @@ -1826,8 +1839,18 @@ const char* const_LONG_STRING="otl_long_string()"; const char* const_LOB_STREAM="otl_lob_stream*&"; const char* const_USER_DEFINED="User-defined type (object type, VARRAY, Nested Table)"; +#if defined(OTL_ORA_UNICODE)||defined(OTL_ORA_UTF8) + const char* const_NCHAR="NCHAR"; + const char* const_NCLOB="NCLOB"; +#endif switch(ftype){ +#if defined(OTL_ORA_UNICODE)||defined(OTL_ORA_UTF8) + case otl_var_nchar: + return const_NCHAR; + case otl_var_nclob: + return const_NCLOB; +#endif case otl_var_char: return const_CHAR; case otl_var_double: @@ -5274,13 +5297,10 @@ this->stm_label=new char[len]; OTL_STRCPY_S(this->stm_label,len,sqlstm_label); } -#if defined(OTL_ODBC_TIMESTEN) - array_size=1; - prefetch_array_size=arr_size; -#else - array_size=arr_size; - prefetch_array_size=0; -#endif + select_cursor_struct.set_arr_size + (arr_size, + array_size, + prefetch_array_size); select_cursor_struct.init(array_size); } @@ -5428,8 +5448,8 @@ #endif #if defined(__GNUC__) || defined(__SUNPRO_CC) || \ - (defined(_MSC_VER) && (_MSC_VER <= 1300)) || \ - defined(__HP_aCC) || defined(__BORLANDC__) + (defined(_MSC_VER) && (_MSC_VER <= 1300)) || \ + defined(__HP_aCC) || defined(__BORLANDC__) // Enable the kludge for compilers that do not support template // member functions at all, or have bugs: g++, Forte C++ (Solaris), // Visual C++ 6.0, Visual C++ 7.0, etc. @@ -11896,6 +11916,21 @@ OTL_SQLUSMALLINT* row_status; int row_status_arr_size; #endif + + void set_arr_size + (const int input_arr_size, + int& out_array_size, + int& out_prefetch_array_size) + { +#if defined(OTL_ODBC_TIMESTEN) + out_array_size=1; + out_prefetch_array_size=input_arr_size; +#else + out_array_size=input_arr_size; + out_prefetch_array_size=0; +#endif + } + int close_select(otl_cur& cur) { @@ -13500,7 +13535,7 @@ strncmp(tmp,"WITH",4)==0)&& !implicit_select){ #if defined(OTL_ODBC_TIMESTEN) - if(temp_arr_size>128||temp_arr_size<1){ + if(temp_arr_size>128||temp_arr_size<0){ const char* temp_stm_text=assign_stream_type(sqlstm,sqlstm_label); throw otl_exception (otl_error_msg_31, @@ -13523,7 +13558,7 @@ }else{ if(implicit_select){ #if defined(OTL_ODBC_TIMESTEN) - if(temp_arr_size>128||temp_arr_size<1){ + if(temp_arr_size>128||temp_arr_size<0){ const char* temp_stm_text=assign_stream_type(sqlstm,sqlstm_label); throw otl_exception (otl_error_msg_31, @@ -14232,7 +14267,11 @@ #endif OTL_STR_TO_BIGINT(temp_val,l); }else - (*io)->operator>>(l); +#if defined(OTL_NO_TMPL_MEMBER_FUNC_SUPPORT) + (*io)->operator>>(l); +#else + (*io)->operator>><OTL_BIGINT,otl_var_bigint>(l); +#endif } } #else @@ -14254,7 +14293,11 @@ (*ss)->operator>>(temp_val); OTL_STR_TO_BIGINT(temp_val,l); }else +#if defined(OTL_NO_TMPL_MEMBER_FUNC_SUPPORT) (*ss)->operator>>(l); +#else + (*ss)->operator>><OTL_BIGINT,otl_var_bigint>(l); +#endif } } #else @@ -14645,7 +14688,11 @@ OTL_BIGINT_TO_STR(n,temp_val); (*ss)->operator<<(temp_val); }else +#if defined(OTL_NO_TMPL_MEMBER_FUNC_SUPPORT) (*ss)->operator<<(n); +#else + (*ss)->operator<<<OTL_BIGINT,otl_var_bigint>(n); +#endif } } #else @@ -15569,7 +15616,6 @@ int sql_param_data_count; bool canceled; - otl_cur& operator=(const otl_cur& cur) { *rpc=*cur.rpc; @@ -15809,6 +15855,15 @@ int implicit_cursor; + void set_arr_size + (const int input_arr_size, + int& out_array_size, + int& out_prefetch_array_size) + { + out_array_size=input_arr_size; + out_prefetch_array_size=0; + } + void set_prefetch_size(const int /*aprefetch_array_size*/) { } @@ -19290,7 +19345,7 @@ const int extCLOB=inCLOB; const int extBLOB=inBLOB; -#if defined(OTL_ORA10G)||defined(OTL_ORA10G_R2) +#if (defined(OTL_ORA10G)||defined(OTL_ORA10G_R2))&&!defined(OTL_ORA_LEGACY_NUMERIC_TYPES) const int extBFloat=SQLT_BFLOAT; const int extBDouble=SQLT_BDOUBLE; #endif @@ -20712,7 +20767,6 @@ otl_cur0& /* cur */) { if(!lob_stream_flag)return 1; - if(alob_len==0)return 1; int rc; int byte_s_length=s.length; #if defined(OTL_UNICODE) @@ -20751,6 +20805,7 @@ if(rc!=OCI_SUCCESS) return 0; } + if(alob_len==0)return 1; rc=OCILobWrite (connect->svchp, connect->errhp, @@ -20953,7 +21008,7 @@ case inLongRaw: return extLongVarRaw; case inChar: return extCChar; #if defined(OTL_ORA10G)||defined(OTL_ORA10G_R2) -#if defined(OTL_ORA_NATIVE_TYPES) +#if defined(OTL_ORA_NATIVE_TYPES) && !defined(OTL_ORA_LEGACY_NUMERIC_TYPES) case inBFloat: return extBFloat; case inBDouble: return extBDouble; #else @@ -20988,7 +21043,8 @@ default: return maxsz+1; } -#if (defined(OTL_ORA10G)||defined(OTL_ORA10G_R2)) && defined(OTL_ORA_NATIVE_TYPES) +#if (defined(OTL_ORA10G)||defined(OTL_ORA10G_R2)) && defined(OTL_ORA_NATIVE_TYPES) \ + && !defined(OTL_ORA_LEGACY_NUMERIC_TYPES) case extBFloat: case extBDouble: return sizeof(double); @@ -21038,7 +21094,8 @@ desc.dbtype, max_long_size); switch(aftype){ -#if (defined(OTL_ORA10G)||defined(OTL_ORA10G_R2))&&defined(OTL_ORA_NATIVE_TYPES) +#if (defined(OTL_ORA10G)||defined(OTL_ORA10G_R2))&&defined(OTL_ORA_NATIVE_TYPES)\ + &&!defined(OTL_ORA_LEGACY_NUMERIC_TYPES) case extBFloat: case extBDouble: if(override.all_mask&otl_all_num2str){ @@ -21385,7 +21442,8 @@ switch(ftype){ case otl_var_char: return extCChar; -#if (defined(OTL_ORA10G)||defined(OTL_ORA10G_R2))&&defined(OTL_ORA_NATIVE_TYPES) +#if (defined(OTL_ORA10G)||defined(OTL_ORA10G_R2))&&defined(OTL_ORA_NATIVE_TYPES)\ + &&!defined(OTL_ORA_LEGACY_NUMERIC_TYPES) case otl_var_double: return extBDouble; case otl_var_float: @@ -21998,6 +22056,16 @@ int implicit_cursor; + + void set_arr_size + (const int input_arr_size, + int& out_array_size, + int& out_prefetch_array_size) + { + out_array_size=input_arr_size; + out_prefetch_array_size=0; + } + void set_prefetch_size(const int /*aprefetch_array_size*/) { } @@ -23694,6 +23762,11 @@ s.assign(temp_s+1,*temp_s); #endif +#if defined(OTL_DEFAULT_STRING_NULL_TO_VAL) + if((*this).is_null()) + s=OTL_RCAST(OTL_UNICODE_CHAR_TYPE*,OTL_DEFAULT_STRING_NULL_TO_VAL); +#endif + look_ahead(); } inc_next_ov(); @@ -23715,6 +23788,12 @@ OTL_RCAST(unsigned char*,sl[cur_col].val(cur_row)), sl[cur_col].get_len(cur_row) ); +#if defined(OTL_DEFAULT_STRING_NULL_TO_VAL) + if((*this).is_null()) + otl_strcpy(OTL_RCAST(unsigned char*,s), + OTL_RCAST(const unsigned char*,OTL_DEFAULT_STRING_NULL_TO_VAL) + ); +#endif look_ahead(); } inc_next_ov(); @@ -23734,6 +23813,12 @@ OTL_RCAST(unsigned char*,sl[cur_col].val(cur_row)), sl[cur_col].get_len(cur_row) ); +#if defined(OTL_DEFAULT_STRING_NULL_TO_VAL) + if((*this).is_null()) + otl_strcpy(OTL_RCAST(unsigned char*,s), + OTL_RCAST(const unsigned char*,OTL_DEFAULT_STRING_NULL_TO_VAL) + ); +#endif look_ahead(); } inc_next_ov(); @@ -29428,8 +29513,16 @@ #if defined(__BORLANDC__) || defined(_MSC_VER) return stricmp(s1,s2)<0; #else +#if defined(__STRICT_ANSI__) + while(otl_to_upper(*s1)==otl_to_upper(*s2)&&*s1){ + ++s1; + ++s2; + } + return *s1 < *s2; +#else return strcasecmp(s1,s2)<0; #endif +#endif } }; #endif @@ -29676,7 +29769,7 @@ check_pos(pos); check_type(pos,otl_var_char); unsigned char* curr_ptr=out_vars_arr_[pos-1]; - otl_strcpy(OTL_RCAST(char*,s),OTL_RCAST(const char*,curr_ptr)); + otl_strcpy(OTL_RCAST(unsigned char*,s),OTL_RCAST(const unsigned char*,curr_ptr)); } #if defined(OTL_STL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-04-11 04:48:27
|
Revision: 2693 http://tora.svn.sourceforge.net/tora/?rev=2693&view=rev Author: mrjohnson0 Date: 2008-04-10 21:48:33 -0700 (Thu, 10 Apr 2008) Log Message: ----------- update to version with 11g support Modified Paths: -------------- trunk/tora/src/otl/otlv4.h Modified: trunk/tora/src/otl/otlv4.h =================================================================== --- trunk/tora/src/otl/otlv4.h 2008-04-11 04:46:11 UTC (rev 2692) +++ trunk/tora/src/otl/otlv4.h 2008-04-11 04:48:33 UTC (rev 2693) @@ -1,5 +1,5 @@ // ============================================================== -// ORACLE, ODBC and DB2/CLI Template Library, Version 4.0.162, +// ORACLE, ODBC and DB2/CLI Template Library, Version 4.0.167, // Copyright (C) Sergei Kuchin, 1996,2008 // Author: Sergei Kuchin // This library is free software. Permission to use, copy, @@ -11,10 +11,11 @@ #ifndef __OTL_H__ #define __OTL_H__ -#define OTL_VERSION_NUMBER (0x0400A2L) +#define OTL_VERSION_NUMBER (0x0400A7L) #if defined(_MSC_VER) #if (_MSC_VER >= 1400) +#pragma warning (disable:4351) //#pragma warning (disable:4996) #define OTL_STRCAT_S(dest,dest_sz,src) strcat_s(dest,dest_sz,src) #define OTL_STRCPY_S(dest,dest_sz,src) strcpy_s(dest,dest_sz,src) @@ -71,16 +72,22 @@ // Oracle 10g Release 2: //#define OTL_ORA10G_R2 +// Uncomment the following line in order to include the OTL for +// Oracle 11g Release 1 +//#define OTL_ORA11G + // The macro definitions may be also turned on via C++ compiler command line // option, e.g.: -DOTL_ODBC, -DOTL_ORA7, -DOTL_ORA8, -DOTL_ORA8I, -DOTL_ODBC_UNIX // -DOTL_ODBC_MYSQL, -DOTL_DB2_CLI // this becomes the default from version 4.0.162 and on. -#if !defined(OTL_UNCAUGHT_EXCEPTION_ON) +// the #define is not enabled for vc++ 6.0 in version 4.0.167 and higher. +#if !defined(OTL_UNCAUGHT_EXCEPTION_ON) && !(defined(_MSC_VER)&&(_MSC_VER==1200)) #define OTL_UNCAUGHT_EXCEPTION_ON #endif + #if defined(OTL_ORA11G) #define OTL_ORA10G_R2 #endif @@ -355,7 +362,7 @@ #if defined(OTL_ORA_OCI_ENV_CREATE) && \ (!defined(OTL_ORA8I) && !defined(OTL_ORA9I) && \ !defined(OTL_ORA10G) && !defined(OTL_ORA10G_R2)) -#error OTL_ORA_OCI_ENV_CREATE can be only defined when OTL_ORA8I, OTL_ORA9I, OTL_ORA10G, or OTL_ORA10G_R2 is defined +#error OTL_ORA_OCI_ENV_CREATE can be only defined when OTL_ORA8I, OTL_ORA9I, OTL_ORA10G, OTL_ORA10G_R2, or OTL_ORA11G is defined #endif // -------------------------------------------------------------------- @@ -986,8 +993,27 @@ #endif +#if defined(OTL_UNCAUGHT_EXCEPTION_ON) +#include <exception> +#if !defined(OTL_STLPORT) +inline bool otl_uncaught_exception() +{ + return std::uncaught_exception(); +} +#else +inline bool otl_uncaught_exception() +{ + return __std_alias::uncaught_exception(); +} +#endif +#else +inline bool otl_uncaught_exception() +{ + return false; +} +#endif + #if defined(OTL_STLPORT) - #if defined(__STLPORT_STD) #define OTL_STLPORT_NAMESPACE __STLPORT_STD #else @@ -1002,6 +1028,7 @@ #endif + #if defined(OTL_VALUE_TEMPLATE_ON) && !defined(OTL_STL) && !defined(OTL_ACE) #define STD_NAMESPACE_PREFIX #if (defined(_MSC_VER)&&(_MSC_VER>=1300))||defined(OTL_ANSI_CPP) @@ -1066,11 +1093,6 @@ #include <iterator> #include <vector> -#if defined(OTL_UNCAUGHT_EXCEPTION_ON) -#include <exception> -#endif - - #ifndef OTL_STL_NOSTD_NAMESPACE #include <iostream> #else @@ -1216,7 +1238,11 @@ #define otl_error_msg_32 \ "otl_connect object needs to be connected to DB before using otl_subscriber" +const int otl_error_code_33=32034; +#define otl_error_msg_33 \ +"otl_stream buffer size should be 1 when refcur or plsql table is used" + const int otl_oracle_date_size=7; const int otl_explicit_select=0; @@ -1243,15 +1269,24 @@ unsigned int all_mask; bool lob_stream_mode; - otl_select_struct_override() + otl_select_struct_override(): + col_ndx(new short int[otl_var_list_size]), + col_type(new short int[otl_var_list_size]), + col_size(new int[otl_var_list_size]), + len(0), + all_mask(0), + lob_stream_mode(false), + container_size_(otl_var_list_size) { - container_size_=otl_var_list_size; - col_ndx=new short int[container_size_]; - col_type=new short int[container_size_]; - col_size=new int[container_size_]; - reset(); } + ~otl_select_struct_override() + { + delete[] col_ndx; + delete[] col_type; + delete[] col_size; + } + void reset(void) { len=0; @@ -1259,13 +1294,6 @@ lob_stream_mode=false; } - ~otl_select_struct_override() - { - delete[] col_ndx; - delete[] col_type; - delete[] col_size; - } - void add_override(const int andx, const int atype, const int asize=0) { if(len==otl_var_list_size){ @@ -1309,7 +1337,28 @@ protected: int container_size_; - + +private: + +// this class is not meant to be copied: copy constructor and +// operator= are declared private + + otl_select_struct_override(const otl_select_struct_override&): + col_ndx(0), + col_type(0), + col_size(0), + len(0), + all_mask(0), + lob_stream_mode(false), + container_size_(0) + { + } + + otl_select_struct_override& operator=(const otl_select_struct_override&) + { + return *this; + } + }; inline int otl_decimal_degree(unsigned int num) @@ -1372,20 +1421,20 @@ short int tz_minute; #endif - otl_datetime() - { - year=1900; - month=1; - day=1; - hour=0; - minute=0; - second=0; - fraction=0; - frac_precision=0; + otl_datetime(): + year(1900), + month(1), + day(1), + hour(0), + minute(0), + second(0), + fraction(0), + frac_precision(0) #if defined(OTL_ORA_TIMESTAMP) - tz_hour=0; - tz_minute=0; + ,tz_hour(0), + tz_minute(0) #endif + { } otl_datetime @@ -1402,26 +1451,36 @@ const short int atz_hour=0, const short int atz_minute=0 #endif - - ) - { - year=ayear; - month=amonth; - day=aday; - hour=ahour; - minute=aminute; - second=asecond; - fraction=afraction; - frac_precision=afrac_precision; + ): + year(ayear), + month(amonth), + day(aday), + hour(ahour), + minute(aminute), + second(asecond), + fraction(afraction), + frac_precision(afrac_precision) #if defined(OTL_ORA_TIMESTAMP) - tz_hour=atz_hour; - tz_minute=atz_minute; + ,tz_hour(atz_hour), + tz_minute(atz_minute) #endif + { } - otl_datetime(const otl_datetime& dt) + otl_datetime(const otl_datetime& dt): + year(dt.year), + month(dt.month), + day(dt.day), + hour(dt.hour), + minute(dt.minute), + second(dt.second), + fraction(dt.fraction), + frac_precision(dt.frac_precision) +#if defined(OTL_ORA_TIMESTAMP) + ,tz_hour(dt.tz_hour), + tz_minute(dt.tz_minute) +#endif { - copy(dt); } ~otl_datetime(){} @@ -1429,7 +1488,7 @@ otl_datetime& operator=(const otl_datetime& dt) { copy(dt); - return *this; + return *this; } protected: @@ -1462,7 +1521,17 @@ unsigned char minute; unsigned char second; - otl_oracle_date(){} + otl_oracle_date(): + century(0), + year(0), + month(0), + day(0), + hour(0), + minute(0), + second(0) + { + } + ~otl_oracle_date(){} }; @@ -1521,20 +1590,20 @@ int char_size; #endif - otl_column_desc() + otl_column_desc(): + name(0), + dbtype(0), + otl_var_dbtype(0), + dbsize(0), + scale(0), + prec(0), + nullok(0), +#if defined(OTL_ORA_UNICODE)||defined(OTL_ORA_UTF8) + charset_form(0), + char_size(0), +#endif + name_len_(0) { - name=0; - name_len_=0; - dbtype=0; - otl_var_dbtype=0; - dbsize=0; - scale=0; - prec=0; - nullok=0; -#if defined(OTL_ORA_UNICODE) - charset_form=0; - char_size=0; -#endif } ~otl_column_desc() @@ -1591,6 +1660,24 @@ int name_len_; +private: + + otl_column_desc(const otl_column_desc&): + name(0), + dbtype(0), + otl_var_dbtype(0), + dbsize(0), + scale(0), + prec(0), + nullok(0), +#if defined(OTL_ORA_UNICODE)||defined(OTL_ORA_UTF8) + charset_form(0), + char_size(0), +#endif + name_len_(0) + { + } + }; class otl_var_desc{ @@ -1604,16 +1691,17 @@ char name[128]; int pl_tab_flag; - otl_var_desc() + otl_var_desc(): + param_type(0), + ftype(0), + elem_size(0), + array_size(0), + pos(0), + name_pos(0), + name(), + pl_tab_flag(0) { - param_type=0; - ftype=0; - elem_size=0; - array_size=0; - pos=0; - name_pos=0; - name[0]=0; - pl_tab_flag=0; + name[0]=0; } ~otl_var_desc(){} @@ -1679,7 +1767,12 @@ int buf_size; bool this_is_last_piece_; - otl_long_string(const int buffer_size=32760,const int input_length=0) + otl_long_string(const int buffer_size=32760,const int input_length=0): + v(0), + length(0), + extern_buffer_flag(0), + buf_size(0), + this_is_last_piece_(false) { this_is_last_piece_=false; if(buffer_size==0){ @@ -1698,13 +1791,13 @@ otl_long_string (const void* external_buffer, const int buffer_size, - const int input_length=0) + const int input_length=0): + v(OTL_RCAST(unsigned char*, OTL_CCAST(void*, external_buffer))), + length(input_length), + extern_buffer_flag(1), + buf_size(buffer_size), + this_is_last_piece_(false) { - this_is_last_piece_=false; - extern_buffer_flag=1; - length=input_length; - buf_size=buffer_size; - v=OTL_RCAST(unsigned char*, OTL_CCAST(void*, external_buffer)); } otl_long_string& operator=(const otl_long_string& s) @@ -1735,12 +1828,13 @@ return *this; } - otl_long_string(const otl_long_string& s) + otl_long_string(const otl_long_string& s): + v(0), + length(s.length), + extern_buffer_flag(s.extern_buffer_flag), + buf_size(s.buf_size), + this_is_last_piece_(s.this_is_last_piece_) { - this_is_last_piece_=s.this_is_last_piece_; - length=s.length; - extern_buffer_flag=s.extern_buffer_flag; - buf_size=s.buf_size; if(s.extern_buffer_flag) v=s.v; else{ @@ -2371,14 +2465,14 @@ int tab_len; int vtype; - otl_pl_tab_generic() + otl_pl_tab_generic(): + p_v(0), + p_null(0), + elem_size(0), + tab_size(0), + tab_len(0), + vtype(0) { - elem_size=0; - tab_size=0; - tab_len=0; - p_v=0; - p_null=0; - vtype=0; } virtual ~otl_pl_tab_generic(){} @@ -2420,6 +2514,23 @@ tab_len=new_len; } +private: + + otl_pl_tab_generic(const otl_pl_tab_generic&): + p_v(0), + p_null(0), + elem_size(0), + tab_size(0), + tab_len(0), + vtype(0) + { + } + + otl_pl_tab_generic& operator=(const otl_pl_tab_generic&) + { + return *this; + } + }; #if defined(OTL_STRICT_NUMERIC_TYPE_CHECK_ON_SELECT) @@ -2532,9 +2643,9 @@ int should_delete; - otl_stream_shell_generic() + otl_stream_shell_generic(): + should_delete(0) { - should_delete=0; } virtual ~otl_stream_shell_generic(){} @@ -2558,12 +2669,15 @@ int cnt; - otl_stream_pool_entry() + otl_stream_pool_entry(): + s(), + cnt(0) { - cnt=0; } - otl_stream_pool_entry(const otl_stream_pool_entry& sc) + otl_stream_pool_entry(const otl_stream_pool_entry& sc): + s(), + cnt(0) { copy(sc); } @@ -2610,10 +2724,11 @@ int max_size; int size; - otl_stream_pool() + otl_stream_pool(): + sc(), + max_size(otl_max_default_pool_size), + size(0) { - max_size=otl_max_default_pool_size; - size=0; } void init(int amax_size=otl_max_default_pool_size) @@ -2847,6 +2962,20 @@ { init(); } + +private: + + otl_stream_pool(const otl_stream_pool&): + sc(), + max_size(0), + size(0) + { + } + + otl_stream_pool& operator=(const otl_stream_pool&) + { + return *this; + } }; @@ -2865,24 +2994,30 @@ TData v; bool ind; - otl_value(){ind=true;} + otl_value(): + v(), + ind(true) + { + } + virtual ~otl_value(){} - otl_value(const otl_value<TData>& var) + otl_value(const otl_value<TData>& var): + v(var.v), + ind(var.ind) { - v=var.v; - ind=var.ind; } - otl_value(const TData& var) + otl_value(const TData& var): + v(var), + ind(false) { - v=var; - ind=false; } - otl_value(const otl_null&) + otl_value(const otl_null&): + v(0), + ind(true) { - ind=true; } otl_value<TData>& operator=(const otl_value<TData>& var) @@ -2945,16 +3080,16 @@ T* ptr; int arr_size_; - otl_auto_array_ptr() + otl_auto_array_ptr(): + ptr(0), + arr_size_(0) { - ptr=0; - arr_size_=0; } - otl_auto_array_ptr(const int arr_size) + otl_auto_array_ptr(const int arr_size): + ptr(new T[arr_size]), + arr_size_(arr_size) { - ptr=new T[arr_size]; - arr_size_=arr_size; } void double_size(void) @@ -2973,6 +3108,19 @@ delete[] ptr; } +private: + + otl_auto_array_ptr(const otl_auto_array_ptr<T>&): + ptr(0), + arr_size_(0) + { + } + + otl_auto_array_ptr<T>& operator=(const otl_auto_array_ptr<T>&) + { + return *this; + } + }; template <OTL_TYPE_NAME T> @@ -2982,10 +3130,10 @@ T** ptr; int arr_flag; - otl_ptr() + otl_ptr(): + ptr(0), + arr_flag(0) { - ptr=0; - arr_flag=0; } void assign(T** var) @@ -3025,6 +3173,19 @@ destroy(); } +private: + + otl_ptr(const otl_ptr&): + ptr(0), + arr_flag(0) + { + } + + otl_ptr& operator=(const otl_ptr&) + { + return *this; + } + }; template <OTL_TYPE_NAME T> @@ -3032,13 +3193,12 @@ public: T* ptr; - bool do_not_destroy; - otl_Tptr() + otl_Tptr(): + ptr(0), + do_not_destroy(false) { - ptr=0; - do_not_destroy=false; } void assign(T* var) @@ -3064,6 +3224,23 @@ destroy(); } + otl_Tptr& operator=(const otl_Tptr& src) + { + ptr=src.ptr; + do_not_destroy=src.do_not_destroy; + return *this; + } + +private: + + otl_Tptr(const otl_Tptr&): + ptr(0), + do_not_destroy(false) + { + } + + + }; @@ -3115,11 +3292,12 @@ int vtype; int elem_size; - otl_pl_vec_generic() + otl_pl_vec_generic(): + p_v(0), + null_flag(), + vtype(0), + elem_size(0) { - p_v=0; - vtype=0; - elem_size=0; } virtual int len(void) const @@ -3131,7 +3309,6 @@ const bool /*set_all_to_null*/=true) { - } bool is_null(const int ndx=0) @@ -3151,6 +3328,21 @@ virtual ~otl_pl_vec_generic(){} +private: + + otl_pl_vec_generic(const otl_pl_vec_generic&): + p_v(0), + null_flag(), + vtype(0), + elem_size(0) + { + } + + otl_pl_vec_generic& operator=(const otl_pl_vec_generic&) + { + return *this; + } + }; template<OTL_TYPE_NAME T,const int type_code,const int T_sz> @@ -3159,7 +3351,8 @@ STD_NAMESPACE_PREFIX vector<T> v; - otl_T_vec() + otl_T_vec(): + v() { this->p_v=OTL_RCAST(void*,&v); this->vtype=type_code; @@ -3191,6 +3384,18 @@ return v[ndx]; } +private: + + otl_T_vec(const otl_T_vec&): + v() + { + } + + otl_T_vec& operator=(const otl_T_vec&) + { + return *this; + } + }; typedef otl_T_vec<double,otl_var_double,sizeof(double)> otl_double_vec; @@ -3223,13 +3428,28 @@ memset(v,0,sizeof(v)); } - otl_tmpl_pl_tab() + otl_tmpl_pl_tab(): + v(), + null_flag() { init(); } virtual ~otl_tmpl_pl_tab(){} +private: + + otl_tmpl_pl_tab& operator=(const otl_tmpl_pl_tab&) + { + return *this; + } + + otl_tmpl_pl_tab(const otl_tmpl_pl_tab&): + v(), + null_flag() + { + } + }; template <const int atab_size> @@ -3288,13 +3508,28 @@ memset(v,0,sizeof(v)); } - otl_cstr_tab() + otl_cstr_tab(): + v(), + null_flag() { init(); } virtual ~otl_cstr_tab(){} +private: + + otl_cstr_tab(const otl_cstr_tab&): + v(), + null_flag() + { + } + + otl_cstr_tab& operator=(const otl_cstr_tab&) + { + return *this; + } + }; template <const int atab_size> @@ -3318,7 +3553,9 @@ null_flag[i]=0; } - otl_datetime_tab() + otl_datetime_tab(): + v(), + null_flag() { init(); } @@ -3348,10 +3585,10 @@ memset(v,0,elem_size*tab_size); } - otl_tmpl_dyn_pl_tab(const int atab_size=1) + otl_tmpl_dyn_pl_tab(const int atab_size=1): + v(0), + null_flag(0) { - v=0; - null_flag=0; init(atab_size); } @@ -3361,6 +3598,19 @@ delete[] null_flag; } +private: + + otl_tmpl_dyn_pl_tab(const otl_tmpl_dyn_pl_tab<T,avtype>&): + v(0), + null_flag(0) + { + } + + otl_tmpl_dyn_pl_tab<T,avtype>& operator=(const otl_tmpl_dyn_pl_tab<T,avtype>&) + { + return *this; + } + }; class otl_dynamic_int_tab: public otl_tmpl_dyn_pl_tab<int,otl_var_int>{ @@ -3422,10 +3672,10 @@ memset(v,0,elem_size*tab_size); } - otl_dynamic_cstr_tab(const int atab_size=1) + otl_dynamic_cstr_tab(const int atab_size=1): + v(0), + null_flag(0) { - v=0; - null_flag=0; init(atab_size); } @@ -3435,6 +3685,19 @@ delete[] null_flag; } +private: + + otl_dynamic_cstr_tab(const otl_dynamic_cstr_tab&): + v(0), + null_flag(0) + { + } + + otl_dynamic_cstr_tab& operator=(const otl_dynamic_cstr_tab&) + { + return *this; + } + }; class otl_dynamic_datetime_tab: public otl_pl_tab_generic{ @@ -3459,10 +3722,11 @@ null_flag[i]=0; } - otl_dynamic_datetime_tab(const int atab_size=1) + otl_dynamic_datetime_tab(const int atab_size=1): + otl_pl_tab_generic(), + v(0), + null_flag(0) { - v=0; - null_flag=0; init(atab_size); } @@ -3472,6 +3736,20 @@ delete[] null_flag; } +private: + + otl_dynamic_datetime_tab(const otl_dynamic_datetime_tab&): + otl_pl_tab_generic(), + v(0), + null_flag(0) + { + } + + otl_dynamic_datetime_tab& operator=(const otl_dynamic_datetime_tab&) + { + return *this; + } + }; @@ -3681,20 +3959,22 @@ throw_count=0; } - otl_tmpl_connect() + otl_tmpl_connect(): + connected(0), + connect_struct(), + long_max_size(32760), + retcode(1), + throw_count(0) { - throw_count=0; - connected=0; - long_max_size=32760; - retcode=1; } - otl_tmpl_connect(const char* connect_str,const int auto_commit=0) + otl_tmpl_connect(const char* connect_str,const int auto_commit=0): + connected(0), + connect_struct(), + long_max_size(32760), + retcode(1), + throw_count(0) { - connected=0; - throw_count=0; - retcode=1; - long_max_size=32760; rlogon(connect_str,auto_commit); } @@ -3718,15 +3998,7 @@ connected=0; ++throw_count; if(throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION(connect_struct); } } @@ -3741,15 +4013,7 @@ if(throw_count>0) return; ++throw_count; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION(connect_struct); } @@ -3762,15 +4026,7 @@ if(retcode)return; ++throw_count; if(throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION(connect_struct); } @@ -3783,15 +4039,7 @@ if(retcode)return; ++throw_count; if(throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION(connect_struct); } @@ -3804,15 +4052,7 @@ if(retcode)return; ++throw_count; if(throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION(connect_struct); } @@ -3825,18 +4065,26 @@ if(retcode)return; ++throw_count; if(throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION(connect_struct); } +private: + + otl_tmpl_connect(const otl_tmpl_connect&): + connected(0), + connect_struct(), + long_max_size(32760), + retcode(1), + throw_count(0) + { + } + + otl_tmpl_connect& operator=(const otl_tmpl_connect&) + { + return *this; + } + }; template <OTL_TYPE_NAME TVariableStruct> @@ -3878,14 +4126,18 @@ v.pl_tab_flag=pl_tab_flag; } - otl_tmpl_variable() + otl_tmpl_variable(): + param_type(0), + ftype(0), + elem_size(0), + array_size(0), + name(0), + pos(0), + name_pos(0), + bound(0), + pl_tab_flag(0), + var_struct() { - name=0; - pos=0; - name_pos=0; - pl_tab_flag=0; - bound=0; - param_type=otl_input_param; } virtual ~otl_tmpl_variable() @@ -3897,7 +4149,17 @@ (const int column_num, const int aftype, const int aelem_size, - const short aarray_size) + const short aarray_size): + param_type(0), + ftype(0), + elem_size(0), + array_size(0), + name(0), + pos(0), + name_pos(0), + bound(0), + pl_tab_flag(0), + var_struct() { copy_pos(column_num); init(aftype,aelem_size,aarray_size); @@ -4043,6 +4305,27 @@ return TVariableStruct::int2ext(int_type); } +private: + + otl_tmpl_variable(const otl_tmpl_variable&): + param_type(0), + ftype(0), + elem_size(0), + array_size(0), + name(0), + pos(0), + name_pos(0), + bound(0), + pl_tab_flag(0), + var_struct() + { + } + + otl_tmpl_variable& operator=(const otl_tmpl_variable&) + { + return *this; + } + }; template <OTL_TYPE_NAME TExceptionStruct, @@ -4066,53 +4349,55 @@ long _rpc; int in_destructor; - otl_tmpl_cursor() + otl_tmpl_cursor(): + connected(0), + stm_text(0), + stm_label(0), + cursor_struct(), + vl_len(0), + vl(0), + adb(0), + eof_data(), + eof_desc(), + retcode(1), + _rpc(0), + in_destructor(0) { - in_destructor=0; - connected=0; - stm_label=0; - stm_text=0; - vl_len=0; - vl=0; - eof_data=0; - eof_desc=0; - adb=0; - _rpc=0; - retcode=1; } - otl_tmpl_cursor - (OTL_TMPL_CONNECT& connect) + otl_tmpl_cursor(OTL_TMPL_CONNECT& connect): + connected(0), + stm_text(0), + stm_label(0), + cursor_struct(), + vl_len(0), + vl(0), + adb(&connect), + eof_data(), + eof_desc(), + retcode(1), + _rpc(0), + in_destructor(0) { - in_destructor=0; - connected=0; - stm_text=0; - stm_label=0; - vl_len=0; - vl=0; - eof_data=0; - eof_desc=0; - retcode=1; - _rpc=0; - adb=&connect; open(connect); } otl_tmpl_cursor (OTL_TMPL_CONNECT& connect, - TVariableStruct* var) + TVariableStruct* var): + connected(0), + stm_text(0), + stm_label(0), + cursor_struct(), + vl_len(0), + vl(0), + adb(&connect), + eof_data(), + eof_desc(), + retcode(1), + _rpc(0), + in_destructor(0) { - in_destructor=0; - connected=0; - stm_text=0; - stm_label=0; - vl_len=0; - vl=0; - eof_data=0; - eof_desc=0; - retcode=1; - _rpc=0; - adb=&connect; open(connect,var); } @@ -4146,15 +4431,7 @@ } if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION(cursor_struct); } @@ -4180,15 +4457,7 @@ } this->adb->throw_count++; adb=0; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION(cursor_struct); } @@ -4200,28 +4469,12 @@ case 0: if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION(cursor_struct,stm_label?stm_label:stm_text); case 2: if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; char var_info[1]; var_info[0]=0; throw OTL_TMPL_EXCEPTION @@ -4258,15 +4511,7 @@ if(retcode)return; if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION(cursor_struct,stm_label?stm_label:stm_text); } @@ -4275,13 +4520,14 @@ const int binding_type) { bool rc=true; - if((v.ftype==otl_var_varchar_long||v.ftype==otl_var_raw_long) && - (v.var_struct.otl_adapter==otl_ora7_adapter || + if(((v.ftype==otl_var_varchar_long||v.ftype==otl_var_raw_long) && + (v.var_struct.otl_adapter==otl_ora7_adapter|| v.var_struct.otl_adapter==otl_ora8_adapter) && - v.array_size>1 || - (v.ftype==otl_var_blob||v.ftype==otl_var_clob) && - v.var_struct.otl_adapter==otl_ora8_adapter && - v.array_size>1 && binding_type==otl_inout_binding) + v.array_size>1) || + ((v.ftype==otl_var_blob||v.ftype==otl_var_clob)&& + v.var_struct.otl_adapter==otl_ora8_adapter&& + v.array_size>1 && + binding_type==otl_inout_binding)) rc=false; return rc; } @@ -4302,15 +4548,7 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION (otl_error_msg_16, otl_error_code_16, @@ -4331,15 +4569,7 @@ } if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION(cursor_struct,stm_label?stm_label:stm_text); } @@ -4358,15 +4588,7 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION (otl_error_msg_16, otl_error_code_16, @@ -4382,15 +4604,7 @@ if(retcode)return; if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION(cursor_struct,stm_label?stm_label:stm_text); } @@ -4455,18 +4669,34 @@ if(retcode)return 1; if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return 0; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return 0; -#endif + if(otl_uncaught_exception()) return 0; throw OTL_TMPL_EXCEPTION(cursor_struct,stm_label?stm_label:stm_text); } +private: + + otl_tmpl_cursor(const otl_tmpl_cursor&): + connected(0), + stm_text(0), + stm_label(0), + cursor_struct(), + vl_len(0), + vl(0), + adb(0), + eof_data(), + eof_desc(), + retcode(1), + _rpc(0), + in_destructor(0) + { + } + + otl_tmpl_cursor& operator=(const otl_tmpl_cursor&) + { + return *this; + } + + }; inline int is_num(char c) @@ -4499,17 +4729,30 @@ char* stm_text_; char* stm_label_; int container_size_; - + bool has_plsql_tabs_or_refcur_; + otl_tmpl_ext_hv_decl(char* stm, int arr_size=1, char* label=0, otl_select_struct_override** select_override=0, - OTL_TMPL_CONNECT* adb=0) + OTL_TMPL_CONNECT* adb=0): + hv(0), + inout(0), + pl_tab_size(0), + array_size(0), + prev_array_size(0), + vst(), + len(0), + stm_text_(0), + stm_label_(0), + container_size_(0), + has_plsql_tabs_or_refcur_(0) { container_size_=otl_var_list_size; hv=new char*[container_size_]; inout=new short[container_size_]; pl_tab_size=new int[container_size_]; + has_plsql_tabs_or_refcur_=false; int j; array_size=arr_size; @@ -4561,7 +4804,7 @@ break; } if(*c==':' && !in_str && !in_comment && !in_one_line_comment && - (c>stm && *(c-1)!='\\' || c==stm)){ + ((c>stm && *(c-1)!='\\') || c==stm)){ char* bind_var_ptr=c; short in_out=def; int apl_tab_size=0; @@ -4688,7 +4931,7 @@ ++n1; ++n2; } - if(*n1==' '&&*n2!=' '||*n2==' '&&*n1!=' ') + if((*n1==' '&&*n2!=' ')||(*n2==' '&&*n1!=' ')) return 0; return 1; } @@ -4703,6 +4946,7 @@ OTL_STRCPY_S(hv[n],v_len,v); inout[n]=in_out; pl_tab_size[n]=apl_tab_size; + if(apl_tab_size>0) has_plsql_tabs_or_refcur_=true; if(n==container_size_-1){ int temp_container_size=container_size_; container_size_*=2; @@ -4768,7 +5012,7 @@ t3=otl_to_upper(c1[2]); t4=otl_to_upper(c1[3]); } - if(type=='C'&&t2=='H'||type=='R'&&t2=='A'&&t3=='W'&&(t4=='['||t4=='(')){ + if((type=='C'&&t2=='H')||(type=='R'&&t2=='A'&&t3=='W'&&(t4=='['||t4=='('))){ char tmp[32]; char *t=tmp; while((*c1!='[' && *c1!='(')&&*c1) @@ -4981,7 +5225,7 @@ } if(clen>4) t5=otl_to_upper(c1[4]); - if(type=='C'&&t2=='H'||type=='R'&&t2=='A'&&t3=='W'&&(t4=='['||t4=='(')){ + if((type=='C'&&t2=='H')||(type=='R'&&t2=='A'&&t3=='W'&&(t4=='['||t4=='('))){ char tmp[32]; char *t=tmp; while((*c1!='[' && *c1!='(')&&*c1) @@ -5258,6 +5502,46 @@ } } +private: + + otl_tmpl_ext_hv_decl + (const otl_tmpl_ext_hv_decl + <TVariableStruct, + TTimestampStruct, + TExceptionStruct, + TConnectStruct, + TCursorStruct>&): + hv(0), + inout(0), + pl_tab_size(0), + array_size(0), + prev_array_size(0), + vst(), + len(0), + stm_text_(0), + stm_label_(0), + container_size_(0), + has_plsql_tabs_or_refcur_(0) + { + } + +otl_tmpl_ext_hv_decl + <TVariableStruct, + TTimestampStruct, + TExceptionStruct, + TConnectStruct, + TCursorStruct>& +operator= +(const otl_tmpl_ext_hv_decl + <TVariableStruct, + TTimestampStruct, + TExceptionStruct, + TConnectStruct, + TCursorStruct>&) + { + return *this; + } + }; template <OTL_TYPE_NAME TExceptionStruct, @@ -5281,13 +5565,17 @@ otl_tmpl_select_cursor (OTL_TMPL_CONNECT& pdb, const otl_stream_buffer_size_type arr_size=1, - const char* sqlstm_label=0) - : OTL_TMPL_CURSOR(pdb) + const char* sqlstm_label=0): + OTL_TMPL_CURSOR(pdb), + cur_row(-1), + cur_size(0), + row_count(0), + array_size(0), + prefetch_array_size(0), + select_cursor_struct(), + local_override() { local_override.reset(); - cur_row=-1; - row_count=0; - cur_size=0; if(sqlstm_label!=0){ if(this->stm_label!=0){ delete[] this->stm_label; @@ -5339,15 +5627,7 @@ if(!rc){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return 0; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return 0; -#endif + if(otl_uncaught_exception()) return 0; throw OTL_TMPL_EXCEPTION (this->cursor_struct, this->stm_label? @@ -5361,15 +5641,8 @@ { if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return 0; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return 0; -#endif + if(otl_uncaught_exception()) return 0; + throw OTL_TMPL_EXCEPTION (this->cursor_struct, this->stm_label? @@ -5394,6 +5667,27 @@ return cur_size!=0; } +private: + + otl_tmpl_select_cursor + (const otl_tmpl_select_cursor&): + OTL_TMPL_CURSOR(), + cur_row(-1), + cur_size(0), + row_count(0), + array_size(0), + prefetch_array_size(0), + select_cursor_struct(), + local_override() + { + } + + otl_tmpl_select_cursor& operator= + (const otl_tmpl_select_cursor&) + { + return *this; + } + }; #if defined(OTL_ORA8)||defined(OTL_ODBC) @@ -5419,9 +5713,17 @@ int lob_is_null; bool ora_lob; - otl_lob_stream_generic(const bool aora_lob=true) + otl_lob_stream_generic(const bool aora_lob=true): + mode(0), + retcode(0), + ndx(0), + offset(0), + lob_len(0), + in_destructor(0), + eof_flag(0), + lob_is_null(0), + ora_lob(aora_lob) { - ora_lob=aora_lob; } virtual ~otl_lob_stream_generic(){} @@ -5443,6 +5745,26 @@ virtual bool is_initialized(void) = 0; virtual void close(void) = 0; +private: + + otl_lob_stream_generic(const otl_lob_stream_generic&): + mode(0), + retcode(0), + ndx(0), + offset(0), + lob_len(0), + in_destructor(0), + eof_flag(0), + lob_is_null(0), + ora_lob(false) + { + } + + otl_lob_stream_generic& operator=(const otl_lob_stream_generic&) + { + return *this; + } + }; #endif @@ -5502,7 +5824,20 @@ OTL_TMPL_CONNECT& pdb, const int implicit_select=otl_explicit_select, const char* sqlstm_label=0) - : OTL_TMPL_SELECT_CURSOR(pdb,arr_size,sqlstm_label) + : OTL_TMPL_SELECT_CURSOR(pdb,arr_size,sqlstm_label), + sl_desc(0), + sl(0), + sl_len(0), + null_fetched(0), + cur_col(0), + cur_in(0), + executed(0), + eof_status(0), + var_info(), + override(0), + delay_next(0), + lob_stream_mode(false), + _rfc(0) { int i; this->select_cursor_struct.set_select_type(implicit_select); @@ -5699,15 +6034,7 @@ { if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION (otl_error_msg_2, otl_error_code_2, @@ -5739,15 +6066,7 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return 0; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return 0; -#endif + if(otl_uncaught_exception()) return 0; throw OTL_TMPL_EXCEPTION (otl_error_msg_0, otl_error_code_0, @@ -5768,15 +6087,7 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION (otl_error_msg_0, otl_error_code_0, @@ -5900,15 +6211,7 @@ if(rc==0){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -5970,15 +6273,7 @@ sizeof(temp_var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (otl_error_msg_4, otl_error_code_4, @@ -6044,15 +6339,7 @@ if(rc==0){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -6153,15 +6440,7 @@ if(rc==0){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -6222,15 +6501,7 @@ if(rc==0){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -6255,15 +6526,7 @@ sizeof(tmp_var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (otl_error_msg_0, otl_error_code_0, @@ -6314,15 +6577,7 @@ sizeof(tmp_var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (otl_error_msg_0, otl_error_code_0, @@ -6344,15 +6599,7 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return 0; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return 0; -#endif + if(otl_uncaught_exception()) return 0; throw OTL_TMPL_EXCEPTION (otl_error_msg_0, otl_error_code_0, @@ -6386,15 +6633,7 @@ { if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION (otl_error_msg_1, otl_error_code_1, @@ -6476,15 +6715,7 @@ sizeof(tmp_var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (otl_error_msg_4, otl_error_code_4, @@ -6517,15 +6748,7 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (otl_error_msg_5, otl_error_code_5, @@ -6551,15 +6774,7 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (otl_error_msg_5, otl_error_code_5, @@ -6615,15 +6830,7 @@ sizeof(temp_var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (otl_error_msg_4, otl_error_code_4, @@ -6663,15 +6870,7 @@ sizeof(temp_var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (otl_error_msg_4, otl_error_code_4, @@ -6724,15 +6923,7 @@ if(rc==0){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -6744,6 +6935,32 @@ return *this; } +private: + + otl_tmpl_select_stream + (const otl_tmpl_select_stream&): + OTL_TMPL_SELECT_CURSOR(), + sl_desc(0), + sl(0), + sl_len(0), + null_fetched(0), + cur_col(0), + cur_in(0), + executed(0), + eof_status(0), + var_info(), + override(0), + delay_next(0), + lob_stream_mode(false), + _rfc(0) + { + } + + otl_tmpl_select_stream& operator=(const otl_tmpl_select_stream&) + { + return *this; + } + }; template <OTL_TYPE_NAME TExceptionStruct, @@ -6782,8 +6999,20 @@ const char* sqlstm, OTL_TMPL_CONNECT& db, const bool alob_stream_mode=false, - const char* sqlstm_label=0) - : OTL_TMPL_CURSOR(db) + const char* sqlstm_label=0): + OTL_TMPL_CURSOR(db), + auto_commit_flag(0), + dirty(0), + cur_x(0), + cur_y(0), + array_size(0), + in_exception_flag(0), + in_destruct_flag(0), + should_delete_flag(0), + var_info(), + flush_flag(0), + flush_flag2(0), + lob_stream_mode(0) { int i; if(sqlstm_label!=0){ @@ -6842,8 +7071,20 @@ otl_tmpl_out_stream (OTL_TMPL_CONNECT& pdb, const bool alob_stream_mode=false, - const char* sqlstm_label=0) - : OTL_TMPL_CURSOR(pdb) + const char* sqlstm_label=0): + OTL_TMPL_CURSOR(pdb), + auto_commit_flag(0), + dirty(0), + cur_x(0), + cur_y(0), + array_size(0), + in_exception_flag(0), + in_destruct_flag(0), + should_delete_flag(0), + var_info(), + flush_flag(0), + flush_flag2(0), + lob_stream_mode(0) { if(sqlstm_label!=0){ if(this->stm_label!=0){ @@ -6901,15 +7142,7 @@ if(temp_rc==0){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -6923,16 +7156,15 @@ } #if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception()){ + if(otl_uncaught_exception()){ clean(); return; } +#elif defined(OTL_UNCAUGHT_EXCEPTION_ON) + if(otl_uncaught_exception()){ + clean(); + return; + } #endif if(this->retcode==0||this->adb->retcode==0){ @@ -6945,15 +7177,15 @@ if(this->adb&&this->adb->throw_count>1)return; #if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception()){ +otl_uncaught_exception()){ clean(); return; } +#elif defined(OTL_UNCAUGHT_EXCEPTION_ON) + if(otl_uncaught_exception()){ + clean(); + return; + } #endif throw OTL_TMPL_EXCEPTION (otl_error_msg_3, @@ -6970,15 +7202,7 @@ if(rc==0){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -6990,15 +7214,7 @@ in_exception_flag=1; if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION (this->cursor_struct, this->stm_label?this->stm_label: @@ -7010,15 +7226,7 @@ clean(); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -7034,15 +7242,7 @@ if(temp_rc==0){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return; -#endif + if(otl_uncaught_exception()) return; throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -7111,15 +7311,7 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return 0; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return 0; -#endif + if(otl_uncaught_exception()) return 0; throw OTL_TMPL_EXCEPTION (otl_error_msg_0, otl_error_code_0, @@ -7210,15 +7402,7 @@ in_exception_flag=1; if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (otl_error_msg_4, otl_error_code_4, @@ -7247,15 +7431,7 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (otl_error_msg_5, otl_error_code_5, @@ -7285,15 +7461,7 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (otl_error_msg_5, otl_error_code_5, @@ -7368,15 +7536,7 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (otl_error_msg_5, otl_error_code_5, @@ -7404,15 +7564,7 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (otl_error_msg_5, otl_error_code_5, @@ -7496,15 +7648,7 @@ in_exception_flag=1; if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (otl_error_msg_4, otl_error_code_4, @@ -7579,15 +7723,7 @@ sizeof(tmp_var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (otl_error_msg_4, otl_error_code_4, @@ -7662,15 +7798,7 @@ sizeof(temp_var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (otl_error_msg_4, otl_error_code_4, @@ -7767,15 +7895,7 @@ if(rc==0){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -7810,15 +7930,7 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (otl_error_msg_5, otl_error_code_5, @@ -7856,15 +7968,7 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (otl_error_msg_5, otl_error_code_5, @@ -7890,11 +7994,11 @@ { if(this->vl_len>0){ get_next(); - if((s.ora_lob&& - this->vl[cur_x]->ftype==otl_var_blob|| + if(((s.ora_lob&& + this->vl[cur_x]->ftype==otl_var_blob)|| this->vl[cur_x]->ftype==otl_var_clob)|| (this->vl[cur_x]->ftype==otl_var_varchar_long|| - this->vl[cur_x]->ftype==otl_var_raw_long)){ + this->vl[cur_x]->ftype==otl_var_raw_long)){ s.init (this->vl[cur_x], this->adb, @@ -7915,15 +8019,7 @@ sizeof(temp_var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; -#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if( -#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) - OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE -#else - STD_NAMESPACE_PREFIX -#endif - uncaught_exception())return *this; -#endif + if(otl_uncaught_exception()) return *this; throw OTL_TMPL_EXCEPTION (otl_error_msg_0, otl_error_code_0, @@ -7936,6 +8032,49 @@ #undef OTL_TMPL_CUR_DUMMY #endif + otl_tmpl_out_stream(): + OTL_TMPL_CURSOR(), + auto_commit_flag(0), + dirty(0), + cur_x(0), + cur_y(0), + array_size(0), + in_exception_flag(0), + in_destruct_flag(0), + should_delete_flag(0), + var_info(), + flush_flag(0), + flush_flag2(0), + lob_stream_mode(0) + { + } + +private: + + otl_tmpl_out_stream + (const otl_tmpl_out_stream&): + OTL_TMPL_CURSOR(), + auto_commit_flag(0), + dirty(0), + cur_x(0), + cur_y(0), + array_size(0), + in_exception_flag(0), + in_destruct_flag(0), + should_delete_flag(0), + var_info(), + flush_flag(0), + flush_flag2(0), + lob_stream_mode(0) + { + } + + otl_tmpl_out_stream& operator= ... [truncated message content] |
From: <mrj...@us...> - 2008-04-19 15:33:44
|
Revision: 2714 http://tora.svn.sourceforge.net/tora/?rev=2714&view=rev Author: mrjohnson0 Date: 2008-04-19 08:33:39 -0700 (Sat, 19 Apr 2008) Log Message: ----------- revert to previous, cursors not getting closed Modified Paths: -------------- trunk/tora/src/otl/otlv4.h Modified: trunk/tora/src/otl/otlv4.h =================================================================== --- trunk/tora/src/otl/otlv4.h 2008-04-16 14:04:02 UTC (rev 2713) +++ trunk/tora/src/otl/otlv4.h 2008-04-19 15:33:39 UTC (rev 2714) @@ -1,5 +1,5 @@ // ============================================================== -// ORACLE, ODBC and DB2/CLI Template Library, Version 4.0.167, +// ORACLE, ODBC and DB2/CLI Template Library, Version 4.0.162, // Copyright (C) Sergei Kuchin, 1996,2008 // Author: Sergei Kuchin // This library is free software. Permission to use, copy, @@ -11,11 +11,10 @@ #ifndef __OTL_H__ #define __OTL_H__ -#define OTL_VERSION_NUMBER (0x0400A7L) +#define OTL_VERSION_NUMBER (0x0400A2L) #if defined(_MSC_VER) #if (_MSC_VER >= 1400) -#pragma warning (disable:4351) //#pragma warning (disable:4996) #define OTL_STRCAT_S(dest,dest_sz,src) strcat_s(dest,dest_sz,src) #define OTL_STRCPY_S(dest,dest_sz,src) strcpy_s(dest,dest_sz,src) @@ -72,22 +71,16 @@ // Oracle 10g Release 2: //#define OTL_ORA10G_R2 -// Uncomment the following line in order to include the OTL for -// Oracle 11g Release 1 -//#define OTL_ORA11G - // The macro definitions may be also turned on via C++ compiler command line // option, e.g.: -DOTL_ODBC, -DOTL_ORA7, -DOTL_ORA8, -DOTL_ORA8I, -DOTL_ODBC_UNIX // -DOTL_ODBC_MYSQL, -DOTL_DB2_CLI // this becomes the default from version 4.0.162 and on. -// the #define is not enabled for vc++ 6.0 in version 4.0.167 and higher. -#if !defined(OTL_UNCAUGHT_EXCEPTION_ON) && !(defined(_MSC_VER)&&(_MSC_VER==1200)) +#if !defined(OTL_UNCAUGHT_EXCEPTION_ON) #define OTL_UNCAUGHT_EXCEPTION_ON #endif - #if defined(OTL_ORA11G) #define OTL_ORA10G_R2 #endif @@ -362,7 +355,7 @@ #if defined(OTL_ORA_OCI_ENV_CREATE) && \ (!defined(OTL_ORA8I) && !defined(OTL_ORA9I) && \ !defined(OTL_ORA10G) && !defined(OTL_ORA10G_R2)) -#error OTL_ORA_OCI_ENV_CREATE can be only defined when OTL_ORA8I, OTL_ORA9I, OTL_ORA10G, OTL_ORA10G_R2, or OTL_ORA11G is defined +#error OTL_ORA_OCI_ENV_CREATE can be only defined when OTL_ORA8I, OTL_ORA9I, OTL_ORA10G, or OTL_ORA10G_R2 is defined #endif // -------------------------------------------------------------------- @@ -993,27 +986,8 @@ #endif -#if defined(OTL_UNCAUGHT_EXCEPTION_ON) -#include <exception> -#if !defined(OTL_STLPORT) -inline bool otl_uncaught_exception() -{ - return std::uncaught_exception(); -} -#else -inline bool otl_uncaught_exception() -{ - return __std_alias::uncaught_exception(); -} -#endif -#else -inline bool otl_uncaught_exception() -{ - return false; -} -#endif - #if defined(OTL_STLPORT) + #if defined(__STLPORT_STD) #define OTL_STLPORT_NAMESPACE __STLPORT_STD #else @@ -1028,7 +1002,6 @@ #endif - #if defined(OTL_VALUE_TEMPLATE_ON) && !defined(OTL_STL) && !defined(OTL_ACE) #define STD_NAMESPACE_PREFIX #if (defined(_MSC_VER)&&(_MSC_VER>=1300))||defined(OTL_ANSI_CPP) @@ -1093,6 +1066,11 @@ #include <iterator> #include <vector> +#if defined(OTL_UNCAUGHT_EXCEPTION_ON) +#include <exception> +#endif + + #ifndef OTL_STL_NOSTD_NAMESPACE #include <iostream> #else @@ -1238,11 +1216,7 @@ #define otl_error_msg_32 \ "otl_connect object needs to be connected to DB before using otl_subscriber" -const int otl_error_code_33=32034; -#define otl_error_msg_33 \ -"otl_stream buffer size should be 1 when refcur or plsql table is used" - const int otl_oracle_date_size=7; const int otl_explicit_select=0; @@ -1269,24 +1243,15 @@ unsigned int all_mask; bool lob_stream_mode; - otl_select_struct_override(): - col_ndx(new short int[otl_var_list_size]), - col_type(new short int[otl_var_list_size]), - col_size(new int[otl_var_list_size]), - len(0), - all_mask(0), - lob_stream_mode(false), - container_size_(otl_var_list_size) + otl_select_struct_override() { + container_size_=otl_var_list_size; + col_ndx=new short int[container_size_]; + col_type=new short int[container_size_]; + col_size=new int[container_size_]; + reset(); } - ~otl_select_struct_override() - { - delete[] col_ndx; - delete[] col_type; - delete[] col_size; - } - void reset(void) { len=0; @@ -1294,6 +1259,13 @@ lob_stream_mode=false; } + ~otl_select_struct_override() + { + delete[] col_ndx; + delete[] col_type; + delete[] col_size; + } + void add_override(const int andx, const int atype, const int asize=0) { if(len==otl_var_list_size){ @@ -1337,28 +1309,7 @@ protected: int container_size_; - -private: - -// this class is not meant to be copied: copy constructor and -// operator= are declared private - - otl_select_struct_override(const otl_select_struct_override&): - col_ndx(0), - col_type(0), - col_size(0), - len(0), - all_mask(0), - lob_stream_mode(false), - container_size_(0) - { - } - - otl_select_struct_override& operator=(const otl_select_struct_override&) - { - return *this; - } - + }; inline int otl_decimal_degree(unsigned int num) @@ -1421,20 +1372,20 @@ short int tz_minute; #endif - otl_datetime(): - year(1900), - month(1), - day(1), - hour(0), - minute(0), - second(0), - fraction(0), - frac_precision(0) + otl_datetime() + { + year=1900; + month=1; + day=1; + hour=0; + minute=0; + second=0; + fraction=0; + frac_precision=0; #if defined(OTL_ORA_TIMESTAMP) - ,tz_hour(0), - tz_minute(0) + tz_hour=0; + tz_minute=0; #endif - { } otl_datetime @@ -1451,36 +1402,26 @@ const short int atz_hour=0, const short int atz_minute=0 #endif - ): - year(ayear), - month(amonth), - day(aday), - hour(ahour), - minute(aminute), - second(asecond), - fraction(afraction), - frac_precision(afrac_precision) + + ) + { + year=ayear; + month=amonth; + day=aday; + hour=ahour; + minute=aminute; + second=asecond; + fraction=afraction; + frac_precision=afrac_precision; #if defined(OTL_ORA_TIMESTAMP) - ,tz_hour(atz_hour), - tz_minute(atz_minute) + tz_hour=atz_hour; + tz_minute=atz_minute; #endif - { } - otl_datetime(const otl_datetime& dt): - year(dt.year), - month(dt.month), - day(dt.day), - hour(dt.hour), - minute(dt.minute), - second(dt.second), - fraction(dt.fraction), - frac_precision(dt.frac_precision) -#if defined(OTL_ORA_TIMESTAMP) - ,tz_hour(dt.tz_hour), - tz_minute(dt.tz_minute) -#endif + otl_datetime(const otl_datetime& dt) { + copy(dt); } ~otl_datetime(){} @@ -1488,7 +1429,7 @@ otl_datetime& operator=(const otl_datetime& dt) { copy(dt); - return *this; + return *this; } protected: @@ -1521,17 +1462,7 @@ unsigned char minute; unsigned char second; - otl_oracle_date(): - century(0), - year(0), - month(0), - day(0), - hour(0), - minute(0), - second(0) - { - } - + otl_oracle_date(){} ~otl_oracle_date(){} }; @@ -1590,20 +1521,20 @@ int char_size; #endif - otl_column_desc(): - name(0), - dbtype(0), - otl_var_dbtype(0), - dbsize(0), - scale(0), - prec(0), - nullok(0), -#if defined(OTL_ORA_UNICODE)||defined(OTL_ORA_UTF8) - charset_form(0), - char_size(0), -#endif - name_len_(0) + otl_column_desc() { + name=0; + name_len_=0; + dbtype=0; + otl_var_dbtype=0; + dbsize=0; + scale=0; + prec=0; + nullok=0; +#if defined(OTL_ORA_UNICODE) + charset_form=0; + char_size=0; +#endif } ~otl_column_desc() @@ -1660,24 +1591,6 @@ int name_len_; -private: - - otl_column_desc(const otl_column_desc&): - name(0), - dbtype(0), - otl_var_dbtype(0), - dbsize(0), - scale(0), - prec(0), - nullok(0), -#if defined(OTL_ORA_UNICODE)||defined(OTL_ORA_UTF8) - charset_form(0), - char_size(0), -#endif - name_len_(0) - { - } - }; class otl_var_desc{ @@ -1691,17 +1604,16 @@ char name[128]; int pl_tab_flag; - otl_var_desc(): - param_type(0), - ftype(0), - elem_size(0), - array_size(0), - pos(0), - name_pos(0), - name(), - pl_tab_flag(0) + otl_var_desc() { - name[0]=0; + param_type=0; + ftype=0; + elem_size=0; + array_size=0; + pos=0; + name_pos=0; + name[0]=0; + pl_tab_flag=0; } ~otl_var_desc(){} @@ -1767,12 +1679,7 @@ int buf_size; bool this_is_last_piece_; - otl_long_string(const int buffer_size=32760,const int input_length=0): - v(0), - length(0), - extern_buffer_flag(0), - buf_size(0), - this_is_last_piece_(false) + otl_long_string(const int buffer_size=32760,const int input_length=0) { this_is_last_piece_=false; if(buffer_size==0){ @@ -1791,13 +1698,13 @@ otl_long_string (const void* external_buffer, const int buffer_size, - const int input_length=0): - v(OTL_RCAST(unsigned char*, OTL_CCAST(void*, external_buffer))), - length(input_length), - extern_buffer_flag(1), - buf_size(buffer_size), - this_is_last_piece_(false) + const int input_length=0) { + this_is_last_piece_=false; + extern_buffer_flag=1; + length=input_length; + buf_size=buffer_size; + v=OTL_RCAST(unsigned char*, OTL_CCAST(void*, external_buffer)); } otl_long_string& operator=(const otl_long_string& s) @@ -1828,13 +1735,12 @@ return *this; } - otl_long_string(const otl_long_string& s): - v(0), - length(s.length), - extern_buffer_flag(s.extern_buffer_flag), - buf_size(s.buf_size), - this_is_last_piece_(s.this_is_last_piece_) + otl_long_string(const otl_long_string& s) { + this_is_last_piece_=s.this_is_last_piece_; + length=s.length; + extern_buffer_flag=s.extern_buffer_flag; + buf_size=s.buf_size; if(s.extern_buffer_flag) v=s.v; else{ @@ -2465,14 +2371,14 @@ int tab_len; int vtype; - otl_pl_tab_generic(): - p_v(0), - p_null(0), - elem_size(0), - tab_size(0), - tab_len(0), - vtype(0) + otl_pl_tab_generic() { + elem_size=0; + tab_size=0; + tab_len=0; + p_v=0; + p_null=0; + vtype=0; } virtual ~otl_pl_tab_generic(){} @@ -2514,23 +2420,6 @@ tab_len=new_len; } -private: - - otl_pl_tab_generic(const otl_pl_tab_generic&): - p_v(0), - p_null(0), - elem_size(0), - tab_size(0), - tab_len(0), - vtype(0) - { - } - - otl_pl_tab_generic& operator=(const otl_pl_tab_generic&) - { - return *this; - } - }; #if defined(OTL_STRICT_NUMERIC_TYPE_CHECK_ON_SELECT) @@ -2643,9 +2532,9 @@ int should_delete; - otl_stream_shell_generic(): - should_delete(0) + otl_stream_shell_generic() { + should_delete=0; } virtual ~otl_stream_shell_generic(){} @@ -2669,15 +2558,12 @@ int cnt; - otl_stream_pool_entry(): - s(), - cnt(0) + otl_stream_pool_entry() { + cnt=0; } - otl_stream_pool_entry(const otl_stream_pool_entry& sc): - s(), - cnt(0) + otl_stream_pool_entry(const otl_stream_pool_entry& sc) { copy(sc); } @@ -2724,11 +2610,10 @@ int max_size; int size; - otl_stream_pool(): - sc(), - max_size(otl_max_default_pool_size), - size(0) + otl_stream_pool() { + max_size=otl_max_default_pool_size; + size=0; } void init(int amax_size=otl_max_default_pool_size) @@ -2962,20 +2847,6 @@ { init(); } - -private: - - otl_stream_pool(const otl_stream_pool&): - sc(), - max_size(0), - size(0) - { - } - - otl_stream_pool& operator=(const otl_stream_pool&) - { - return *this; - } }; @@ -2994,30 +2865,24 @@ TData v; bool ind; - otl_value(): - v(), - ind(true) - { - } - + otl_value(){ind=true;} virtual ~otl_value(){} - otl_value(const otl_value<TData>& var): - v(var.v), - ind(var.ind) + otl_value(const otl_value<TData>& var) { + v=var.v; + ind=var.ind; } - otl_value(const TData& var): - v(var), - ind(false) + otl_value(const TData& var) { + v=var; + ind=false; } - otl_value(const otl_null&): - v(0), - ind(true) + otl_value(const otl_null&) { + ind=true; } otl_value<TData>& operator=(const otl_value<TData>& var) @@ -3080,16 +2945,16 @@ T* ptr; int arr_size_; - otl_auto_array_ptr(): - ptr(0), - arr_size_(0) + otl_auto_array_ptr() { + ptr=0; + arr_size_=0; } - otl_auto_array_ptr(const int arr_size): - ptr(new T[arr_size]), - arr_size_(arr_size) + otl_auto_array_ptr(const int arr_size) { + ptr=new T[arr_size]; + arr_size_=arr_size; } void double_size(void) @@ -3108,19 +2973,6 @@ delete[] ptr; } -private: - - otl_auto_array_ptr(const otl_auto_array_ptr<T>&): - ptr(0), - arr_size_(0) - { - } - - otl_auto_array_ptr<T>& operator=(const otl_auto_array_ptr<T>&) - { - return *this; - } - }; template <OTL_TYPE_NAME T> @@ -3130,10 +2982,10 @@ T** ptr; int arr_flag; - otl_ptr(): - ptr(0), - arr_flag(0) + otl_ptr() { + ptr=0; + arr_flag=0; } void assign(T** var) @@ -3173,19 +3025,6 @@ destroy(); } -private: - - otl_ptr(const otl_ptr&): - ptr(0), - arr_flag(0) - { - } - - otl_ptr& operator=(const otl_ptr&) - { - return *this; - } - }; template <OTL_TYPE_NAME T> @@ -3193,12 +3032,13 @@ public: T* ptr; + bool do_not_destroy; - otl_Tptr(): - ptr(0), - do_not_destroy(false) + otl_Tptr() { + ptr=0; + do_not_destroy=false; } void assign(T* var) @@ -3224,23 +3064,6 @@ destroy(); } - otl_Tptr& operator=(const otl_Tptr& src) - { - ptr=src.ptr; - do_not_destroy=src.do_not_destroy; - return *this; - } - -private: - - otl_Tptr(const otl_Tptr&): - ptr(0), - do_not_destroy(false) - { - } - - - }; @@ -3292,12 +3115,11 @@ int vtype; int elem_size; - otl_pl_vec_generic(): - p_v(0), - null_flag(), - vtype(0), - elem_size(0) + otl_pl_vec_generic() { + p_v=0; + vtype=0; + elem_size=0; } virtual int len(void) const @@ -3309,6 +3131,7 @@ const bool /*set_all_to_null*/=true) { + } bool is_null(const int ndx=0) @@ -3328,21 +3151,6 @@ virtual ~otl_pl_vec_generic(){} -private: - - otl_pl_vec_generic(const otl_pl_vec_generic&): - p_v(0), - null_flag(), - vtype(0), - elem_size(0) - { - } - - otl_pl_vec_generic& operator=(const otl_pl_vec_generic&) - { - return *this; - } - }; template<OTL_TYPE_NAME T,const int type_code,const int T_sz> @@ -3351,8 +3159,7 @@ STD_NAMESPACE_PREFIX vector<T> v; - otl_T_vec(): - v() + otl_T_vec() { this->p_v=OTL_RCAST(void*,&v); this->vtype=type_code; @@ -3384,18 +3191,6 @@ return v[ndx]; } -private: - - otl_T_vec(const otl_T_vec&): - v() - { - } - - otl_T_vec& operator=(const otl_T_vec&) - { - return *this; - } - }; typedef otl_T_vec<double,otl_var_double,sizeof(double)> otl_double_vec; @@ -3428,28 +3223,13 @@ memset(v,0,sizeof(v)); } - otl_tmpl_pl_tab(): - v(), - null_flag() + otl_tmpl_pl_tab() { init(); } virtual ~otl_tmpl_pl_tab(){} -private: - - otl_tmpl_pl_tab& operator=(const otl_tmpl_pl_tab&) - { - return *this; - } - - otl_tmpl_pl_tab(const otl_tmpl_pl_tab&): - v(), - null_flag() - { - } - }; template <const int atab_size> @@ -3508,28 +3288,13 @@ memset(v,0,sizeof(v)); } - otl_cstr_tab(): - v(), - null_flag() + otl_cstr_tab() { init(); } virtual ~otl_cstr_tab(){} -private: - - otl_cstr_tab(const otl_cstr_tab&): - v(), - null_flag() - { - } - - otl_cstr_tab& operator=(const otl_cstr_tab&) - { - return *this; - } - }; template <const int atab_size> @@ -3553,9 +3318,7 @@ null_flag[i]=0; } - otl_datetime_tab(): - v(), - null_flag() + otl_datetime_tab() { init(); } @@ -3585,10 +3348,10 @@ memset(v,0,elem_size*tab_size); } - otl_tmpl_dyn_pl_tab(const int atab_size=1): - v(0), - null_flag(0) + otl_tmpl_dyn_pl_tab(const int atab_size=1) { + v=0; + null_flag=0; init(atab_size); } @@ -3598,19 +3361,6 @@ delete[] null_flag; } -private: - - otl_tmpl_dyn_pl_tab(const otl_tmpl_dyn_pl_tab<T,avtype>&): - v(0), - null_flag(0) - { - } - - otl_tmpl_dyn_pl_tab<T,avtype>& operator=(const otl_tmpl_dyn_pl_tab<T,avtype>&) - { - return *this; - } - }; class otl_dynamic_int_tab: public otl_tmpl_dyn_pl_tab<int,otl_var_int>{ @@ -3672,10 +3422,10 @@ memset(v,0,elem_size*tab_size); } - otl_dynamic_cstr_tab(const int atab_size=1): - v(0), - null_flag(0) + otl_dynamic_cstr_tab(const int atab_size=1) { + v=0; + null_flag=0; init(atab_size); } @@ -3685,19 +3435,6 @@ delete[] null_flag; } -private: - - otl_dynamic_cstr_tab(const otl_dynamic_cstr_tab&): - v(0), - null_flag(0) - { - } - - otl_dynamic_cstr_tab& operator=(const otl_dynamic_cstr_tab&) - { - return *this; - } - }; class otl_dynamic_datetime_tab: public otl_pl_tab_generic{ @@ -3722,11 +3459,10 @@ null_flag[i]=0; } - otl_dynamic_datetime_tab(const int atab_size=1): - otl_pl_tab_generic(), - v(0), - null_flag(0) + otl_dynamic_datetime_tab(const int atab_size=1) { + v=0; + null_flag=0; init(atab_size); } @@ -3736,20 +3472,6 @@ delete[] null_flag; } -private: - - otl_dynamic_datetime_tab(const otl_dynamic_datetime_tab&): - otl_pl_tab_generic(), - v(0), - null_flag(0) - { - } - - otl_dynamic_datetime_tab& operator=(const otl_dynamic_datetime_tab&) - { - return *this; - } - }; @@ -3959,22 +3681,20 @@ throw_count=0; } - otl_tmpl_connect(): - connected(0), - connect_struct(), - long_max_size(32760), - retcode(1), - throw_count(0) + otl_tmpl_connect() { + throw_count=0; + connected=0; + long_max_size=32760; + retcode=1; } - otl_tmpl_connect(const char* connect_str,const int auto_commit=0): - connected(0), - connect_struct(), - long_max_size(32760), - retcode(1), - throw_count(0) + otl_tmpl_connect(const char* connect_str,const int auto_commit=0) { + connected=0; + throw_count=0; + retcode=1; + long_max_size=32760; rlogon(connect_str,auto_commit); } @@ -3998,7 +3718,15 @@ connected=0; ++throw_count; if(throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION(connect_struct); } } @@ -4013,7 +3741,15 @@ if(throw_count>0) return; ++throw_count; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION(connect_struct); } @@ -4026,7 +3762,15 @@ if(retcode)return; ++throw_count; if(throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION(connect_struct); } @@ -4039,7 +3783,15 @@ if(retcode)return; ++throw_count; if(throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION(connect_struct); } @@ -4052,7 +3804,15 @@ if(retcode)return; ++throw_count; if(throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION(connect_struct); } @@ -4065,26 +3825,18 @@ if(retcode)return; ++throw_count; if(throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION(connect_struct); } -private: - - otl_tmpl_connect(const otl_tmpl_connect&): - connected(0), - connect_struct(), - long_max_size(32760), - retcode(1), - throw_count(0) - { - } - - otl_tmpl_connect& operator=(const otl_tmpl_connect&) - { - return *this; - } - }; template <OTL_TYPE_NAME TVariableStruct> @@ -4126,18 +3878,14 @@ v.pl_tab_flag=pl_tab_flag; } - otl_tmpl_variable(): - param_type(0), - ftype(0), - elem_size(0), - array_size(0), - name(0), - pos(0), - name_pos(0), - bound(0), - pl_tab_flag(0), - var_struct() + otl_tmpl_variable() { + name=0; + pos=0; + name_pos=0; + pl_tab_flag=0; + bound=0; + param_type=otl_input_param; } virtual ~otl_tmpl_variable() @@ -4149,17 +3897,7 @@ (const int column_num, const int aftype, const int aelem_size, - const short aarray_size): - param_type(0), - ftype(0), - elem_size(0), - array_size(0), - name(0), - pos(0), - name_pos(0), - bound(0), - pl_tab_flag(0), - var_struct() + const short aarray_size) { copy_pos(column_num); init(aftype,aelem_size,aarray_size); @@ -4305,27 +4043,6 @@ return TVariableStruct::int2ext(int_type); } -private: - - otl_tmpl_variable(const otl_tmpl_variable&): - param_type(0), - ftype(0), - elem_size(0), - array_size(0), - name(0), - pos(0), - name_pos(0), - bound(0), - pl_tab_flag(0), - var_struct() - { - } - - otl_tmpl_variable& operator=(const otl_tmpl_variable&) - { - return *this; - } - }; template <OTL_TYPE_NAME TExceptionStruct, @@ -4349,55 +4066,53 @@ long _rpc; int in_destructor; - otl_tmpl_cursor(): - connected(0), - stm_text(0), - stm_label(0), - cursor_struct(), - vl_len(0), - vl(0), - adb(0), - eof_data(), - eof_desc(), - retcode(1), - _rpc(0), - in_destructor(0) + otl_tmpl_cursor() { + in_destructor=0; + connected=0; + stm_label=0; + stm_text=0; + vl_len=0; + vl=0; + eof_data=0; + eof_desc=0; + adb=0; + _rpc=0; + retcode=1; } - otl_tmpl_cursor(OTL_TMPL_CONNECT& connect): - connected(0), - stm_text(0), - stm_label(0), - cursor_struct(), - vl_len(0), - vl(0), - adb(&connect), - eof_data(), - eof_desc(), - retcode(1), - _rpc(0), - in_destructor(0) + otl_tmpl_cursor + (OTL_TMPL_CONNECT& connect) { + in_destructor=0; + connected=0; + stm_text=0; + stm_label=0; + vl_len=0; + vl=0; + eof_data=0; + eof_desc=0; + retcode=1; + _rpc=0; + adb=&connect; open(connect); } otl_tmpl_cursor (OTL_TMPL_CONNECT& connect, - TVariableStruct* var): - connected(0), - stm_text(0), - stm_label(0), - cursor_struct(), - vl_len(0), - vl(0), - adb(&connect), - eof_data(), - eof_desc(), - retcode(1), - _rpc(0), - in_destructor(0) + TVariableStruct* var) { + in_destructor=0; + connected=0; + stm_text=0; + stm_label=0; + vl_len=0; + vl=0; + eof_data=0; + eof_desc=0; + retcode=1; + _rpc=0; + adb=&connect; open(connect,var); } @@ -4431,7 +4146,15 @@ } if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION(cursor_struct); } @@ -4457,7 +4180,15 @@ } this->adb->throw_count++; adb=0; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION(cursor_struct); } @@ -4469,12 +4200,28 @@ case 0: if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION(cursor_struct,stm_label?stm_label:stm_text); case 2: if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif char var_info[1]; var_info[0]=0; throw OTL_TMPL_EXCEPTION @@ -4511,7 +4258,15 @@ if(retcode)return; if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION(cursor_struct,stm_label?stm_label:stm_text); } @@ -4520,14 +4275,13 @@ const int binding_type) { bool rc=true; - if(((v.ftype==otl_var_varchar_long||v.ftype==otl_var_raw_long) && - (v.var_struct.otl_adapter==otl_ora7_adapter|| + if((v.ftype==otl_var_varchar_long||v.ftype==otl_var_raw_long) && + (v.var_struct.otl_adapter==otl_ora7_adapter || v.var_struct.otl_adapter==otl_ora8_adapter) && - v.array_size>1) || - ((v.ftype==otl_var_blob||v.ftype==otl_var_clob)&& - v.var_struct.otl_adapter==otl_ora8_adapter&& - v.array_size>1 && - binding_type==otl_inout_binding)) + v.array_size>1 || + (v.ftype==otl_var_blob||v.ftype==otl_var_clob) && + v.var_struct.otl_adapter==otl_ora8_adapter && + v.array_size>1 && binding_type==otl_inout_binding) rc=false; return rc; } @@ -4548,7 +4302,15 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_16, otl_error_code_16, @@ -4569,7 +4331,15 @@ } if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION(cursor_struct,stm_label?stm_label:stm_text); } @@ -4588,7 +4358,15 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_16, otl_error_code_16, @@ -4604,7 +4382,15 @@ if(retcode)return; if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION(cursor_struct,stm_label?stm_label:stm_text); } @@ -4669,34 +4455,18 @@ if(retcode)return 1; if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return 0; - if(otl_uncaught_exception()) return 0; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return 0; +#endif throw OTL_TMPL_EXCEPTION(cursor_struct,stm_label?stm_label:stm_text); } -private: - - otl_tmpl_cursor(const otl_tmpl_cursor&): - connected(0), - stm_text(0), - stm_label(0), - cursor_struct(), - vl_len(0), - vl(0), - adb(0), - eof_data(), - eof_desc(), - retcode(1), - _rpc(0), - in_destructor(0) - { - } - - otl_tmpl_cursor& operator=(const otl_tmpl_cursor&) - { - return *this; - } - - }; inline int is_num(char c) @@ -4729,30 +4499,17 @@ char* stm_text_; char* stm_label_; int container_size_; - bool has_plsql_tabs_or_refcur_; - + otl_tmpl_ext_hv_decl(char* stm, int arr_size=1, char* label=0, otl_select_struct_override** select_override=0, - OTL_TMPL_CONNECT* adb=0): - hv(0), - inout(0), - pl_tab_size(0), - array_size(0), - prev_array_size(0), - vst(), - len(0), - stm_text_(0), - stm_label_(0), - container_size_(0), - has_plsql_tabs_or_refcur_(0) + OTL_TMPL_CONNECT* adb=0) { container_size_=otl_var_list_size; hv=new char*[container_size_]; inout=new short[container_size_]; pl_tab_size=new int[container_size_]; - has_plsql_tabs_or_refcur_=false; int j; array_size=arr_size; @@ -4804,7 +4561,7 @@ break; } if(*c==':' && !in_str && !in_comment && !in_one_line_comment && - ((c>stm && *(c-1)!='\\') || c==stm)){ + (c>stm && *(c-1)!='\\' || c==stm)){ char* bind_var_ptr=c; short in_out=def; int apl_tab_size=0; @@ -4931,7 +4688,7 @@ ++n1; ++n2; } - if((*n1==' '&&*n2!=' ')||(*n2==' '&&*n1!=' ')) + if(*n1==' '&&*n2!=' '||*n2==' '&&*n1!=' ') return 0; return 1; } @@ -4946,7 +4703,6 @@ OTL_STRCPY_S(hv[n],v_len,v); inout[n]=in_out; pl_tab_size[n]=apl_tab_size; - if(apl_tab_size>0) has_plsql_tabs_or_refcur_=true; if(n==container_size_-1){ int temp_container_size=container_size_; container_size_*=2; @@ -5012,7 +4768,7 @@ t3=otl_to_upper(c1[2]); t4=otl_to_upper(c1[3]); } - if((type=='C'&&t2=='H')||(type=='R'&&t2=='A'&&t3=='W'&&(t4=='['||t4=='('))){ + if(type=='C'&&t2=='H'||type=='R'&&t2=='A'&&t3=='W'&&(t4=='['||t4=='(')){ char tmp[32]; char *t=tmp; while((*c1!='[' && *c1!='(')&&*c1) @@ -5225,7 +4981,7 @@ } if(clen>4) t5=otl_to_upper(c1[4]); - if((type=='C'&&t2=='H')||(type=='R'&&t2=='A'&&t3=='W'&&(t4=='['||t4=='('))){ + if(type=='C'&&t2=='H'||type=='R'&&t2=='A'&&t3=='W'&&(t4=='['||t4=='(')){ char tmp[32]; char *t=tmp; while((*c1!='[' && *c1!='(')&&*c1) @@ -5502,46 +5258,6 @@ } } -private: - - otl_tmpl_ext_hv_decl - (const otl_tmpl_ext_hv_decl - <TVariableStruct, - TTimestampStruct, - TExceptionStruct, - TConnectStruct, - TCursorStruct>&): - hv(0), - inout(0), - pl_tab_size(0), - array_size(0), - prev_array_size(0), - vst(), - len(0), - stm_text_(0), - stm_label_(0), - container_size_(0), - has_plsql_tabs_or_refcur_(0) - { - } - -otl_tmpl_ext_hv_decl - <TVariableStruct, - TTimestampStruct, - TExceptionStruct, - TConnectStruct, - TCursorStruct>& -operator= -(const otl_tmpl_ext_hv_decl - <TVariableStruct, - TTimestampStruct, - TExceptionStruct, - TConnectStruct, - TCursorStruct>&) - { - return *this; - } - }; template <OTL_TYPE_NAME TExceptionStruct, @@ -5565,17 +5281,13 @@ otl_tmpl_select_cursor (OTL_TMPL_CONNECT& pdb, const otl_stream_buffer_size_type arr_size=1, - const char* sqlstm_label=0): - OTL_TMPL_CURSOR(pdb), - cur_row(-1), - cur_size(0), - row_count(0), - array_size(0), - prefetch_array_size(0), - select_cursor_struct(), - local_override() + const char* sqlstm_label=0) + : OTL_TMPL_CURSOR(pdb) { local_override.reset(); + cur_row=-1; + row_count=0; + cur_size=0; if(sqlstm_label!=0){ if(this->stm_label!=0){ delete[] this->stm_label; @@ -5627,7 +5339,15 @@ if(!rc){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return 0; - if(otl_uncaught_exception()) return 0; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return 0; +#endif throw OTL_TMPL_EXCEPTION (this->cursor_struct, this->stm_label? @@ -5641,8 +5361,15 @@ { if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return 0; - if(otl_uncaught_exception()) return 0; - +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return 0; +#endif throw OTL_TMPL_EXCEPTION (this->cursor_struct, this->stm_label? @@ -5667,27 +5394,6 @@ return cur_size!=0; } -private: - - otl_tmpl_select_cursor - (const otl_tmpl_select_cursor&): - OTL_TMPL_CURSOR(), - cur_row(-1), - cur_size(0), - row_count(0), - array_size(0), - prefetch_array_size(0), - select_cursor_struct(), - local_override() - { - } - - otl_tmpl_select_cursor& operator= - (const otl_tmpl_select_cursor&) - { - return *this; - } - }; #if defined(OTL_ORA8)||defined(OTL_ODBC) @@ -5713,17 +5419,9 @@ int lob_is_null; bool ora_lob; - otl_lob_stream_generic(const bool aora_lob=true): - mode(0), - retcode(0), - ndx(0), - offset(0), - lob_len(0), - in_destructor(0), - eof_flag(0), - lob_is_null(0), - ora_lob(aora_lob) + otl_lob_stream_generic(const bool aora_lob=true) { + ora_lob=aora_lob; } virtual ~otl_lob_stream_generic(){} @@ -5745,26 +5443,6 @@ virtual bool is_initialized(void) = 0; virtual void close(void) = 0; -private: - - otl_lob_stream_generic(const otl_lob_stream_generic&): - mode(0), - retcode(0), - ndx(0), - offset(0), - lob_len(0), - in_destructor(0), - eof_flag(0), - lob_is_null(0), - ora_lob(false) - { - } - - otl_lob_stream_generic& operator=(const otl_lob_stream_generic&) - { - return *this; - } - }; #endif @@ -5824,20 +5502,7 @@ OTL_TMPL_CONNECT& pdb, const int implicit_select=otl_explicit_select, const char* sqlstm_label=0) - : OTL_TMPL_SELECT_CURSOR(pdb,arr_size,sqlstm_label), - sl_desc(0), - sl(0), - sl_len(0), - null_fetched(0), - cur_col(0), - cur_in(0), - executed(0), - eof_status(0), - var_info(), - override(0), - delay_next(0), - lob_stream_mode(false), - _rfc(0) + : OTL_TMPL_SELECT_CURSOR(pdb,arr_size,sqlstm_label) { int i; this->select_cursor_struct.set_select_type(implicit_select); @@ -6034,7 +5699,15 @@ { if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_2, otl_error_code_2, @@ -6066,7 +5739,15 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return 0; - if(otl_uncaught_exception()) return 0; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return 0; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_0, otl_error_code_0, @@ -6087,7 +5768,15 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_0, otl_error_code_0, @@ -6211,7 +5900,15 @@ if(rc==0){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -6273,7 +5970,15 @@ sizeof(temp_var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_4, otl_error_code_4, @@ -6339,7 +6044,15 @@ if(rc==0){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -6440,7 +6153,15 @@ if(rc==0){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -6501,7 +6222,15 @@ if(rc==0){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -6526,7 +6255,15 @@ sizeof(tmp_var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_0, otl_error_code_0, @@ -6577,7 +6314,15 @@ sizeof(tmp_var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_0, otl_error_code_0, @@ -6599,7 +6344,15 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return 0; - if(otl_uncaught_exception()) return 0; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return 0; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_0, otl_error_code_0, @@ -6633,7 +6386,15 @@ { if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_1, otl_error_code_1, @@ -6715,7 +6476,15 @@ sizeof(tmp_var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_4, otl_error_code_4, @@ -6748,7 +6517,15 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_5, otl_error_code_5, @@ -6774,7 +6551,15 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_5, otl_error_code_5, @@ -6830,7 +6615,15 @@ sizeof(temp_var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_4, otl_error_code_4, @@ -6870,7 +6663,15 @@ sizeof(temp_var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_4, otl_error_code_4, @@ -6923,7 +6724,15 @@ if(rc==0){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -6935,32 +6744,6 @@ return *this; } -private: - - otl_tmpl_select_stream - (const otl_tmpl_select_stream&): - OTL_TMPL_SELECT_CURSOR(), - sl_desc(0), - sl(0), - sl_len(0), - null_fetched(0), - cur_col(0), - cur_in(0), - executed(0), - eof_status(0), - var_info(), - override(0), - delay_next(0), - lob_stream_mode(false), - _rfc(0) - { - } - - otl_tmpl_select_stream& operator=(const otl_tmpl_select_stream&) - { - return *this; - } - }; template <OTL_TYPE_NAME TExceptionStruct, @@ -6999,20 +6782,8 @@ const char* sqlstm, OTL_TMPL_CONNECT& db, const bool alob_stream_mode=false, - const char* sqlstm_label=0): - OTL_TMPL_CURSOR(db), - auto_commit_flag(0), - dirty(0), - cur_x(0), - cur_y(0), - array_size(0), - in_exception_flag(0), - in_destruct_flag(0), - should_delete_flag(0), - var_info(), - flush_flag(0), - flush_flag2(0), - lob_stream_mode(0) + const char* sqlstm_label=0) + : OTL_TMPL_CURSOR(db) { int i; if(sqlstm_label!=0){ @@ -7071,20 +6842,8 @@ otl_tmpl_out_stream (OTL_TMPL_CONNECT& pdb, const bool alob_stream_mode=false, - const char* sqlstm_label=0): - OTL_TMPL_CURSOR(pdb), - auto_commit_flag(0), - dirty(0), - cur_x(0), - cur_y(0), - array_size(0), - in_exception_flag(0), - in_destruct_flag(0), - should_delete_flag(0), - var_info(), - flush_flag(0), - flush_flag2(0), - lob_stream_mode(0) + const char* sqlstm_label=0) + : OTL_TMPL_CURSOR(pdb) { if(sqlstm_label!=0){ if(this->stm_label!=0){ @@ -7142,7 +6901,15 @@ if(temp_rc==0){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -7156,15 +6923,16 @@ } #if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) - if(otl_uncaught_exception()){ + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception()){ clean(); return; } -#elif defined(OTL_UNCAUGHT_EXCEPTION_ON) - if(otl_uncaught_exception()){ - clean(); - return; - } #endif if(this->retcode==0||this->adb->retcode==0){ @@ -7177,15 +6945,15 @@ if(this->adb&&this->adb->throw_count>1)return; #if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) if( -otl_uncaught_exception()){ +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception()){ clean(); return; } -#elif defined(OTL_UNCAUGHT_EXCEPTION_ON) - if(otl_uncaught_exception()){ - clean(); - return; - } #endif throw OTL_TMPL_EXCEPTION (otl_error_msg_3, @@ -7202,7 +6970,15 @@ if(rc==0){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -7214,7 +6990,15 @@ in_exception_flag=1; if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION (this->cursor_struct, this->stm_label?this->stm_label: @@ -7226,7 +7010,15 @@ clean(); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -7242,7 +7034,15 @@ if(temp_rc==0){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return; - if(otl_uncaught_exception()) return; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return; +#endif throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -7311,7 +7111,15 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return 0; - if(otl_uncaught_exception()) return 0; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return 0; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_0, otl_error_code_0, @@ -7402,7 +7210,15 @@ in_exception_flag=1; if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_4, otl_error_code_4, @@ -7431,7 +7247,15 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_5, otl_error_code_5, @@ -7461,7 +7285,15 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_5, otl_error_code_5, @@ -7536,7 +7368,15 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_5, otl_error_code_5, @@ -7564,7 +7404,15 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_5, otl_error_code_5, @@ -7648,7 +7496,15 @@ in_exception_flag=1; if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_4, otl_error_code_4, @@ -7723,7 +7579,15 @@ sizeof(tmp_var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_4, otl_error_code_4, @@ -7798,7 +7662,15 @@ sizeof(temp_var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_4, otl_error_code_4, @@ -7895,7 +7767,15 @@ if(rc==0){ if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (this->adb->connect_struct, this->stm_label?this->stm_label: @@ -7930,7 +7810,15 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_5, otl_error_code_5, @@ -7968,7 +7856,15 @@ sizeof(var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_5, otl_error_code_5, @@ -7994,11 +7890,11 @@ { if(this->vl_len>0){ get_next(); - if(((s.ora_lob&& - this->vl[cur_x]->ftype==otl_var_blob)|| + if((s.ora_lob&& + this->vl[cur_x]->ftype==otl_var_blob|| this->vl[cur_x]->ftype==otl_var_clob)|| (this->vl[cur_x]->ftype==otl_var_varchar_long|| - this->vl[cur_x]->ftype==otl_var_raw_long)){ + this->vl[cur_x]->ftype==otl_var_raw_long)){ s.init (this->vl[cur_x], this->adb, @@ -8019,7 +7915,15 @@ sizeof(temp_var_info)); if(this->adb)this->adb->throw_count++; if(this->adb&&this->adb->throw_count>1)return *this; - if(otl_uncaught_exception()) return *this; +#if defined(OTL_STL) && defined(OTL_UNCAUGHT_EXCEPTION_ON) + if( +#if defined(OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE) + OTL_UNCAUGHT_EXCEPTION_OWN_NAMESPACE +#else + STD_NAMESPACE_PREFIX +#endif + uncaught_exception())return *this; +#endif throw OTL_TMPL_EXCEPTION (otl_error_msg_0, otl_error_code_0, @@ -8032,49 +7936,6 @@ #undef OTL_TMPL_CUR_DUMMY #endif - otl_tmpl_out_stream(): - OTL_TMPL_CURSOR(), - auto_commit_flag(0), - dirty(0), - cur_x(0), - cur_y(0), - array_size(0), - in_exception_flag(0), - in_destruct_flag(0), - should_delete_flag(0), - var_info(), - flush_flag(0), - flush_flag2(0), - lob_stream_mode(0) - { - } - -private: - - otl_tmpl_out_stream - (const otl_tmpl_out_stream&): - OTL_TMPL_CURSOR(), - auto_commit_flag(0), - dirty(0), - cur_x(0), - cur_y(0), - array_size(0), - in_exception_flag(0), - in_destruct_flag(0), - should_delete_flag(0), - var_info(), - flush_flag(0), - flush_flag2(0), - lob_stream_mode(0) - { - } - - otl_tmpl_out_stream... [truncated message content] |