diff options
| author | Jose <jose@zeroc.com> | 2013-09-10 21:13:40 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-09-10 21:13:40 +0200 |
| commit | 3d55f56ddf9c6ebd9943c68c3dcedbcfb5241ada (patch) | |
| tree | 4249092d618231fabed9e1a7d9268bcbf2143b0c /cpp/src | |
| parent | Fix makedist.py to work with python 2.6 (diff) | |
| download | ice-3d55f56ddf9c6ebd9943c68c3dcedbcfb5241ada.tar.bz2 ice-3d55f56ddf9c6ebd9943c68c3dcedbcfb5241ada.tar.xz ice-3d55f56ddf9c6ebd9943c68c3dcedbcfb5241ada.zip | |
rollback changes for (ICE-5361) - Provide split Ice source distribution
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Freeze/ConnectionI.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Makefile.core | 55 |
2 files changed, 2 insertions, 55 deletions
diff --git a/cpp/src/Freeze/ConnectionI.cpp b/cpp/src/Freeze/ConnectionI.cpp index 18c3f2449e1..283a6c90f3e 100644 --- a/cpp/src/Freeze/ConnectionI.cpp +++ b/cpp/src/Freeze/ConnectionI.cpp @@ -77,6 +77,7 @@ Freeze::ConnectionI::close() { if(_transaction) { + cerr << "rollback open transacion on close" << endl; _transaction->rollbackInternal(true); assert(_transaction == 0); } @@ -153,6 +154,7 @@ Freeze::ConnectionI::__getRefNoSync() const Freeze::ConnectionI::~ConnectionI() { + cerr << "ConnectionI dtor" << endl; close(); } diff --git a/cpp/src/Makefile.core b/cpp/src/Makefile.core deleted file mode 100644 index 11f7a6d8378..00000000000 --- a/cpp/src/Makefile.core +++ /dev/null @@ -1,55 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = .. - -include $(top_srcdir)/config/Make.rules - -SUBDIRS = IceUtil \ - Slice \ - slice2cpp \ - Ice \ - IceSSL \ - IceBox \ - Glacier2Lib \ - IcePatch2Lib \ - IceStormLib \ - IceGridLib - -.PHONY: $(EVERYTHING) $(SUBDIRS) - -# -# Dependencies for 'all' target when using -jx -# - -Slice: IceUtil - -slice2cpp: Slice - -Ice: slice2cpp - -IceSSL IceBox Glacier2Lib IcePatch2Lib IceStormLib IceGridLib: Ice - -IceGridLib: Glacier2Lib - -all:: $(SUBDIRS) - -$(SUBDIRS): - @echo "making all in $@" - @$(MAKE) all --directory=$@ - -$(EVERYTHING_EXCEPT_ALL):: - @for subdir in $(SUBDIRS); \ - do \ - if test -d $$subdir ; \ - then \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - fi; \ - done |