Date: Thursday, January 12, 2006 @ 18:05:05
Author: gilles
Path: /cvsroot/carob/carob
Modified: include/CarobException.hpp (1.27 -> 1.28)
include/CriticalSection.hpp (1.5 -> 1.6) include/JavaSocket.hpp
(1.19 -> 1.20) include/Statement.hpp (1.25 -> 1.26)
src/CarobException.cpp (1.14 -> 1.15)
src/ControllerConnectPolicy.cpp (1.1 -> 1.2)
src/ResultSetMetaData.cpp (1.6 -> 1.7)
test/TestBeginCommitRollback.cpp (1.10 -> 1.11)
Removed Common.hpp include from CarobException => lots of 'implied inclusion'
fixed
----------------------------------+
include/CarobException.hpp | 4 +---
include/CriticalSection.hpp | 4 ----
include/JavaSocket.hpp | 4 ++--
include/Statement.hpp | 1 +
src/CarobException.cpp | 4 +++-
src/ControllerConnectPolicy.cpp | 4 +++-
src/ResultSetMetaData.cpp | 4 +++-
test/TestBeginCommitRollback.cpp | 4 +++-
8 files changed, 16 insertions(+), 13 deletions(-)
Index: carob/include/CarobException.hpp
diff -u carob/include/CarobException.hpp:1.27
carob/include/CarobException.hpp:1.28
--- carob/include/CarobException.hpp:1.27 Thu Jan 5 16:15:22 2006
+++ carob/include/CarobException.hpp Thu Jan 12 18:05:05 2006
@@ -1,6 +1,6 @@
/*
* Sequoia: Database clustering technology.
- * Copyright (C) 2005 Emic Networks
+ * Copyright (C) 2005-2006 Continuent, Inc.
* Contact: [EMAIL PROTECTED]
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,8 +32,6 @@
#include <stdlib.h>
#endif // __GLIBC__
-#include "Common.hpp"
-
namespace CarobNS {
class StackTraceElement;
Index: carob/include/CriticalSection.hpp
diff -u carob/include/CriticalSection.hpp:1.5
carob/include/CriticalSection.hpp:1.6
--- carob/include/CriticalSection.hpp:1.5 Thu Dec 15 18:18:51 2005
+++ carob/include/CriticalSection.hpp Thu Jan 12 18:05:05 2006
@@ -157,15 +157,11 @@
public:
LockScope(CriticalSection* CSPtrPrm)
{
- if (isVerboseEnabled())
- logVerbose(L"LockScope", L"Entering critical section");
CSPtr = CSPtrPrm;
CSPtr->Enter();
}
~LockScope()
{
- if (isVerboseEnabled())
- logVerbose(L"LockScope", L"Leaving critical section");
CSPtr->Leave();
}
private:
Index: carob/include/JavaSocket.hpp
diff -u carob/include/JavaSocket.hpp:1.19 carob/include/JavaSocket.hpp:1.20
--- carob/include/JavaSocket.hpp:1.19 Wed Jan 4 19:26:34 2006
+++ carob/include/JavaSocket.hpp Thu Jan 12 18:05:05 2006
@@ -1,6 +1,6 @@
/*
* Sequoia: Database clustering technology.
- * Copyright (C) 2005 Emic Networks
+ * Copyright (C) 2005-2006 Continuent, Inc.
* Contact: [EMAIL PROTECTED]
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,7 +26,7 @@
#include <string>
#include "CarobException.hpp"
-
+#include "StringCodecs.hpp"
namespace CarobNS {
Index: carob/include/Statement.hpp
diff -u carob/include/Statement.hpp:1.25 carob/include/Statement.hpp:1.26
--- carob/include/Statement.hpp:1.25 Thu Jan 12 17:33:46 2006
+++ carob/include/Statement.hpp Thu Jan 12 18:05:05 2006
@@ -24,6 +24,7 @@
#include <string>
#include <list>
+#include "Common.hpp"
#include "DriverResultSet.hpp"
#include "RequestWithResultSetParameters.hpp"
Index: carob/src/CarobException.cpp
diff -u carob/src/CarobException.cpp:1.14 carob/src/CarobException.cpp:1.15
--- carob/src/CarobException.cpp:1.14 Tue Dec 13 16:08:30 2005
+++ carob/src/CarobException.cpp Thu Jan 12 18:05:05 2006
@@ -1,6 +1,6 @@
/*
* Sequoia: Database clustering technology.
- * Copyright (C) 2005 Emic Networks
+ * Copyright (C) 2005-2006 Continuent, Inc.
* Contact: [EMAIL PROTECTED]
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +20,8 @@
*/
#include "CarobException.hpp"
+
+#include "Common.hpp"
#include "DriverSocket.hpp"
using std::wstring;
Index: carob/src/ControllerConnectPolicy.cpp
diff -u carob/src/ControllerConnectPolicy.cpp:1.1
carob/src/ControllerConnectPolicy.cpp:1.2
--- carob/src/ControllerConnectPolicy.cpp:1.1 Thu Jan 5 16:11:43 2006
+++ carob/src/ControllerConnectPolicy.cpp Thu Jan 12 18:05:05 2006
@@ -1,6 +1,6 @@
/*
* Sequoia: Database clustering technology.
- * Copyright (C) 2005 Emic Networks
+ * Copyright (C) 2005-2006 Continuent, Inc.
* Contact: [EMAIL PROTECTED]
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,6 +21,8 @@
#include "ControllerConnectPolicy.hpp"
+#include "Common.hpp"
+
using std::wstring;
using namespace CarobNS;
Index: carob/src/ResultSetMetaData.cpp
diff -u carob/src/ResultSetMetaData.cpp:1.6 carob/src/ResultSetMetaData.cpp:1.7
--- carob/src/ResultSetMetaData.cpp:1.6 Tue Dec 13 18:18:51 2005
+++ carob/src/ResultSetMetaData.cpp Thu Jan 12 18:05:05 2006
@@ -1,6 +1,6 @@
/*
* Sequoia: Database clustering technology.
- * Copyright (C) 2005 Emic Networks
+ * Copyright (C) 2005-2006 Continuent, Inc.
* Contact: [EMAIL PROTECTED]
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,6 +21,8 @@
#include "ResultSetMetaData.hpp"
+#include "Common.hpp"
+
using std::wstring;
using namespace CarobNS;
Index: carob/test/TestBeginCommitRollback.cpp
diff -u carob/test/TestBeginCommitRollback.cpp:1.10
carob/test/TestBeginCommitRollback.cpp:1.11
--- carob/test/TestBeginCommitRollback.cpp:1.10 Tue Dec 6 17:54:01 2005
+++ carob/test/TestBeginCommitRollback.cpp Thu Jan 12 18:05:05 2006
@@ -1,6 +1,6 @@
/*
* Sequoia: Database clustering technology.
- * Copyright (C) 2005 Emic Networks
+ * Copyright (C) 2005-2006 Continuent, Inc.
* Contact: [EMAIL PROTECTED]
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,6 +22,8 @@
#include <iostream>
#include "TestBeginCommitRollback.hpp"
+
+#include "Common.hpp"
#include "Request.hpp"
using std::wstring;
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
